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

96253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
d8afbb7602 Merge branch 'master' into multiquery 2014-12-01 08:47:53 +05:30
Madhura Jayaratne
b8e13f5b7a Distinguish between options of each result set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 08:44:07 +05:30
Madhura Jayaratne
4cf4e41dec Table filtering for multiquery 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 08:27:10 +05:30
Marc Delisle
b427d13b0f Merge commit '1292a53' 2014-11-30 06:38:17 -05:00
Marc Delisle
c4966c6fb5 Merge commit '41277d1' 2014-11-30 06:37:49 -05:00
Marc Delisle
c237f27a1b Merge commit '0ab3ee3' 2014-11-30 06:37:38 -05:00
Marc Delisle
1292a53379 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-11-30 06:36:33 -05:00
Marc Delisle
e8aa77761e Merge commit '0ab3ee3' into QA_4_3 2014-11-30 06:36:23 -05:00
Marc Delisle
41277d1887 4.2.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-30 06:35:21 -05:00
Hugues Peccatte
e037f60015 Factorization. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 16:04:29 +01:00
Hugues Peccatte
115065b3f6 Reduce nesting levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 14:40:02 +01:00
Marc Delisle
73e4c5653f Merge branch 'QA_4_3' 2014-11-29 06:50:03 -05:00
Marc Delisle
1e39ac53d0 Bug Undefined index menuswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-29 06:49:24 -05:00
Marc Delisle
cbbdf9825a Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-28 10:33:36 -05:00
Marc Delisle
d17215986d Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-28 08:02:01 -05:00
Michal ฤŒihaล™
109f08f429 Improve a bit recommendation to use another authentication as well 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2014-11-28 13:44:31 +01:00
Madhura Jayaratne
4476dbfee0 Use a unique number to distinguish multiple result sets 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 16:03:01 +05:30
Madhura Jayaratne
698813db3d Cleanup makegrid.js and do scoped selections 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 15:32:46 +05:30
Madhura Jayaratne
501a4c9c1f Use sqlqueryresultsouter to show USE or DROP query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 13:44:30 +05:30
Madhura Jayaratne
f5a943e8a1 Use class attribute to identify correct sql query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 13:43:30 +05:30
Madhura Jayaratne
be9a324138 This is redundant 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:58:52 +05:30
Madhura Jayaratne
981fc9f165 Match teardown selector with register selector 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:57:29 +05:30
Madhura Jayaratne
d21f37b3f1 Use class to identify bookmarkQueryForm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:51:30 +05:30
Madhura Jayaratne
fc61161883 Pass save_cells_at_once using class attribute 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:45:13 +05:30
Madhura Jayaratne
74bba2773d Update comment as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:43:57 +05:30
Madhura Jayaratne
b57250bcdf Pass table_create_time with class attribute 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:42:32 +05:30
Madhura Jayaratne
7647baee58 Pass column visibility with class attribute to the front end 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:40:48 +05:30
Madhura Jayaratne
42f9c8c460 Use class for passing column order to the front end 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:39:24 +05:30
Madhura Jayaratne
4327a98910 Use div id sqlqueryresultsouter in SQL tab since sqlqueryresults clashes with the results returned 2014-11-28 12:30:06 +05:30
Madhura Jayaratne
c397c9f2bb Use div id sqlqueryresultsouter in table search since sqlqueryresults clashes with the results returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:29:07 +05:30
Madhura Jayaratne
803d63d32f There is no sqlqueryresults div in db search. Use searchresults div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:27:12 +05:30
Weblate
3c6c80003c Merge remote-tracking branch 'origin/master' 2014-11-28 06:49:29 +01:00
Ann + J.M
139150b066 Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-28 06:49:27 +01:00
Madhura Jayaratne
1c6af0f7b9 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:18:57 +05:30
Madhura Jayaratne
3f673637b7 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-28 11:09:54 +05:30
Madhura Jayaratne
eb79ad9181 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:09:04 +05:30
Weblate
f4c5012cc7 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-28 06:31:51 +01:00
Ann + J.M
251a2aea78 Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-28 06:31:49 +01:00
Madhura Jayaratne
5c02da89be ChangeLog entry for bug #4227 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:01:18 +05:30
Madhura Jayaratne
ea7ca462e5 Document what these flags do 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:57:19 +05:30
Madhura Jayaratne
5e1ab952b8 Use a separate flag to avoid confusion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:52 +05:30
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:28 +05:30
Weblate
3cd0eceb55 Merge remote-tracking branch 'origin/master' 2014-11-27 16:49:22 +01:00
Ann + J.M
19efd36c9c Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-27 16:49:20 +01:00
Ann + J.M
b23a40f39c Merge branch 'QA_4_3' 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:49:06 +01:00
Ann + J.M
2e9b80e9e3 [DOC] Add ChangeLog entry for bug #4610 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:46:15 +01:00
Weblate
cb18cb6484 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-27 16:42:42 +01:00
Ann + J.M
b779a1881b Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-27 16:42:40 +01:00
Ann + J.M
36e49e496c [DOC] Add ChangeLog entry for bug #4609 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:42:25 +01:00
Ann + J.M
f14a051e1b [TEST] Fix failing test after 3d87430 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 16:38:50 +01:00