Commit Graph

95547 Commits

Author SHA1 Message Date
Hugues Peccatte
14bda32169 Fix delimiter reading.
Rum last SQL query.
Fix SQL reading.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-25 12:23:15 +02:00
Hugues Peccatte
3363f10880 Rename ImportSQL method.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 21:06:17 +02:00
Hugues Peccatte
74f0beda8f Fix syntax error.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 20:56:12 +02:00
Marc Delisle
8a3bf5af9f Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-20 13:14:05 -04:00
Weblate
c541114ddb Merge remote-tracking branch 'origin/master' 2014-10-20 11:27:33 +02:00
josep constanti
03b84715f6 Translated using Weblate (Catalan)
Currently translated at 83.5% (2484 of 2973 strings)

[CI skip]
2014-10-20 11:27:32 +02:00
Madhura Jayaratne
d2aec03f2b Do not remove throbber in case of aborted ajax filter calls
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-20 14:56:40 +05:30
Marc Delisle
9680410019 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-19 10:13:07 -04:00
Chirayu Chiripal
b21314179b phpdoc variable type fix
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-10-19 16:59:14 +05:30
Madhura Jayaratne
8785ea0e34 Adjust tests for commit 3ec96cb038
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-19 08:22:06 +05:30
Hugues Peccatte
4b9058faa9 Manage escaped quotes.
Improve process not to look for the same thing many times.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-18 23:57:54 +02:00
Hugues Peccatte
d936df12d2 Manage option to read SQL as a multibytes string or not.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-18 20:31:54 +02:00
Madhura Jayaratne
aaa2116b01 Fix some of the failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-18 21:59:33 +05:30
Madhura Jayaratne
c4f67f05c8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-18 20:40:37 +05:30
Madhura Jayaratne
d0b1002893 Include by default
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-18 20:15:10 +05:30
Dieter Adriaenssens
d898d66229 Translated using Weblate (Dutch)
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
2014-10-18 16:21:57 +02:00
Weblate
ce85124fab Merge remote-tracking branch 'origin/master' 2014-10-18 14:31:41 +02:00
Tor Stokkan
346db836b2 Translated using Weblate (Norwegian Bokmål)
Currently translated at 59.9% (1782 of 2973 strings)

[CI skip]
2014-10-18 14:31:40 +02:00
Giovanni Sora
45c2189a34 Translated using Weblate (Interlingua)
Currently translated at 63.7% (1895 of 2973 strings)

[CI skip]
2014-10-18 14:31:38 +02:00
Marc Delisle
3ec96cb038 Remove unused code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-18 08:31:26 -04:00
Tor Stokkan
69950373d5 Translated using Weblate (Norwegian Bokmål)
Currently translated at 59.8% (1780 of 2973 strings)

[CI skip]
2014-10-18 07:48:22 +02:00
Madhura Jayaratne
e985d56fe4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-18 07:07:14 +05:30
julianladisch
2886766381 Translated using Weblate (German)
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
2014-10-17 22:51:05 +02:00
Domen
38aac207a8 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
2014-10-17 22:43:46 +02:00
Weblate
4559bbfb1d Merge remote-tracking branch 'origin/master' 2014-10-17 14:06:35 +02:00
Giovanni Sora
dc23f789fa Translated using Weblate (Interlingua)
Currently translated at 62.9% (1872 of 2973 strings)

[CI skip]
2014-10-17 14:06:33 +02:00
Marc Delisle
d3d0768693 Merge commit 'e7f1c85' 2014-10-17 08:06:19 -04:00
Giovanni Sora
b4d97de678 Translated using Weblate (Interlingua)
Currently translated at 62.5% (1861 of 2973 strings)

[CI skip]
2014-10-17 13:58:58 +02:00
Marc Delisle
dffc085e0f Translated using Weblate (French)
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
2014-10-17 13:56:58 +02:00
Madhura Jayaratne
fa3c538341 Align
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 15:08:28 +05:30
Madhura Jayaratne
6086856d24 Wrap a long line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 15:08:07 +05:30
Kristjan Räts
001ebb8d03 Translated using Weblate (Estonian)
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
2014-10-17 11:17:49 +02:00
Weblate
7b3e081aa0 Merge remote-tracking branch 'origin/master' 2014-10-17 10:05:49 +02:00
Giovanni Sora
292197a89a Translated using Weblate (Interlingua)
Currently translated at 61.4% (1826 of 2973 strings)

[CI skip]
2014-10-17 10:05:48 +02:00
Madhura Jayaratne
00f2788a66 bug #4560 PHP error on master branch
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 13:35:16 +05:30
Madhura Jayaratne
ae148f37e6 Merge branch 'QA_4_2' 2014-10-17 13:16:45 +05:30
Weblate
e7f1c8506f Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-17 09:45:00 +02:00
Edgars Neimanis
bb056b5a20 Translated using Weblate (Latvian)
Currently translated at 23.9% (664 of 2768 strings)

[CI skip]
2014-10-17 09:44:58 +02:00
Madhura Jayaratne
bdd76f18ce bug #4259 reCaptcha sound session expired problem
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 13:14:28 +05:30
Madhura Jayaratne
55114b95e0 Wrap more long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 13:07:25 +05:30
Madhura Jayaratne
8ef9ced453 Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 12:51:28 +05:30
Madhura Jayaratne
55d90fd018 Bug #4561 PHP error in transformations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 12:49:18 +05:30
Madhura Jayaratne
a87294fbe4 Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 08:28:05 +05:30
Chanaka Dharmarathna
0afe20e942 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-17 01:29:30 +05:30
Chanaka Dharmarathna
ad67a3a831 Change log entry
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-10-17 01:27:31 +05:30
Wojciech Mleczek
998f969d5e rfe1547 - Wrap message with message box
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-10-17 01:16:21 +05:30
Weblate
916112e9ac Merge remote-tracking branch 'origin/master' 2014-10-16 21:46:10 +02:00
Edgars Neimanis
cccd56a735 Translated using Weblate (Latvian)
Currently translated at 21.6% (645 of 2973 strings)

[CI skip]
2014-10-16 21:46:08 +02:00
Weblate
f3fe7ca528 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-16 21:13:36 +02:00
Burak Yavuz
aa3fd712e9 Translated using Weblate (Turkish)
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
2014-10-16 21:13:35 +02:00