Commit Graph

93881 Commits

Author SHA1 Message Date
Marc Delisle
c19cb1d480 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-12 17:28:41 -04:00
Weblate
e8c4b421ef Merge remote-tracking branch 'origin/master' 2014-07-12 21:53:06 +02:00
Sevdimali İsa
6b0bb7eec9 Translated using Weblate (Azerbaijani)
Currently translated at 40.5% (1175 of 2896)
2014-07-12 21:53:02 +02:00
Marc Delisle
d731bf53aa Merge pull request #1282 from ashutoshdhundhara/unit_tests
Unit tests for new code upto mid term.
2014-07-12 15:53:00 -04:00
Ashutosh Dhundhara
3fd300e04b Unit tests for new code upto mid term.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding style and code duplication.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Code refactor.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Remove unused code.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-07-13 00:17:03 +05:30
Isaac Bennetch
175c1a786a Merge pull request #1276 from D-storm/FR-637
RFE-637: Custom field handlers (input transformations)
2014-07-12 09:45:35 -04:00
Isaac Bennetch
3c3bd66e61 Merge pull request #1279 from D-storm/tests
test file for messages.inc.php
2014-07-12 09:41:26 -04:00
Marc Delisle
a9296005c1 Improve variable name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-12 07:25:47 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-12 01:52:32 +05:30
Marc Delisle
3d9bd81961 Merge commit 'fe160ae' 2014-07-11 15:53:31 -04:00
Marc Delisle
a26a1dc987 Merge commit 'e2ed16d' 2014-07-11 15:53:15 -04:00
Marc Delisle
33f2b96a7b Merge commit '8505f68' 2014-07-11 15:53:01 -04:00
Marc Delisle
fe160aec18 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-07-11 15:52:19 -04:00
Marc Delisle
e2ed16d04e Also show the Drop link in the routines list (because it's difficult to detect all privileges possibilities
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-11 15:52:00 -04:00
Weblate
cd22bc28a4 Merge remote-tracking branch 'origin/master' 2014-07-11 21:48:03 +02:00
Burak Yavuz
e1ba857a11 Translated using Weblate (Turkish)
Currently translated at 99.8% (2891 of 2896)
2014-07-11 21:48:00 +02:00
Marc Delisle
f473e99efa Merge branch 'QA_4_2' 2014-07-11 15:46:21 -04:00
Marc Delisle
88e423d428 Merge commit '9a79d87' 2014-07-11 15:46:14 -04:00
Weblate
8505f68dc9 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-07-11 21:45:58 +02:00
Huang Zhiyi
b17620c4de Translated using Weblate (Simplified Chinese)
Currently translated at 87.3% (2419 of 2768)
2014-07-11 21:45:55 +02:00
Marc Delisle
ce72213095 bug #4489 Incorrect detection of privileges for routine creation
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-11 15:45:31 -04:00
Marc Delisle
f20ac45096 Ensure variable is a string
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-11 07:28:52 -04:00
Marc Delisle
a6a8f07437 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-07-11 07:17:10 -04:00
Marc Delisle
f8eb1f9798 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-11 07:17:06 -04:00
Weblate
3f8bf4fae4 Merge remote-tracking branch 'origin/master' 2014-07-11 13:13:27 +02:00
Huang Zhiyi
7c44bbf5d2 Translated using Weblate (Simplified Chinese)
Currently translated at 84.0% (2435 of 2896)
2014-07-11 13:13:25 +02:00
Marc Delisle
6898ac0016 Initialize variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-11 07:13:12 -04:00
Chirayu Chiripal
0d70b314e7 test file for messages.inc.php
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-11 14:14:06 +05:30
Matías Bellone
e3d7d47409 Translated using Weblate (Spanish)
Currently translated at 100.0% (2896 of 2896)
2014-07-11 05:00:20 +02:00
Domen
9a79d87032 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2768 of 2768)
2014-07-10 23:28:31 +02:00
Domen
a41d7e66c7 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2896 of 2896)
2014-07-10 23:27:50 +02:00
Kristjan Räts
80566a4220 Translated using Weblate (Estonian)
Currently translated at 100.0% (2896 of 2896)
2014-07-10 18:03:42 +02:00
Weblate
f4189410f5 Merge remote-tracking branch 'origin/master' 2014-07-10 17:54:56 +02:00
Aputsiaq Niels Janussen
e402b8caff Translated using Weblate (Danish)
Currently translated at 100.0% (2896 of 2896)
2014-07-10 17:54:53 +02:00
Marc Delisle
52d1485feb Merge branch 'QA_4_2' 2014-07-10 11:54:11 -04:00
Marc Delisle
7942e76a47 Merge commit 'e76e8d5' 2014-07-10 11:53:48 -04:00
Weblate
aaee42defc Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-07-10 17:31:51 +02:00
Peter Dave Hello
b4c107baba Translated using Weblate (Traditional Chinese)
Currently translated at 99.8% (2765 of 2768)
2014-07-10 17:31:49 +02:00
Giovanni Sora
8caaa4df40 Translated using Weblate (Interlingua)
Currently translated at 55.0% (1524 of 2768)
2014-07-10 17:31:46 +02:00
Jan Erik Zassenhaus
5c4b19e94b Translated using Weblate (German)
Currently translated at 93.8% (2599 of 2768)
2014-07-10 17:31:44 +02:00
Aputsiaq Niels Janussen
fb87fc62d7 Translated using Weblate (Danish)
Currently translated at 100.0% (2768 of 2768)
2014-07-10 17:31:43 +02:00
Michal Čihař
6261292ab4 Translated using Weblate (Czech)
Currently translated at 99.9% (2766 of 2768)
2014-07-10 17:31:41 +02:00
Marc Delisle
decb08c4d8 Clarify message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-10 11:31:29 -04:00
Aputsiaq Niels Janussen
76709de8ca Translated using Weblate (Danish)
Currently translated at 100.0% (2896 of 2896)
2014-07-10 16:23:35 +02:00
Marc Delisle
9f0b29703b Translated using Weblate (French)
Currently translated at 100.0% (2896 of 2896)
2014-07-10 14:03:04 +02:00
Weblate
08c5fa8e00 Merge remote-tracking branch 'origin/master' 2014-07-10 13:53:57 +02:00
Jan Erik Zassenhaus
6870638b25 Translated using Weblate (German)
Currently translated at 89.1% (2583 of 2896)
2014-07-10 13:53:53 +02:00
Marc Delisle
7511aa22a4 Cannot find String datatypes when using a non-English language
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-10 07:53:36 -04:00
Marc Delisle
b35c1b20ea Update po files 2014-07-10 06:44:02 -04:00
Marc Delisle
68d7c1bb41 Remove line breaks and improve message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-10 06:43:35 -04:00