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

96616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Delisle
9cc22a0414 Merge pull request #1420 from nisargjhaveri/console_focus 
Focus console by clicking on white space
 2014-12-11 08:22:38 -05:00
Madhura Jayaratne
aba1d92362 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:50:22 +05:30
Madhura Jayaratne
7de549b7f3 bug #4639 Export SQL missing indentation first field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:45:56 +05:30
Madhura Jayaratne
4c69e7a857 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:04:12 +05:30
Madhura Jayaratne
43db57bc19 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-11 15:58:27 +05:30
Madhura Jayaratne
4f1ce1004e bug #4638 Default Export Method setting broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 15:57:19 +05:30
Weblate
8685816f69 Merge remote-tracking branch 'origin/master' 2014-12-11 08:54:45 +01:00
Dongyoung Kim
35976eaf1d Translated using Weblate (Korean) 
Currently translated at 82.7% (2474 of 2989 strings)

[CI skip]
 2014-12-11 08:54:42 +01:00
Aputsiaĸ Niels Janussen
b996c98ad0 Translated using Weblate (Danish) 
Currently translated at 98.1% (2935 of 2989 strings)

[CI skip]
 2014-12-11 08:54:40 +01:00
Madhura Jayaratne
fedb566477 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:24:14 +05:30
Weblate
fef9bfbde1 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-11 08:52:01 +01:00
Dongyoung Kim
7e90cbc8c4 Translated using Weblate (Korean) 
Currently translated at 83.0% (2473 of 2978 strings)

[CI skip]
 2014-12-11 08:51:59 +01:00