Commit Graph

85013 Commits

Author SHA1 Message Date
xmujay
06bd2d22eb fix the code style 2013-07-16 21:48:32 +08:00
xmujay
8da2a62146 refactor server_status.php 2013-07-16 21:45:41 +08:00
Marc Delisle
8ce9acb65b Merge pull request #503 from scnakandala/gsoc_2013_2
Refactoring SQL executor
2013-07-14 13:05:14 -07:00
Marc Delisle
22884539af No need for this to be a global variable 2013-07-14 15:55:44 -04:00
Marc Delisle
c6ee63bd4e Fix typo 2013-07-14 15:44:51 -04:00
Michal Čihař
0302d009c5 Merge pull request #501 from adamgsoc2013/UT_plu_parse
Test case for sqlparser.data.php (no function lines)
2013-07-14 12:28:07 -07:00
Marc Delisle
63149abf45 Fix merge conflicts 2013-07-14 15:19:33 -04:00
Spun Nakandala
6c9da035ff check for CALL transferred to the sql parser 2013-07-14 21:19:28 +05:30
adamgsoc2013
43f0653f50 add function in source file, so that sqlparser.data.php can be covered by PHPUnit 2013-07-14 22:13:39 +08:00
adamgsoc2013
772d3e0005 add PMA_SQL_Parse_Data_Mock, so that sqlparser.data.php can be covered by PHPUnit 2013-07-14 21:27:27 +08:00
Spun Nakandala
116687e873 phpcs coding standard violations corrected 2013-07-14 17:29:42 +05:30
Spun Nakandala
c7feab8dc5 bookmarking error corrected 2013-07-14 17:18:55 +05:30
Marc Delisle
ddbdc6e16c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-14 07:42:32 -04:00
Marc Delisle
f8650cc4db Fix typo 2013-07-14 07:42:18 -04:00
Weblate
6c71eb3431 Merge remote-tracking branch 'origin/master' 2013-07-14 13:40:30 +02:00
Burak Yavuz
c9ac0891eb Translated using Weblate (Turkish)
Currently translated at 100.0% (2680 of 2680)
2013-07-14 13:40:26 +02:00
Marc Delisle
4c6f3ec656 Translated using Weblate (French)
Currently translated at 100.0% (2680 of 2680)
2013-07-14 13:40:20 +02:00
Marc Delisle
d314b7499a add CALL to the list of reserved words 2013-07-14 07:39:45 -04:00
Spun Nakandala
3bbcd64df4 default $sql_limit_to_append transfered to the else condition. 2013-07-14 14:36:11 +05:30
Spun Nakandala
6e20974920 extracted methods PMA_analyzeAndGetTableHtmlForProfilingResults, PMA_getTableHtmlForProfilingSummaryByState from PMA_getHtmlForProfilingChart 2013-07-14 13:55:30 +05:30
Spun Nakandala
ec35836b41 print view bookmark form display error corrected 2013-07-14 12:53:13 +05:30
Marc Delisle
80cafa1076 Merge pull request #498 from xmujay/0706_UT_serverView2
Unit test case for refactored functions: PMA_server_replication
2013-07-13 16:36:38 -07:00
Tony Chen
1bf8a85d3e Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2680 of 2680)
2013-07-13 20:32:05 +02:00
xmujay
3f358142cb fix the "Not support query" error by moving mock data to DBI Dummy class 2013-07-13 11:31:01 +08:00
Weblate
7c72ce32e5 Merge remote-tracking branch 'origin/master' 2013-07-12 21:59:18 +02:00
Burak Yavuz
827ea778fa Translated using Weblate (Turkish)
Currently translated at 100.0% (2680 of 2680)
2013-07-12 21:59:15 +02:00
Matías Bellone
2e0b83d812 Translated using Weblate (Spanish)
Currently translated at 100.0% (2680 of 2680)
2013-07-12 21:59:10 +02:00
Marc Delisle
b0b492d62e Fix typo and clarify comment 2013-07-12 15:58:59 -04:00
Isaac Bennetch
63694eb049 Merge pull request #496 from kasunchathuranga/EditView
Edit a view
2013-07-12 10:04:01 -07:00
Kasun Chathuranga
ecc0e3d5eb ChangeLog entry for rfe #1373 2013-07-12 21:07:01 +05:30
adamgsoc2013
35417fe3ed Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_parse 2013-07-12 23:23:36 +08:00
xmujay
7014c18a88 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0706_UT_serverView2 2013-07-12 23:21:34 +08:00
xmujay
70e90600c8 revert the changes about header 2013-07-12 23:11:05 +08:00
xmujay
9ee4bb0efd fix the failure: Cannot modify header information 2013-07-12 22:56:02 +08:00
xmujay
e257c17588 Unit test case for PMA_server_replication refactored functions 2013-07-12 22:31:35 +08:00
Dieter Adriaenssens
07f4d2d364 rename variable 2013-07-12 16:17:34 +02:00
Michal Čihař
1e5030a52b Merge pull request #497 from ayushchd/unit_testing
Fix Validator class name
2013-07-12 07:08:53 -07:00
Michal Čihař
cc91f31dca Update po files 2013-07-12 16:07:00 +02:00
Michal Čihař
95bf7f7aad Merge remote-tracking branch 'weblate/master' 2013-07-12 16:03:34 +02:00
Michal Čihař
0bb1cb5f46 Remove duplicate strings 2013-07-12 16:03:16 +02:00
Weblate
667f2e2155 Merge remote-tracking branch 'origin/master' 2013-07-12 15:55:04 +02:00
Marc Delisle
d3d847106c Translated using Weblate (French)
Currently translated at 100.0% (2681 of 2681)
2013-07-12 15:54:50 +02:00
Michal Čihař
5da45b465d Translated using Weblate (Breton)
Currently translated at 25.0% (669 of 2681)
2013-07-12 15:54:44 +02:00
Michal Čihař
4c30f76f7e Translated using Weblate (Basque)
Currently translated at 21.3% (572 of 2681)
2013-07-12 15:54:41 +02:00
Michal Čihař
df3502e804 Another adding of comma to sentences 2013-07-12 15:54:18 +02:00
ayushchd
4d20eecb9d Fix Validator class name 2013-07-12 19:24:35 +05:45
Weblate
2bab8b30b9 Merge remote-tracking branch 'origin/master' 2013-07-12 15:24:46 +02:00
Michal Čihař
eaa809ae1e Translated using Weblate (Uzbek)
Currently translated at 47.1% (1262 of 2681)
2013-07-12 15:24:42 +02:00
Michal Čihař
c18513e3b0 Translated using Weblate (Ukrainian)
Currently translated at 87.9% (2357 of 2681)
2013-07-12 15:24:38 +02:00
Michal Čihař
4c4e74b7f4 Translated using Weblate (Sinhala)
Currently translated at 80.9% (2168 of 2681)
2013-07-12 15:24:35 +02:00