Commit Graph

98221 Commits

Author SHA1 Message Date
Madhura Jayaratne
d912798fd0 These are not generic expectations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 17:33:12 +05:30
Madhura Jayaratne
2b3c393f95 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-09 16:00:03 +05:30
Madhura Jayaratne
19116baec0 Check whether there are columns.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 15:58:52 +05:30
Weblate
d572df784b Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-09 11:20:26 +01:00
Michal Čihař
eae98c0809 Translated using Weblate (Vietnamese)
Currently translated at 2.2% (68 of 3032 strings)

[CI skip]
2015-03-09 11:20:23 +01:00
Madhura Jayaratne
0c83b29313 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-09 15:50:11 +05:30
Madhura Jayaratne
3821b724cc Move col_extra handling code to a single method. Add such missing col_extra handling.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 15:49:11 +05:30
Weblate
f5580dc46a Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-09 10:20:21 +01:00
Michal Čihař
a5e8dad8cd Translated using Weblate (Spanish)
Currently translated at 99.1% (3006 of 3032 strings)

[CI skip]
2015-03-09 10:20:18 +01:00
Helder Santana
0ae243251b Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.9% (2970 of 3032 strings)

[CI skip]
2015-03-09 10:20:17 +01:00
Giovanni Sora
dc52dd9c67 Translated using Weblate (Interlingua)
Currently translated at 68.7% (2085 of 3032 strings)

[CI skip]
2015-03-09 10:20:15 +01:00
Michal Čihař
dc761ce5ef Translated using Weblate (English (United Kingdom))
Currently translated at 88.5% (2685 of 3032 strings)

[CI skip]
2015-03-09 10:20:13 +01:00
Michal Čihař
da9359b990 Translated using Weblate (Arabic)
Currently translated at 37.3% (1133 of 3032 strings)

[CI skip]
2015-03-09 10:20:12 +01:00
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
7dde05cc41 phpUnit is unable to mock private methods
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 14:17:15 +05:30
Madhura Jayaratne
1f630a1a97 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 14:02:34 +05:30
Madhura Jayaratne
df39cff9ef Return value from the new method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 13:53:12 +05:30
Madhura Jayaratne
921710ec4d Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-03-09 13:33:09 +05:30
Madhura Jayaratne
42bbc5e04d bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 13:24:28 +05:30
Marc Delisle
a08353de46 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-07 06:42:40 -05:00
Marc Delisle
16a90d653d Translated using Weblate (French)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-07 12:38:55 +01:00
Domen
29613841db Translated using Weblate (Slovenian)
Currently translated at 99.9% (3031 of 3032 strings)

[CI skip]
2015-03-07 12:31:26 +01:00
Giovanni Sora
30da4c59ae Translated using Weblate (Interlingua)
Currently translated at 68.6% (2082 of 3032 strings)

[CI skip]
2015-03-07 12:31:25 +01:00
Michal Čihař
b30ab8dba1 Translated using Weblate (Czech)
Currently translated at 92.7% (2812 of 3032 strings)

[CI skip]
2015-03-07 12:31:24 +01:00
Marc Delisle
730fd4764f Translated using Weblate (French)
Currently translated at 99.9% (3031 of 3032 strings)

[CI skip]
2015-03-07 12:30:59 +01:00
Marc Delisle
15105efab1 Translated using Weblate (French)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-07 12:29:01 +01:00
Παναγιώτης Παπάζογλου
8ea3fbcd51 Translated using Weblate (Greek)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-06 19:52:30 +01:00
Burak Yavuz
a4a0fd6688 Translated using Weblate (Turkish)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-06 19:05:37 +01:00
Kristjan Räts
c103a83018 Translated using Weblate (Estonian)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-06 14:35:55 +01:00
Marc Delisle
d52d0a6032 Update po files
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-06 08:15:34 -05:00
Marc Delisle
fd366c9166 Clarify message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-06 08:14:00 -05:00
Atul Pratap Singh
cea9aa9688 Revert c9c280e992 and b39933c37b
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-03-06 18:20:35 +05:30
Madhura Jayaratne
c93d7f8440 Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 16:00:31 +05:30
Madhura Jayaratne
a708e79df7 Merge branch 'QA_4_3' into QA_4_4
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 15:55:44 +05:30
Madhura Jayaratne
390a36eeea Compatibility with central columns of version 4.4
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 15:52:44 +05:30
Weblate
59a8347ebb Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-06 11:08:39 +01:00
Michal Čihař
66433a0eff Translated using Weblate (Czech)
Currently translated at 92.6% (2810 of 3032 strings)

[CI skip]
2015-03-06 11:08:37 +01:00
Valter Georgiev
80ada8155c Translated using Weblate (Bulgarian)
Currently translated at 62.4% (1893 of 3032 strings)

[CI skip]
2015-03-06 11:08:35 +01:00
Madhura Jayaratne
f037e5a166 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-06 15:36:25 +05:30
Madhura Jayaratne
4b057ae45f Simplify handling values from previous version by using comma separated values
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 15:28:27 +05:30
Matthias Bluthardt
f8ba01fcbb Translated using Weblate (German)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-06 10:13:50 +01:00
Weblate
0a264104bb Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-06 04:17:33 +01:00
Dieter Adriaenssens
a5a9de6796 Translated using Weblate (Dutch)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-06 04:17:30 +01:00
Madhura Jayaratne
8d7caf61f9 Merge branch 'QA_4_3' into QA_4_4 2015-03-06 08:47:05 +05:30
Madhura Jayaratne
31410ecb0a Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 08:34:40 +05:30
Madhura Jayaratne
1bb782aa46 bug #4790 DROP TABLE/VIEW IF EXISTS are not tracked
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 08:14:52 +05:30
Dieter Adriaenssens
89c09ac7bc Translated using Weblate (Dutch)
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
2015-03-05 21:37:30 +01:00
Weblate
07462151a5 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-05 21:17:23 +01:00
Macofe
d92d9fa9a6 Translated using Weblate (Spanish)
Currently translated at 99.1% (3007 of 3032 strings)

[CI skip]
2015-03-05 21:17:20 +01:00
Douglas Rafael Morais Kollar
b1c16eb6c1 Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.9% (2971 of 3032 strings)

[CI skip]
2015-03-05 21:17:17 +01:00