Commit Graph

96879 Commits

Author SHA1 Message Date
Martin Lacina
fe8cfc6165 Translated using Weblate (Slovak)
Currently translated at 73.1% (2185 of 2988 strings)

[CI skip]
2014-12-31 11:55:56 +01:00
Madhura Jayaratne
dde279909b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-30 22:56:56 +05:30
Madhura Jayaratne
1b87db5724 bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-30 22:55:33 +05:30
Marc Delisle
84b46d3b99 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-30 12:08:10 -05:00
Marc Delisle
7a34a1d8de Merge branch 'QA_4_3' 2014-12-30 11:47:38 -05:00
Marc Delisle
40917ba165 Merge commit 'fd5d56b' 2014-12-30 11:47:27 -05:00
Marc Delisle
e30d15d3b8 Bug in Auto-configuration: tables were not created automatically
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-30 11:46:48 -05:00
Madhura Jayaratne
78fde19a35 ChangeLog entry for fc5bd53eba
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-30 19:27:33 +05:30
Marc Delisle
916120a637 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-30 08:48:20 -05:00
Marc Delisle
b5512e6183 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-30 08:41:48 -05:00
Marc Delisle
77ce556a2a Merge pull request #1441 from madhuracj/rfe1567
Sever Variables Table UI Improvements
2014-12-30 08:30:52 -05:00
Madhura Jayaratne
c4c583c597 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-30 18:47:20 +05:30
Weblate
5bff4deabe Merge remote-tracking branch 'origin/master' 2014-12-30 14:09:11 +01:00
Anders Jonsson
440a32edee Translated using Weblate (Swedish)
Currently translated at 90.7% (2713 of 2988 strings)

[CI skip]
2014-12-30 14:09:09 +01:00
Aputsiaĸ Niels Janussen
c54b31621f Translated using Weblate (Danish)
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
2014-12-30 14:09:07 +01:00
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
Madhura Jayaratne
fc5bd53eba Sever Variables Table UI Improvements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-30 18:03:40 +05:30
Aputsiaĸ Niels Janussen
fd5d56b311 Translated using Weblate (Danish)
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
2014-12-29 18:24:28 +01:00
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
Weblate
8f56b65633 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-29 13:06:24 +01:00
Somthanat Wongsa
192d265fb4 Translated using Weblate (Thai)
Currently translated at 35.4% (1056 of 2977 strings)

[CI skip]
2014-12-29 13:06:22 +01:00
Rifthy Ahmed
edf5fd8a0f Translated using Weblate (Tamil)
Currently translated at 39.7% (1183 of 2977 strings)

[CI skip]
2014-12-29 13:06:20 +01:00
Martin Lacina
21684f43a6 Translated using Weblate (Slovak)
Currently translated at 71.6% (2134 of 2977 strings)

[CI skip]
2014-12-29 13:06:18 +01: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