Commit Graph

95166 Commits

Author SHA1 Message Date
Marc Delisle
b92a156739 Fix parameter type; remove unused parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-26 08:13:47 -04:00
Marc Delisle
6fd724cb24 Refactor duplicate code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-25 11:57:28 -04:00
Marc Delisle
ac08019ef4 Merge branch 'QA_4_2' 2014-09-25 08:18:43 -04:00
Marc Delisle
e54fe41bea Merge commit '91a919e' 2014-09-25 08:18:34 -04:00
Marc Delisle
da6e5b6e8e bug #4542 Tab key in column name not shown
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-25 08:18:04 -04:00
Weblate
023cb969ba Merge remote-tracking branch 'origin/master' 2014-09-24 21:54:44 +02:00
Internationalization Ro
aa5472068c Translated using Weblate (Romanian)
Currently translated at 60.8% (1804 of 2964)

[ci skip]
2014-09-24 21:54:41 +02:00
Marc Delisle
0f74231fee rfe #1251 Show "Overhead" with same precision for all tables
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-24 15:54:17 -04:00
Weblate
1de2ceba42 Merge remote-tracking branch 'origin/master' 2014-09-24 20:27:18 +02:00
Internationalization Ro
481f756a00 Translated using Weblate (Romanian)
Currently translated at 60.5% (1796 of 2964)

[ci skip]
2014-09-24 20:27:15 +02:00
Dong-bum Kim
4fcb6136c7 Translated using Weblate (Korean)
Currently translated at 80.3% (2383 of 2964)

[ci skip]
2014-09-24 20:27:13 +02:00
Smita Kumari
e6b5e40a94 Merge pull request #1362 from smita786/master
fix bug #4540 #4541
2014-09-24 23:57:08 +05:30
Raul Malea
91a919e94d Translated using Weblate (Romanian)
Currently translated at 61.9% (1714 of 2768)

[ci skip]
2014-09-24 20:17:52 +02:00
Smita Kumari
d00ac27f75 fix bug #4540 #4541
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-09-24 19:34:53 +05:30
Chanaka Dharmarathna
6d755d3e8e Removed dead code in sqlparser.lib.php
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-09-23 23:56:57 +05:30
Marc Delisle
ea1f826f46 Fix code execution path warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-23 13:51:56 -04:00
Weblate
e225e3502e Merge remote-tracking branch 'origin/master' 2014-09-23 14:10:05 +02:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
43552c698e Translated using Weblate (Tamil)
Currently translated at 40.0% (1187 of 2964)

[ci skip]

เฎ…เฎŸเฏเฎคเฏเฎคเฎฎเฏเฎฑเฏˆ เฎคเฎฉเฏเฎฉเฎฟเฎšเฏเฎšเฏˆเฎฏเฎพเฎ•เฎตเฏ‡ เฎ…เฎฑเฎฟเฎตเฎฟเฎ•เฏเฎ•เฏˆเฎฏเฏˆ เฎ…เฎฉเฏเฎชเฏเฎชเฏเฎ•.
2014-09-23 14:10:03 +02:00
Marc Delisle
4950b5b526 Remove unused code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-23 08:09:46 -04:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
47c1528671 Translated using Weblate (Tamil)
Currently translated at 40.0% (1186 of 2964)

[ci skip]

เฎชเฎฒเฏเฎตเฏ‡เฎฑเฏ เฎชเฎฟเฎดเฏˆ เฎšเฏ†เฎฏเฏเฎคเฎฟเฎ•เฎณเฏ, เฎšเฎฟเฎฒเฎตเฎฑเฏเฎฑเฏˆ เฎ•เฎพเฎŸเฏเฎŸเฎตเฎฟเฎฒเฏเฎฒเฏˆ.
2014-09-22 22:42:02 +02:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
090e0c3c74 Translated using Weblate (Tamil)
Currently translated at 39.9% (1185 of 2964)

[ci skip]

GIS เฎคเฎฐเฎตเฏˆ เฎ•เฎพเฎŸเฏเฎšเฎฟเฎชเฏเฎชเฎŸเฏเฎคเฏเฎคเฏเฎ•
2014-09-22 22:40:38 +02:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
bc107b67d5 Translated using Weblate (Tamil)
Currently translated at 39.9% (1184 of 2964)

[ci skip]

<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;เฎ…เฎฒเฏเฎฒเฎคเฏ เฎฎเฎพเฎฑเฏเฎฑเฎพเฎ• เฎŽเฎคเฏ‡เฎฉเฏเฎฎเฏ เฎคเฎฐเฎตเฏเฎคเฏเฎคเฎณเฎคเฏเฎคเฎฟเฎฉเฏ 'เฎšเฏ†เฎฏเฎฒเฏเฎชเฎพเฎŸเฏเฎ•เฎณเฏ' เฎคเฎคเฏเฎคเฎฒเฏเฎ•เฏเฎ•เฏ เฎšเฏ†เฎฉเฏเฎฑเฏ เฎ…เฎ™เฏเฎ•เฏ เฎ…เฎฎเฏˆเฎคเฏเฎคเฏเฎ•เฏเฎ•เฏŠเฎณเฏเฎ•.
2014-09-22 22:38:09 +02:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
8f7c6134be Translated using Weblate (Tamil)
Currently translated at 39.9% (1183 of 2964)

[ci skip]

PhpMyAdmin เฎ•เฎŸเฏเฎŸเฎฎเฏˆเฎชเฏเฎชเฏ เฎšเฏ‡เฎฎเฎฟเฎชเฏเฎชเฎ•เฎฎเฏ เฎฎเฏเฎŸเฎ•เฏเฎ•เฎชเฏเฎชเฎŸเฏเฎŸเฏเฎณเฏเฎณเฎคเฏ. %sเฎเฎฉเฏ†เฎฉเฏเฎฑเฏ เฎ…เฎฑเฎฟเฎ•%s.
2014-09-22 22:35:29 +02:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
53de09b068 Translated using Weblate (Tamil)
Currently translated at 39.8% (1182 of 2964)

[ci skip]

%s เฎคเฎฐเฎตเฏเฎคเฏเฎคเฎณเฎคเฏเฎคเฎฟเฎฉเฏ เฎ’เฎดเฏเฎ™เฏเฎ•เฎฎเฏˆเฎตเฏ
2014-09-22 22:28:43 +02:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
c77f856884 Translated using Weblate (Tamil)
Currently translated at 39.8% (1180 of 2964)

[ci skip]

เฎฎเฏเฎคเฎฉเฎฟเฎฒเฏˆ เฎ•เฏเฎฑเฎฟเฎชเฏเฎชเฏ†เฎดเฏเฎคเฏเฎคเฎฟเฎฉเฏ เฎฎเฏเฎฉเฏเฎฉเฎฟเฎฐเฏเฎชเฏเฎชเฏ เฎ…เฎŸเฏเฎ•เฏเฎ•เฏเฎฎเฏเฎฑเฏˆ
2014-09-22 22:25:48 +02:00
เฎ•เฎฃเฏ‡เฎทเฏ เฎ•เฏเฎฎเฎพเฎฐเฏ
70dbe91908 Translated using Weblate (Tamil)
Currently translated at 39.7% (1179 of 2964)

[ci skip]

PhpMyAdmin เฎ•เฎŸเฏเฎŸเฎฎเฏˆเฎชเฏเฎชเฏ เฎšเฏ‡เฎฎเฎฟเฎชเฏเฎชเฎ•เฎฎเฏ เฎฎเฏเฎŸเฎ•เฏเฎ•เฎชเฏเฎชเฎŸเฏเฎŸเฏเฎณเฏเฎณเฎคเฏ. %sเฎเฎฉเฏ†เฎฉเฏเฎฑเฏ เฎ…เฎฑเฎฟเฎ•%s.
2014-09-22 22:25:02 +02:00
Marc Delisle
a04c0106f2 Out of scope variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-22 12:40:49 -04:00
Michal ฤŒihaล™
e27b287387 Merge remote-tracking branch 'origin/QA_4_2'
Conflicts:
	libraries/Util.class.php
2014-09-22 11:39:57 +02:00
Michal ฤŒihaล™
d2fcf01213 Apply fixup for documentation anchor as well
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
2014-09-22 11:39:11 +02:00
Michal ฤŒihaล™
adf65c7208 Merge remote-tracking branch 'origin/QA_4_2' 2014-09-22 11:34:21 +02:00
Remi Collet
31792c8091 fix gettext include path
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-22 11:33:59 +02:00
dingo thirteen
9a72ea8426 Translated using Weblate (Dutch)
Currently translated at 100.0% (2964 of 2964)

[ci skip]
2014-09-21 21:41:50 +02:00
Marc Delisle
1347aa60e3 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-21 09:16:50 -04:00
Marc Delisle
ea2dd3c171 bug #4361 Can't change font size (when config.inc.php not present)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-21 09:13:18 -04:00
Marc Delisle
27b9e16dc6 Remove unneeded code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-21 07:34:44 -04:00
Hugues Peccatte
73d376d14a Remove old @todo.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-20 20:17:44 +02:00
Hugues Peccatte
7723908f3f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-20 18:31:27 +02:00
Hugues Peccatte
447d763a48 PHPDoc modification.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-20 18:31:12 +02:00
Chirayu Chiripal
9187b75424 Fix bad line breaks (coding style)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-09-20 16:59:18 +05:30
Chirayu Chiripal
137c44a5db Fix function was used before it was defined
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-09-20 16:55:04 +05:30
Chirayu Chiripal
22c44a2363 Fix bad line break in js (coding style)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-09-20 16:47:01 +05:30
Weblate
fcb0ea0c0d Merge remote-tracking branch 'origin/master' 2014-09-20 12:53:28 +02:00
Kyeong Su Shin
b1b9009d7f Translated using Weblate (Korean)
Currently translated at 80.1% (2375 of 2964)

[ci skip]
2014-09-20 12:53:24 +02:00
Marc Delisle
3b8d16e88c 4.2.10-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-20 06:53:07 -04:00
Marc Delisle
9d02728163 Merge commit 'ab9036f' 2014-09-20 06:49:28 -04:00
Marc Delisle
ab9036fa60 4.2.10-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-20 06:48:10 -04:00
Weblate
8601ede46b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-20 12:41:06 +02:00
Kyeong Su Shin
9cd65f3db5 Translated using Weblate (Korean)
Currently translated at 84.6% (2343 of 2768)

[ci skip]
2014-09-20 12:41:03 +02:00
Marc Delisle
3085e8f4ab 4.2.8.1 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-20 06:40:29 -04:00
Weblate
42e9a4cbd7 Merge remote-tracking branch 'origin/master' 2014-09-19 13:37:44 +02:00