gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,698 Commits 12 Branches 481 Tags 2.4 GiB
5918b52a2f
Commit Graph

90698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
5918b52a2f Merge remote-tracking branch 'origin/master' 2014-03-18 09:41:05 +01:00
Anders Jonsson
963109e15e Translated using Weblate (Swedish) 
Currently translated at 99.1% (2733 of 2756)
 2014-03-18 09:41:02 +01:00
Peter Sone Koldkjær
a047a97b2f Translated using Weblate (Danish) 
Currently translated at 92.3% (2544 of 2756)
 2014-03-18 09:40:59 +01:00
Michal Čihař
9f8ecfcde7 Merge pull request #1072 from kb-yashodha/refactoring 
Refactoring: Use echo statements to output HTML
 2014-03-18 09:40:53 +01:00
Bimal Yashodha
21b38d1313 Refactoring: Use echo statements to output HTML 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-03-17 20:09:48 +05:30
Marc Delisle
5da0728908 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-03-17 10:33:48 -04:00
Marc Delisle
409c02687d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-17 10:33:09 -04:00
Weblate
e3732cbcf2 Merge remote-tracking branch 'origin/master' 2014-03-17 15:31:51 +01:00
Giovanni Sora
baace3a999 Translated using Weblate (Interlingua) 
Currently translated at 43.9% (1210 of 2756)
 2014-03-17 15:31:47 +01:00
Marc Delisle
f4500d9d10 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-17 10:31:26 -04:00
Ashutosh Dhundhara
571d89f0b8 Feature request: #1514 Add function to all the insert boxes automatically. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-17 18:09:17 +05:30
Michal Čihař
2fb92245bf Increase delay for table expanding 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-16 19:21:01 +01:00
Weblate
514424f947 Merge remote-tracking branch 'origin/master' 2014-03-16 15:01:50 +01:00
Dieter Adriaenssens
bdc1f2f7fc Translated using Weblate (Dutch) 
Currently translated at 99.8% (2753 of 2756)
 2014-03-16 15:01:47 +01:00
Marc Delisle
383ffd5d3d Merge branch 'QA_4_1' 2014-03-16 09:57:52 -04:00
Marc Delisle
b2900f12af bug #4323 QueryWindow ignores CodeMirror 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-16 09:56:22 -04:00
Matías Bellone
4b62652b9f Translated using Weblate (Spanish) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-16 07:57:59 +01:00
Domen
5404948a3e Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-15 23:26:27 +01:00
Hugues Peccatte
568c2cbe3a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-03-15 17:43:55 +01:00
Hugues Peccatte
418a7a8813 JSLint updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 17:43:29 +01:00
Weblate
1250c451a4 Merge remote-tracking branch 'origin/master' 2014-03-15 15:52:27 +01:00
Helder Santana
cb7ee8f234 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.6% (2747 of 2756)
 2014-03-15 15:52:23 +01:00
Yungu Kim
fb39a29e6f Translated using Weblate (Korean) 
Currently translated at 71.4% (1970 of 2756)
 2014-03-15 15:52:21 +01:00
Hugues Peccatte
3f546b010d PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 15:52:00 +01:00
Hugues Peccatte
b0037e9e8e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-03-15 15:51:25 +01:00
Panagiotis Papazoglou
0132dba094 Translated using Weblate (Greek) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-15 15:35:11 +01:00
Hugues Peccatte
ef9130f1e3 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 14:05:05 +01:00
Burak Yavuz
9c4de6f5d4 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-15 13:36:25 +01:00
Marc Delisle
2c31b883a0 Translated using Weblate (French) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-15 12:39:16 +01:00
Hugues Peccatte
cbc966c03d PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 12:29:31 +01:00
Marc Delisle
14b5ece464 Update po files 2014-03-15 07:17:16 -04:00
Marc Delisle
faac8f3115 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-15 07:16:40 -04:00
Marc Delisle
9b0ec2aaaf Merge pull request #1066 from ashutoshdhundhara/feature-#1512 
Feature request: #1512 Import doesn't do anything with no file name provided.
 2014-03-15 07:16:23 -04:00
Hugues Peccatte
889555e38d Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-03-15 11:54:48 +01:00
Hugues Peccatte
3f5f8eac71 Fix test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:54:32 +01:00
Weblate
5a84524da1 Merge remote-tracking branch 'origin/master' 2014-03-15 11:46:41 +01:00
Pl
20884176f0 Translated using Weblate (Bulgarian) 
Currently translated at 65.1% (1794 of 2754)
 2014-03-15 11:46:38 +01:00
Hugues Peccatte
c38b78defb PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:46:16 +01:00
Michal Čihař
40f9df6fcc Merge pull request #1067 from jeffchan/fix-tests 
Fix unit test running individually by file
 2014-03-15 08:26:49 +01:00
Michal Čihař
bb280c8cc1 Merge pull request #1068 from jeffchan/fix-config-generator-test 
Cache date in ConfigGenerator unit test
 2014-03-15 08:26:31 +01:00
Hugues Peccatte
9b1f025fb7 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 23:06:46 +01:00
Hugues Peccatte
15afc7f9e6 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 22:47:29 +01:00
Jeff Chan
694daa01dd Cache date in ConfigGenerator unit test 
Occasionally we run into timing issues. For example, if the config
is generated at 12:00:59PM and the assertion is at 12:01:00PM, then
the test will fail. This should bring the expected $date closer to
when the config is generated.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 20:00:19 +00:00
Hugues Peccatte
9290c6857e PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 20:58:33 +01:00
Jeff Chan
3e65f88dee Fix AuthenticationCookieTest::testAuth to have proper includes 
Also change testAuthSetUserWithHeaders to have more flexible assertion

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 19:28:17 +00:00
Jeff Chan
719babd2c6 Import dependencies to make tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:18 +00:00
Jeff Chan
69e2f227ab Move slow tests in HHVM to medium group 
Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:13 +00:00
Jeff Chan
581f8e4d94 Define MYSQL_VERSION string constant if not already defined 
These tests were failing when run individually since the constant was
not defined. This patch defines the constant if it doesn't exist.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:07 +00:00
Hugues Peccatte
a5f396147b PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 19:23:56 +01:00
Ashutosh Dhundhara
2943a514b9 Feature request: #1512 Import doesn't do anything with no file name provided. 
https://sourceforge.net/p/phpmyadmin/feature-requests/1512/

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-14 23:21:21 +05:30