Commit Graph

83459 Commits

Author SHA1 Message Date
Marc Delisle
5ac5218567 Merge commit '2523708' 2013-05-19 08:54:01 -04:00
Marc Delisle
aa0306d310 Merge commit 'adb2368' 2013-05-19 08:47:20 -04:00
Marc Delisle
be6bdb76ec All characters not part of the format were replaced by "undefined" 2013-05-19 07:49:53 -04:00
Yungu Kim
25237088c9 Translated using Weblate (Korean)
Currently translated at 64.5% (1679 of 2605)
2013-05-19 09:22:08 +02:00
Marc Delisle
8267c32218 Update po files 2013-05-18 07:01:47 -04:00
Marc Delisle
06d3f3a550 Remove unnecessary message. When this page did not contain tabs for the
various sections, it was useful to have a link to reach this section
further down.
2013-05-18 06:59:22 -04:00
Weblate
4bbe3140d1 Merge remote-tracking branch 'origin/master' 2013-05-17 18:47:40 +02:00
Yungu Kim
ba20355656 Translated using Weblate (Korean)
Currently translated at 62.6% (1660 of 2651)
2013-05-17 18:47:10 +02:00
Marc Delisle
51b7426263 Fix merge conflict 2013-05-17 12:42:58 -04:00
Weblate
78e5e4dbeb Merge remote-tracking branch 'origin/master' 2013-05-17 07:34:24 +02:00
Yungu Kim
5ede7a9199 Translated using Weblate (Korean)
Currently translated at 62.6% (1660 of 2651)
2013-05-17 07:34:20 +02:00
Yungu Kim
1628b866be Translated using Weblate (Korean)
Currently translated at 62.6% (1659 of 2651)
2013-05-17 07:34:14 +02:00
Atul Pratap Singh
3a68fb3e6c Fix bug#3936 in master 2013-05-17 11:03:19 +05:30
Weblate
44422eb4d2 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-17 07:21:46 +02:00
Yungu Kim
c26572b491 Translated using Weblate (Korean)
Currently translated at 63.8% (1662 of 2605)
2013-05-17 07:21:44 +02:00
Atul Pratap Singh
1be72f7f78 Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 2013-05-17 10:46:58 +05:30
Atul Pratap Singh
435dc9c74a left while fixing bug#3936 2013-05-17 10:42:45 +05:30
Weblate
adb236894a Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-16 19:16:51 +02:00
Rytis Slatkevičius
a6856cec9b Translated using Weblate (Lithuanian)
Currently translated at 67.7% (1764 of 2607)
2013-05-16 19:16:47 +02:00
Marc Delisle
a8e5a455f4 $HTTP_USER_AGENT no longer exists 2013-05-16 13:16:19 -04:00
Isaac Bennetch
dd2ca745b9 Fix unwanted trailing spacing 2013-05-16 09:46:15 -04:00
Isaac Bennetch
8fbad56812 Merge remote branch 'upstream/master' into ayusun-fr1410 2013-05-16 09:39:09 -04:00
Michal Čihař
16febdbd87 There should be message variable as well 2013-05-16 20:25:57 +02:00
Michal Čihař
0486cc71b1 Fix variable name 2013-05-16 19:37:48 +02:00
Marc Delisle
35a423efdf Merge branch 'QA_4_0' 2013-05-16 13:17:06 -04:00
Marc Delisle
dc92c29f5b Bug #3907, other fixes 2013-05-16 13:03:13 -04:00
Marc Delisle
92b35fec45 Bug #3907, other fixes 2013-05-16 12:55:36 -04:00
Weblate
aee3df5936 Merge remote-tracking branch 'origin/master' 2013-05-16 15:43:08 +02:00
Rytis Slatkevičius
f62af40369 Translated using Weblate (Lithuanian)
Currently translated at 64.9% (1720 of 2651)
2013-05-16 15:43:02 +02:00
Michal Čihař
2eecd40b29 Merge pull request #392 from adamgsoc2013/unit_PMA4
test case for static function of PMA_Util
2013-05-16 06:42:18 -07:00
Isaac Bennetch
fcd891514e Manually merge ayusun-fr1410 2013-05-16 09:36:36 -04:00
adamgsoc2013
2d322608e5 test case for static function of PMA_Util 2013-05-16 21:30:50 +08:00
Michal Čihař
17576dcb29 Merge pull request #388 from xmujay/2332_xmujay1
refactor function naming on server view files
2013-05-15 23:21:52 -07:00
Michal Čihař
2c8242d4eb Merge pull request #389 from xmujay/2332_xmujay3
make function starting with "PMA"
2013-05-15 23:21:37 -07:00
Michal Čihař
c8e032c0c4 Merge pull request #390 from adamgsoc2013/unit_PMA2
add test getFontsizeOptions for "em","Pt","px" unit
2013-05-15 23:21:16 -07:00
Michal Čihař
37b6f67fcb Merge pull request #387 from xmujay/2332_xmujay
make function outside class starting with "PMA"; render HTML at once
2013-05-15 23:20:28 -07:00
Marc Delisle
c445775595 Fix merge conflicts 2013-05-15 16:47:20 -04:00
Marc Delisle
ecd0435012 Merge commit '50ca355' 2013-05-15 16:45:54 -04:00
Marc Delisle
5681279f34 Remove dead code 2013-05-15 16:42:45 -04:00
Atul Pratap Singh
50ca35576f Use live here, fix bug#3936 2013-05-15 23:23:07 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
Marc Delisle
920d827c37 Merge pull request #379 from mynetx/bug-3907
Fix most analysis results discovered in bug 3907
2013-05-15 09:52:03 -07:00
adamgsoc2013
01fe907a28 add test getFontsizeOptions for "em","Pt","px" unit 2013-05-16 00:44:36 +08:00
xmujay
191cc35760 make function starting with "PMA" 2013-05-16 00:16:30 +08:00
xmujay
87ec31ce5f refactor function naming on server view files 2013-05-15 23:58:50 +08:00
xmujay
76df1ca1c1 make function outside class starting with "PMA"; render HTML at once 2013-05-15 23:48:30 +08:00
Marc Delisle
b07df01340 Code cleanup 2013-05-15 10:21:08 -04:00
Marc Delisle
144b5040cc Fix typo 2013-05-15 10:19:46 -04:00
Marc Delisle
7357ce0071 Merge pull request #348 from hisamith/refactor_tbl_create_and_add_field
Refactored “tbl_addfield.php” and “tbl_create.php” by moving duplicated code
2013-05-15 07:17:35 -07:00
Samith Dassanayake
9746f07ae9 Fixed typos. 2013-05-15 19:33:30 +05:30