Commit Graph

82371 Commits

Author SHA1 Message Date
Michal Čihař
e61e4ab962 Merge remote-tracking branch 'origin/QA_4_0' 2013-04-16 11:54:58 +02:00
Michal Čihař
395e3de6ba Remove extra ; 2013-04-16 11:54:13 +02:00
Michal Čihař
ca69a0c93e Various spacing fixes 2013-04-16 11:52:47 +02:00
Michal Čihař
0a8f5021d7 Add missing radix 2013-04-16 11:52:39 +02:00
Michal Čihař
10acae9011 Whitespace fixes 2013-04-16 11:49:42 +02:00
Michal Čihař
cd2010e85e Various JS improvements 2013-04-16 11:43:22 +02:00
Michal Čihař
c2dca8ea70 Fix indentation 2013-04-16 11:41:55 +02:00
Weblate
159a914496 Merge remote-tracking branch 'origin/master' 2013-04-16 11:28:31 +02:00
Giovanni Sora
ab3274d508 Translated using Weblate (Interlingua)
Currently translated at 4.4% (115 of 2605)
2013-04-16 11:28:27 +02:00
Michal Čihař
50c5eeee1b Merge remote-tracking branch 'origin/QA_4_0' 2013-04-16 11:28:13 +02:00
Michal Čihař
e6ff6dc9a8 Merge pull request #256 from adamgsoc2013/UT_config2
add test case for Config.class.php:
2013-04-16 00:16:35 -07:00
adamgsoc2013
b2d191b39e follow PMA coding style, add space after comma. 2013-04-16 15:06:37 +08:00
Michal Čihař
c43719f44c Merge pull request #255 from adamgsoc2013/UT_PMA_Footer_test
add test case for PMA_Footer_test.php
2013-04-16 00:00:08 -07:00
adamgsoc2013
d13fbbbc41 add test case for Config.class.php:
1 testIsGitRevision
2 testCheckHTTP

per http://ci.phpmyadmin.net/job/phpMyAdmin/cloverphp/libraries_Config.class.php.html
It can increase a lot of code coverage
2013-04-16 13:51:31 +08:00
adamgsoc2013
fd220fb9ae add test case for PMA_Footer_test.php
- add testGetScripts
2013-04-16 13:40:52 +08:00
Marc Delisle
3731b1376f Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 2013-04-15 16:33:09 -04:00
Marc Delisle
fae2bed3f6 Merge branch 'QA_4_0' 2013-04-15 16:32:37 -04:00
Marc Delisle
f105e8fcba 4.0.0-rc2 2013-04-15 16:32:21 -04:00
Weblate
c3cee3b184 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-15 22:27:56 +02:00
Rodrigo Souza
814607df9a Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-15 22:27:54 +02:00
Marc Delisle
83a181ea01 Merge branch 'QA_4_0' 2013-04-15 16:26:27 -04:00
J.M
dfdee264c3 Fix bug #3876 [import] PHP 5.2 - unexpected T_PAAMAYIM_NEKUDOTAYIM 2013-04-15 16:25:43 -04:00
Weblate
08bf587dbb Merge remote-tracking branch 'origin/master' 2013-04-15 18:49:12 +02:00
Rodrigo Souza
ff9f2f0676 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-15 18:49:08 +02:00
Marc Delisle
a79248b07e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-15 12:48:53 -04:00
Marc Delisle
ae7e542a51 Fix merge conflict 2013-04-15 12:47:19 -04:00
Weblate
be971a0573 Merge remote-tracking branch 'origin/master' 2013-04-15 18:26:51 +02:00
Rodrigo Souza
c273d30825 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-15 18:26:47 +02:00
Marc Delisle
a5ba10c7d9 Merge pull request #251 from xmujay/gsoc2013_4
refactor server_engines.php
2013-04-15 09:26:34 -07:00
Michal Čihař
0cd1254ef2 We want these for now 2013-04-15 16:38:09 +02:00
Michal Čihař
66c60852f3 fix spacing 2013-04-15 16:26:06 +02:00
Michal Čihař
0d3ce5a653 Relax some js checking 2013-04-15 16:25:49 +02:00
Michal Čihař
a6f93e99ee Use consistent indentation 2013-04-15 16:23:43 +02:00
Michal Čihař
c92409704b Move declaration before function usage 2013-04-15 16:21:26 +02:00
Michal Čihař
e2571c5628 Various javascript spacing fixes 2013-04-15 16:20:04 +02:00
Michal Čihař
b044cfc3b2 Use own jshint configuration 2013-04-15 16:20:04 +02:00
Michal Čihař
505a5a3656 Merge remote-tracking branch 'origin/QA_4_0' 2013-04-15 15:13:31 +02:00
Michal Čihař
3a024d6e41 Merge commit 'f1299ad66571b94063515ce347e2ee5018b3bbc8' 2013-04-15 15:13:23 +02:00
Michal Čihař
a1b6f206b2 Various spacing and identation fixes 2013-04-15 15:13:14 +02:00
Weblate
cc8b95e896 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-15 15:09:49 +02:00
Yungu Kim
e16ff8ce97 Translated using Weblate (Korean)
Currently translated at 57.0% (1485 of 2605)
2013-04-15 15:09:47 +02:00
Michal Čihař
f1299ad665 Remove extra ; from code 2013-04-15 15:09:32 +02:00
Weblate
b9aa5280b1 Merge remote-tracking branch 'origin/master' 2013-04-15 14:14:56 +02:00
Yungu Kim
2c3f59c41c Translated using Weblate (Korean)
Currently translated at 57.0% (1485 of 2605)
2013-04-15 14:14:52 +02:00
Michal Čihař
c935413fcc Various javascript fixes
- missing ;
- confusing !
2013-04-15 14:10:53 +02:00
Weblate
bdb70b833f Merge remote-tracking branch 'origin/master' 2013-04-15 13:26:12 +02:00
Yungu Kim
697f589537 Translated using Weblate (Korean)
Currently translated at 56.4% (1468 of 2605)
2013-04-15 13:26:08 +02:00
Michal Čihař
e6517db98a More javascript cleanup, more fixes of === / !=== 2013-04-15 13:25:50 +02:00
Michal Čihař
83c2a074a5 JS fixes for PMD code
- parseInt with radix
- === and !== for type cast unsafe values
2013-04-15 12:19:33 +02:00
Michal Čihař
6aa7eaabef Include pmd files in checking 2013-04-15 12:17:41 +02:00