gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,625 Commits 12 Branches 481 Tags 2.4 GiB
bb1a5bdc1b
Commit Graph

4026 Commits

Author SHA1 Message Date
Marc Delisle
5d51a66322 Merge pull request #1597 from harish095/Mark-All-option-for-sub-categories-in-Global-Priviliges 
Mark all option for sub categories while changing privileges
 2015-03-21 17:28:01 -04:00
harish095
e38c8f163c Mark all option for sub categories 
Signed-off-by: Harish Kandala <kandalaharish95@gmail.com>
 2015-03-21 20:46:58 +05:30
Madhura Jayaratne
950d6155cf Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 22:19:56 +05:30
Madhura Jayaratne
fb9ded0c03 column_index can be multi digit 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 22:16:47 +05:30
Marc Delisle
a7fe419328 Fix Codacy warnings 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-20 12:38:57 -04:00
Madhura Jayaratne
04ff48369c Use index parameters defined in create table form 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 22:07:53 +05:30
Marc Delisle
0851a2bc9a Merge pull request #1590 from monojp/patch-1 
Update functions.js
 2015-03-20 12:35:42 -04:00
Madhura Jayaratne
a8b2f35b74 Return when source_array is null 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 14:05:15 +05:30
Madhura Jayaratne
b2c57f60c4 Reduce duplication 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 13:47:48 +05:30
Madhura Jayaratne
06a5e07808 rfe #1626 Display/edit index name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 13:39:27 +05:30
Madhura Jayaratne
f4f2924e79 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 14:53:05 +05:30
Madhura Jayaratne
070bb05212 Merge branch 'QA_4_3' into QA_4_4 2015-03-19 14:50:17 +05:30
Madhura Jayaratne
8f1bd009b0 bug #4810 Broken find and replace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 14:48:47 +05:30
Madhura Jayaratne
7e4a3e480e Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 10:22:10 +05:30
Madhura Jayaratne
e8ced3949d bug #4812 Issues with index dialog while creating a table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 10:16:04 +05:30
monojp
94698de080 Update navigation.js 
favorite tables localStorage sync: avoid sending undefined objects or empty strings via ajax #2
 2015-03-18 16:44:41 +01:00
monojp
e94d2a9a7f Update functions.js 
favorite tables localStorage sync: avoid sending undefined objects or empty strings via ajax
 2015-03-18 15:52:05 +01:00
Madhura Jayaratne
6f4f4dbd6c Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:13:35 +05:30
Madhura Jayaratne
592a6ef5b8 Remove dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:05:52 +05:30
Madhura Jayaratne
21302c235e Add a class for bitT column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:04:56 +05:30
Marc Delisle
c326cc9542 Merge pull request #1572 from tapanhalani/master 
Fix Feature#1609- Lock page navigation when entering data.
 2015-03-15 06:52:28 -04:00
Atul Pratap Singh
40a391ecec Merge branch 'QA_4_4' 2015-03-15 15:36:25 +05:30
Raimund Meyer
98231225e2 Fix bug#4799 Position of sticky columns wrong when screen width too small 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-15 15:25:12 +05:30
Atul Pratap Singh
dc29142610 Related to bug#4725 and rfe#1426: maintain navigation state with just required info stored in sessionstorage 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-15 14:27:47 +05:30
Tapan Halani
0ac7e8f0f6 Fix feature#1609: Lock page navigation when entering data. 
Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-14 22:07:44 +05:30
Atul Pratap Singh
7120bfb977 Merge branch 'QA_4_4' 2015-03-13 23:40:44 +05:30
Atul Pratap Singh
f6803a59e0 datepicker: remove on close inline 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 23:39:18 +05:30
Atul Pratap Singh
3fe1604b7f Merge commit 'c085d0d' 2015-03-13 23:24:28 +05:30
Atul Pratap Singh
0e1b596ca5 Merge commit '17d9d82' 
Conflicts:
	js/makegrid.js

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 23:24:01 +05:30
Atul Pratap Singh
2d64504915 Fix bugs#4800] On selecting date, the datepicker disappears on master 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:51:56 +05:30
Atul Pratap Singh
4e8ac3c796 Merge branch 'QA_4_3' into QA_4_4 2015-03-13 22:45:23 +05:30
Atul Pratap Singh
17d9d82c41 Remove unnecessary checkbox repositioning 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:

	js/makegrid.js

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:44:37 +05:30
Atul Pratap Singh
c085d0d56a datepicker: correct position on clicking on icon and prevent closing on outside click 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:22:36 +05:30
Atul Pratap Singh
5b1eb0752f Remove unnecessary checkbox repositioning 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 17:52:34 +05:30
Atul Pratap Singh
5ad307f770 Fix bugs#4800] On selecting date, the datepicker disappears on master 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 17:42:40 +05:30
Atul Pratap Singh
1c82e5eaf5 Merge branch 'QA_4_3' 2015-03-13 00:26:14 +05:30
Atul Pratap Singh
45fbe0bc2a Fix bug#4797 Inline edit of DATETIME fields, can't change month nor time 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-12 23:52:18 +05:30
Marc Delisle
d295244b7b Merge pull request #1565 from udan11/coding_style 
Fix minor coding style issues.
 2015-03-12 08:58:24 -04:00
Atul Pratap Singh
49da35b5fc Merge branch 'QA_4_3' 2015-03-12 11:18:06 +05:30
Dan Ungureanu
ac665a8945 RFE #1617. Click back on the button closes the card. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-12 00:27:50 +02:00
Dan Ungureanu
5e27e54f60 Fix minor coding style issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-11 14:52:04 +02:00
Madhura Jayaratne
ebbaf9685c Improve UI consistency 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 18:05:43 +05:30
Madhura Jayaratne
536a9fd0e6 Use a checkbox for the extra column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 17:46:03 +05:30
Rakesh Kumar
f1ded5625f #1613 Central columns: action on multiple columns 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2015-03-10 14:53:51 +05:30
Madhura Jayaratne
cbdafc1ba8 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-10 07:32:09 +05:30
Dan Ungureanu
102cd3c273 BUG #4791. Zoom search: JavaScript error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-10 07:29:17 +05:30
Madhura Jayaratne
635b830892 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 20:07:21 +05:30
Marc Delisle
5fdab46629 Merge pull request #1551 from udan11/rfe_1570_2 
RFE #1570, part 2 (2). Added the possibility of permanently using Enter instead of Ctrl+Enter in console.
 2015-03-09 08:11:16 -04:00
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Dan Ungureanu
5f8f7ba88e RFE #1570, part 2. Added the possibility of permanently using Enter instead of Ctrl+Enter in console. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-09 01:25:28 +02:00