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

96858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
f6a19c79cb Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-30 18:38:41 +05:30
Madhura Jayaratne
cd249f1cbe rfe #1572 User prefs: Diff-friendly JSON for config 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-30 18:36:51 +05:30
Weblate
315503c2b2 Merge remote-tracking branch 'origin/master' 2014-12-29 15:07:12 +01:00
Martin Lacina
59a18b47fa Translated using Weblate (Slovak) 
Currently translated at 71.9% (2149 of 2988 strings)

[CI skip]
 2014-12-29 15:07:10 +01:00
Marc Delisle
1153082079 Clarify variable names 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-29 09:07:00 -05:00
Weblate
73617b1963 Merge remote-tracking branch 'origin/master' 2014-12-29 13:08:23 +01:00
Somthanat Wongsa
e5f9c1e5b0 Translated using Weblate (Thai) 
Currently translated at 35.4% (1058 of 2988 strings)

[CI skip]
 2014-12-29 13:08:20 +01:00
Rifthy Ahmed
035d1da589 Translated using Weblate (Tamil) 
Currently translated at 39.7% (1188 of 2988 strings)

[CI skip]
 2014-12-29 13:08:17 +01:00
Martin Lacina
2fea97a870 Translated using Weblate (Slovak) 
Currently translated at 71.5% (2137 of 2988 strings)

[CI skip]
 2014-12-29 13:08:14 +01:00
Marc Delisle
ce0763f2eb 4.3.4 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-29 07:07:52 -05:00
Marc Delisle
cb298b0407 Merge branch 'QA_4_3' 2014-12-29 07:06:34 -05:00
Marc Delisle
bbebf89ad2 4.3.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-29 07:06:01 -05:00
Marc Delisle
629e08cbc4 Code cleanup: $disp_mode was always empty at this point 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-28 09:48:04 -05:00
Marc Delisle
8680240319 Remove unneeded level of function call 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-28 06:52:36 -05:00
Marc Delisle
60a8d33ab5 Merge branch 'QA_4_3' 2014-12-28 06:18:56 -05:00
Marc Delisle
67a67b7e9d Merge pull request #1439 from Tithugues/b4673_qa43 
Fix #4673 Delimiter causing page lock
 2014-12-28 06:16:10 -05:00
Hugues Peccatte
70985f197c Update ChangeLog 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-27 20:11:27 +01:00
Hugues Peccatte
0d3a9e4ca6 Fix #4673 Delimiter causing page lock 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-27 20:10:37 +01:00
Robin van der Vliet
ca1f0a0fc8 Translated using Weblate (Limburgish) 
Currently translated at 0.0% (0 of 2988 strings)

[CI skip]
 2014-12-27 15:51:21 +01:00
Robin van der Vliet
39b9c91056 Translated using Weblate (Esperanto) 
Currently translated at 0.0% (0 of 2988 strings)

[CI skip]
 2014-12-27 15:40:42 +01:00
Marc Delisle
ac381bb4e3 Fix Plural-Forms in newly added li language 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-27 07:56:07 -05:00
Marc Delisle
3443ce8a18 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-27 07:47:18 -05:00
Michal ฤŒihaล™
70dcf37480 Add Limburgish and Esperanto translation 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2014-12-27 11:57:46 +01:00
Hugues Peccatte
82358ecbb3 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-26 15:00:44 +01:00
Marc Delisle
4e8737ff2c Merge branch 'QA_4_3' 2014-12-26 08:29:32 -05:00
Marc Delisle
38bb19ffb6 bug #4655 Undefined index: collation_connection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-26 08:29:09 -05:00
Marc Delisle
7694043514 Merge branch 'QA_4_3' 2014-12-25 07:48:04 -05:00
Marc Delisle
d3bd2ae8da Merge commit '09e1896' 2014-12-25 07:47:56 -05:00
Marc Delisle
462428570e bug #4658 Illegal string offset (Data_length, Index_length) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-25 07:47:20 -05:00
Weblate
d8072b9a27 Merge remote-tracking branch 'origin/master' 2014-12-25 12:45:11 +01:00
Robin van der Vliet
ee81b758ef Translated using Weblate (Frisian) 
Currently translated at 21.6% (647 of 2988 strings)

[CI skip]
 2014-12-25 12:45:08 +01:00
Robin van der Vliet
7ed1eac353 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-25 12:45:07 +01:00
Marc Delisle
a7267d751b Merge branch 'QA_4_3' 2014-12-25 06:44:26 -05:00
Marc Delisle
6c31790ff9 Merge commit '4e65c7f' 2014-12-25 06:44:19 -05:00
Weblate
09e189605d Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-25 12:44:00 +01:00
Robin van der Vliet
fe2725f5be Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-25 12:43:57 +01:00
Marc Delisle
056e15749e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-25 06:43:47 -05:00
Robin van der Vliet
0783075b1e Translated using Weblate (Frisian) 
Currently translated at 20.9% (627 of 2988 strings)

[CI skip]
 2014-12-24 22:47:47 +01:00
Robin van der Vliet
9bef084460 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 22:11:37 +01:00
Robin van der Vliet
4e65c7fc4d Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-24 22:11:22 +01:00
Robin van der Vliet
9a4de91931 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 22:09:16 +01:00
Robin van der Vliet
1b9bedc65c Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-24 22:09:02 +01:00
Robin van der Vliet
a807567d2f Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 22:03:13 +01:00
Robin van der Vliet
9fea160d3b Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-24 21:58:56 +01:00
Marc Delisle
668bf046d0 Merge branch 'QA_4_3' 2014-12-24 13:46:18 -05:00
Marc Delisle
6fab2c158e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 13:45:30 -05:00
Marc Delisle
cd136786e9 Merge pull request #1438 from rakeshkaundilya/QA_4_3 
fix bug #4672
 2014-12-24 13:44:27 -05:00
Rakesh Kumar
ed32527de0 fix bug #4672 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2014-12-24 23:01:29 +05:30
Robin van der Vliet
99311deae3 Translated using Weblate (Frisian) 
Currently translated at 16.6% (497 of 2988 strings)

[CI skip]
 2014-12-24 17:15:34 +01:00
Marc Delisle
1c1c313d76 Merge branch 'QA_4_3' 2014-12-24 06:41:47 -05:00