Commit Graph

100083 Commits

Author SHA1 Message Date
Marc Delisle
20db71b940 Merge commit '0bbd8b9' 2015-05-30 07:21:06 -04:00
Smita Kumari
0bbd8b9223 fix bug #4909
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2015-05-30 00:11:50 +05:30
dingo thirteen
a3c83a1521 Translated using Weblate (Dutch)
Currently translated at 100.0% (3106 of 3106 strings)

[CI skip]
2015-05-29 17:34:32 +02:00
Madhura Jayaratne
3ada00030f Fix failing translation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 19:25:27 +05:30
Madhura Jayaratne
8fa3680da8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-29 19:19:00 +05:30
Madhura Jayaratne
6439a10af2 bug #4872 Drop table doesn't remove the table name from navigation bar
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 19:17:58 +05:30
Marc Delisle
478a3b4784 Translated using Weblate (French)
Currently translated at 100.0% (3106 of 3106 strings)

[CI skip]
2015-05-29 14:48:02 +02:00
Weblate
1362e91176 Merge remote-tracking branch 'origin/master' 2015-05-29 13:27:02 +02:00
Costel Cocerhan
ca5a6f8681 Translated using Weblate (Romanian)
Currently translated at 57.4% (1784 of 3104 strings)

[CI skip]
2015-05-29 13:26:59 +02:00
Marc Delisle
f0c272ce6e Fix test
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-29 07:26:49 -04:00
Madhura Jayaratne
375d34157b Merge branch 'QA_4_4' 2015-05-29 15:46:39 +05:30
Madhura Jayaratne
6a6ed5d5dc Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 15:45:27 +05:30
Madhura Jayaratne
52a06ee5f9 Merge branch 'QA_4_4' 2015-05-29 15:37:50 +05:30
Madhura Jayaratne
0391bab825 bug #4931 False error before entering reCAPTCHA
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 15:30:19 +05:30
Madhura Jayaratne
19f8048bee Merge branch 'QA_4_4' 2015-05-29 11:32:09 +05:30
Madhura Jayaratne
02a6541e46 bug #4905 Sorting by an alias
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 11:29:59 +05:30
Madhura Jayaratne
f4b12e5cbd Align
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 10:52:35 +05:30
Madhura Jayaratne
323482bcea Merge branch 'QA_4_4' 2015-05-29 10:52:02 +05:30
Madhura Jayaratne
d5371be455 bug #4920 relation view doesn't list fields of table in other database
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 10:49:11 +05:30
Marc Delisle
afdce2f594 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-28 10:43:48 -04:00
Marc Delisle
ccdc5134ab Fix loose comparison
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-28 10:41:17 -04:00
Weblate
a9385785fb Merge remote-tracking branch 'origin/master' 2015-05-28 16:23:40 +02:00
Alan Hilal
8e2c77cc29 Translated using Weblate (Kurdish Sorani)
Currently translated at 20.0% (623 of 3106 strings)

[CI skip]
2015-05-28 16:23:37 +02:00
Marc Delisle
50fb7adee4 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-28 10:23:28 -04:00
Marc Delisle
ffdd12dd01 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-28 09:55:57 -04:00
Marc Delisle
691cf3f5dd 4.4.8 release date
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-28 07:28:00 -04:00
Marc Delisle
62d826e5de Merge branch 'QA_4_4' 2015-05-28 07:26:34 -04:00
Marc Delisle
155521b404 4.4.9-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-28 07:26:02 -04:00
Madhura Jayaratne
7aa74ad919 Merge branch 'QA_4_4' 2015-05-28 15:59:20 +05:30
Madhura Jayaratne
c1588f47e4 Compatibility with php 5.3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-28 15:57:42 +05:30
Madhura Jayaratne
cc7f5962f5 Merge branch 'QA_4_4' 2015-05-28 15:37:25 +05:30
Madhura Jayaratne
a9f3ae7d8e Fix erroneous parameter value in substr
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-28 15:36:20 +05:30
Madhura Jayaratne
8b4faf6df1 Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-28 15:07:51 +05:30
Madhura Jayaratne
c158a313ea Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-28 15:03:44 +05:30
Madhura Jayaratne
7381aa554e Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-28 15:03:08 +05:30
Weblate
de3e9e7baf Merge remote-tracking branch 'origin/master' 2015-05-28 11:26:33 +02:00
Kurt Eilertsen
3bc6152cec Translated using Weblate (Norwegian Bokmål)
Currently translated at 59.3% (1841 of 3101 strings)

[CI skip]
2015-05-28 11:26:30 +02:00
Stefano Martinelli
cb0a90e15d Translated using Weblate (Italian)
Currently translated at 99.5% (3092 of 3105 strings)

[CI skip]
2015-05-28 11:26:28 +02:00
Giovanni Sora
b7771df117 Translated using Weblate (Interlingua)
Currently translated at 69.5% (2157 of 3102 strings)

[CI skip]
2015-05-28 11:26:26 +02:00
Chien Wei Lin
4a03ad8ab8 Translated using Weblate (Chinese (Taiwan))
Currently translated at 98.8% (3068 of 3105 strings)

[CI skip]
2015-05-28 11:26:24 +02:00
Madhura Jayaratne
6e999cab5c Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-28 14:52:58 +05:30
Weblate
779ccff206 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-28 11:11:24 +02:00
Kurt Eilertsen
d4e69ff698 Translated using Weblate (Norwegian Bokmål)
Currently translated at 60.7% (1843 of 3035 strings)

[CI skip]
2015-05-28 11:11:22 +02:00
Chien Wei Lin
225d6c1061 Translated using Weblate (Chinese (Taiwan))
Currently translated at 98.9% (3004 of 3035 strings)

[CI skip]
2015-05-28 11:11:20 +02:00
Madhura Jayaratne
860dd88cdd Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-28 14:41:09 +05:30
Madhura Jayaratne
834df9d982 - bug #4923 Do not limit table comments to 60 characters
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-28 14:39:47 +05:30
Christoffer Haugom
a663ab254a Translated using Weblate (Norwegian Bokmål)
Currently translated at 59.3% (1840 of 3101 strings)

[CI skip]
2015-05-28 11:01:59 +02:00
Kurt Eilertsen
5501682cee Translated using Weblate (Norwegian Bokmål)
Currently translated at 59.3% (1840 of 3101 strings)

[CI skip]
2015-05-28 10:50:39 +02:00
Παναγιώτης Παπάζογλου
dddcbc63b2 Translated using Weblate (Greek)
Currently translated at 100.0% (3105 of 3105 strings)

[CI skip]
2015-05-28 07:46:02 +02:00
Weblate
0440685958 Merge remote-tracking branch 'origin/master' 2015-05-28 05:27:53 +02:00