Commit Graph

97168 Commits

Author SHA1 Message Date
Marc Delisle
bd44c979ac Merge commit '2248993' 2015-01-11 06:05:02 -05:00
Marc Delisle
5ab46c758b Merge commit 'e858172' 2015-01-11 06:04:48 -05:00
Marc Delisle
f91969d2a4 Merge commit 'e51b582' 2015-01-11 06:04:31 -05:00
Marc Delisle
2248993e2f Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2015-01-11 06:03:49 -05:00
Marc Delisle
e858172a9f Bug Undefined index central_columnswork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-11 06:03:28 -05:00
Weblate
26c4938970 Merge remote-tracking branch 'origin/master' 2015-01-11 11:51:14 +01:00
Martin Lacina
e9c4fe3b28 Translated using Weblate (Slovak)
Currently translated at 77.6% (2325 of 2996 strings)

[CI skip]
2015-01-11 11:51:11 +01:00
Marc Delisle
4884e088ad Merge branch 'QA_4_3' 2015-01-11 05:50:54 -05:00
Weblate
e51b5829c3 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-11 11:50:43 +01:00
Martin Lacina
3f7686df2d Translated using Weblate (Slovak)
Currently translated at 77.8% (2318 of 2979 strings)

[CI skip]
2015-01-11 11:50:40 +01:00
Marc Delisle
a41ddf562e Bug Null argument in array_multisort()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-11 05:50:17 -05:00
Marc Delisle
2231baf725 Merge branch 'QA_4_3' 2015-01-10 07:11:24 -05:00
Marc Delisle
8e3892d42a Merge commit '3f7dd45' 2015-01-10 07:11:12 -05:00
Marc Delisle
b5cb2e9139 Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2015-01-10 07:10:36 -05:00
Marc Delisle
b5cccf1761 Fix reference in ChangeLog
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-10 07:10:14 -05:00
Marc Delisle
ddf25f9cce Merge branch 'QA_4_3' 2015-01-10 06:39:01 -05:00
Marc Delisle
cdd268c971 Merge commit '821548b' 2015-01-10 06:38:55 -05:00
Weblate
3f7dd45bcb Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-10 12:38:35 +01:00
Marco Pozzato
d7cb1897f0 Translated using Weblate (Italian)
Currently translated at 80.9% (2413 of 2981 strings)

[CI skip]
2015-01-10 12:38:32 +01:00
Dadan Setia
09ea2b597c Translated using Weblate (Indonesian)
Currently translated at 74.7% (2229 of 2982 strings)

[CI skip]
2015-01-10 12:38:31 +01:00
Claus Svalekjaer
64b0dbd21b Translated using Weblate (Danish)
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
2015-01-10 12:38:29 +01:00
Viktar Palstsiuk
1b10e6936d Translated using Weblate (Belarusian)
Currently translated at 27.9% (833 of 2979 strings)

[CI skip]
2015-01-10 12:38:28 +01:00
Marc Delisle
2e2867d241 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-10 06:37:18 -05:00
Vignesh Panneerselvam
0d87abfd78 Server Status refresh not behaving as expected
Signed-off-by: Vignesh Panneerselvam <me@vignesh.info>
2015-01-10 06:35:35 -05:00
Weblate
1311d60602 Merge remote-tracking branch 'origin/master' 2015-01-10 12:26:11 +01:00
Dadan Setia
76b16da16a Translated using Weblate (Indonesian)
Currently translated at 74.6% (2236 of 2996 strings)

[CI skip]
2015-01-10 12:26:08 +01:00
Claus Svalekjaer
4c56667aa8 Translated using Weblate (Danish)
Currently translated at 99.8% (2993 of 2996 strings)

[CI skip]
2015-01-10 12:26:07 +01:00
Marc Delisle
3ea88f59ae Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-10 06:25:57 -05:00
Balázs Úr
a88b7079e1 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2996 of 2996 strings)

[CI skip]
2015-01-10 09:56:41 +01:00
Domen
d12db20c94 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2996 of 2996 strings)

[CI skip]
2015-01-10 01:09:42 +01:00
Παναγιώτης Παπάζογλου
e043284c74 Translated using Weblate (Greek)
Currently translated at 100.0% (2996 of 2996 strings)

[CI skip]
2015-01-09 20:29:30 +01:00
dingo thirteen
f4186e16b5 Translated using Weblate (Dutch)
Currently translated at 100.0% (2996 of 2996 strings)

[CI skip]
2015-01-09 20:25:05 +01:00
Marc Delisle
7c82b7bd65 Translated using Weblate (French)
Currently translated at 100.0% (2996 of 2996 strings)

[CI skip]
2015-01-09 19:54:36 +01:00
Marc Delisle
a22d94b9db Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-09 13:52:12 -05:00
Burak Yavuz
22e00e6a35 Translated using Weblate (Turkish)
Currently translated at 100.0% (2996 of 2996 strings)

[CI skip]
2015-01-09 19:21:45 +01:00
Marc Delisle
735296232a Update po files
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-09 12:30:45 -05:00
Weblate
efa732548b Merge remote-tracking branch 'origin/master' 2015-01-09 18:26:38 +01:00
Viktar Palstsiuk
ed5dd52420 Translated using Weblate (Belarusian)
Currently translated at 27.8% (834 of 2995 strings)

[CI skip]
2015-01-09 18:26:36 +01:00
Marc Delisle
be585531a3 Plural form of message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-09 12:26:24 -05:00
Marc Delisle
85c69af111 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-01-09 12:02:00 -05:00
Madhura Jayaratne
b8f6331e43 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-09 21:53:47 +05:30
Madhura Jayaratne
f805f09bc4 Fix failing test
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-09 21:52:24 +05:30
Weblate
ab158cfd70 Merge remote-tracking branch 'origin/master' 2015-01-09 17:04:45 +01:00
Marco Pozzato
0be79a9972 Translated using Weblate (Italian)
Currently translated at 80.5% (2412 of 2995 strings)

[CI skip]
2015-01-09 17:04:42 +01:00
Madhura Jayaratne
c8190ce72f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-09 21:34:26 +05:30
Madhura Jayaratne
22e6f3ab78 Merge branch 'transform' 2015-01-09 21:32:21 +05:30
Madhura Jayaratne
9e26714239 Fix failing test
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-09 21:32:03 +05:30
Madhura Jayaratne
a790c2cf33 rfe #347 allow table with transformed column anywhere in FROM clause
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-09 21:31:28 +05:30
Marc Delisle
0f67f7fb2f Merge branch 'QA_4_3' 2015-01-09 08:33:11 -05:00
Marc Delisle
361207ad38 Merge commit '2d6c4f5' 2015-01-09 08:33:04 -05:00