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

96628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
8620242e68 Merge remote-tracking branch 'nisargjhaveri/console_focus_end' 2014-12-15 07:29:36 -05:00
Madhura Jayaratne
7b206639cc Merge branch 'QA_4_3' 2014-12-15 16:13:29 +05:30
Madhura Jayaratne
e79bfbdbeb bug #4630 AJAX request infinite loop 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 16:12:33 +05:30
Madhura Jayaratne
04479adad1 Merge branch 'QA_4_3' 2014-12-15 15:46:07 +05:30
Madhura Jayaratne
fefb11eb87 bug #4646 Version Check Broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 15:45:09 +05:30
Madhura Jayaratne
caf96c3d8f Server need not be added to url_params; PMA_URL_getHiddenInputs() takes care of adding server to the form if needed. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 12:11:12 +05:30
Marc Delisle
f59fcfa8c0 Removal of dead code was incomplete 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-14 08:57:29 -05:00
Nisarg Jhaveri
57c498f060 Set cursor at end in console while navigating with up/down key 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2014-12-14 19:01:57 +05:30
Ann + J.M
c41325440a Translated using Weblate (German) 
Currently translated at 100.0% (2989 of 2989 strings)

[CI skip]
 2014-12-14 13:35:57 +01:00
Marc Delisle
583901988f Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-14 06:48:20 -05:00
Chirayu Chiripal
fcb7dd9da3 Fix selenium test - change records by double click 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-14 14:25:29 +05:30
Chirayu Chiripal
3edcb80e23 exclude third party js lib (js/sprintf.js) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-14 13:28:32 +05:30
Marc Delisle
eef711f250 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-13 06:08:27 -05:00
Marc Delisle
517765872d Merge branch 'QA_4_3' 2014-12-12 13:31:02 -05:00
Marc Delisle
4f01b894e8 Merge commit '85c8f11' 2014-12-12 13:30:56 -05:00
Marc Delisle
c2e308cb1e bug #4647 Can't disable Favorites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 13:30:27 -05:00
Weblate
112b1a48e0 Merge remote-tracking branch 'origin/master' 2014-12-12 19:17:28 +01:00
Maciej Gryniuk
db5f8f0d8a Translated using Weblate (Polish) 
Currently translated at 87.9% (2628 of 2989 strings)

[CI skip]
 2014-12-12 19:17:25 +01:00
Marc Delisle
a6b1ce28d8 Merge branch 'QA_4_3' 2014-12-12 13:16:24 -05:00
Marc Delisle
4064bb56c8 Merge commit 'a34b642' 2014-12-12 13:16:19 -05:00
Weblate
85c8f11c54 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-12 19:16:01 +01:00
Maciej Gryniuk
89c50d3c10 Translated using Weblate (Polish) 
Currently translated at 88.3% (2630 of 2978 strings)

[CI skip]
 2014-12-12 19:15:58 +01:00
Marc Delisle
38f0969410 bug The "Recently used tables" setting should be with Nav panel 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 13:15:49 -05:00
Marc Delisle
c54396dfe4 Merge branch 'QA_4_3' 2014-12-12 08:38:06 -05:00
Marc Delisle
e01e0ea968 4.3.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 08:37:48 -05:00
Weblate
a34b64221a Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-12 14:37:13 +01:00
Michal ฤŒihaล™
97977bb3f5 Translated using Weblate (Korean) 
Currently translated at 83.0% (2473 of 2978 strings)

[CI skip]
 2014-12-12 14:37:11 +01:00
Marc Delisle
cca317168b 4.3.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 08:36:42 -05:00
Weblate
00f2d635f3 Merge remote-tracking branch 'origin/master' 2014-12-12 14:26:33 +01:00
Michal ฤŒihaล™
cdca17dda5 Translated using Weblate (Azerbaijani) 
Currently translated at 52.9% (1582 of 2989 strings)

[CI skip]
 2014-12-12 14:26:30 +01:00
Marc Delisle
6c12e9f498 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 08:26:16 -05:00
Marc Delisle
c675faa783 Merge remote-tracking branch 'nisargjhaveri/console_nav' 2014-12-12 08:22:35 -05:00
Marc Delisle
0fc7caf4c6 Merge branch 'QA_4_3' 2014-12-12 07:31:05 -05:00
Marc Delisle
780ff0217f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 07:30:38 -05:00
Marc Delisle
beb4f1495c Merge commit '8cb3b72' 2014-12-12 07:29:51 -05:00
Marc Delisle
5a3449b694 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 07:28:49 -05:00
Chirayu Chiripal
ae4f983746 simplify and fix scrutinizer execution path notices 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-12 15:59:04 +05:30
Weblate
85678bf199 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-12 11:01:53 +01:00
Kushagra Pandey
6f19a5711a Translated using Weblate (Hindi) 
Currently translated at 42.7% (1273 of 2978 strings)

[CI skip]
 2014-12-12 11:01:50 +01:00
Madhura Jayaratne
eb69c015ac #4644 Error when browsing tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-12 15:26:00 +05:30
Hugues Peccatte
8cb3b720ba Fix #4637 Field Alignment 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-12 09:36:13 +01:00
Weblate
1244a2d4f9 Merge remote-tracking branch 'origin/master' 2014-12-11 19:42:13 +01:00
Kushagra Pandey
f70adf3889 Translated using Weblate (Hindi) 
Currently translated at 42.5% (1273 of 2989 strings)

[CI skip]
 2014-12-11 19:42:10 +01:00
Hugues Peccatte
e1132f4923 Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-11 19:38:50 +01:00
Hugues Peccatte
c9e91e5bd0 Fix #4637 Field Alignment 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-11 19:38:10 +01:00
Madhura Jayaratne
7793dd3e90 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-11 21:30:23 +05:30
Madhura Jayaratne
4ca0aad458 Temporarily make TCPDF method _destroyAll() public. 
Fixes 'Warning: (Registered shutdown functions) Unable to call TCPDF::_destroyAll() - function does not exist in Unknown on line 0'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 21:29:13 +05:30
Marc Delisle
ffa83ae0d7 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 10:55:43 -05:00
Marc Delisle
9555a21a3d Another instance of Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 10:53:20 -05:00
Marc Delisle
a0845e879f ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-11 08:23:31 -05:00