gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,064 Commits 12 Branches 481 Tags 2.4 GiB
ae2c8d5dfc
Commit Graph

84064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
ae2c8d5dfc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 14:32:31 +02:00
Michal Čihař
fad06584f5 Enable backupGlobals directive in phpunit 2013-06-11 14:31:38 +02:00
Michal Čihař
2417937179 Define another query used in testsuite 2013-06-11 14:31:04 +02:00
Michal Čihař
1cff9b7229 Missing include 2013-06-11 14:28:38 +02:00
Michal Čihař
158389ea3e Make parser test work with error reporting as well 2013-06-11 14:28:28 +02:00
Michal Čihař
83712de59a Do not rely on previous globals 2013-06-11 14:18:32 +02:00
Michal Čihař
498b7a7012 Nedd to have defined ajax flag for most of the tets as well 2013-06-11 14:17:08 +02:00
Michal Čihař
4b787d4505 Do not rely too much on previous state 2013-06-11 14:16:17 +02:00
Michal Čihař
eb77c27e8d Make it work with separated globals 2013-06-11 14:12:55 +02:00
Michal Čihař
e463da3285 Possibly undefined variable 2013-06-11 14:08:14 +02:00
Michal Čihař
8b9fa8aa36 Do not set language in every test 2013-06-11 14:02:49 +02:00
Michal Čihař
a1b6d4bb4c Use correctly set language 2013-06-11 14:00:57 +02:00
Michal Čihař
bb922686e0 Globally set language 2013-06-11 14:00:44 +02:00
Michal Čihař
262d1b1a11 Allow to run standalone 2013-06-11 13:59:23 +02:00
Michal Čihař
e11113f5a9 Adjust to new token value 2013-06-11 13:56:51 +02:00
Michal Čihař
ba9cff2736 Set token in single place for all tests 2013-06-11 13:53:31 +02:00
Michal Čihař
f211f63327 Allow test to run standalone 2013-06-11 13:50:09 +02:00
Michal Čihař
c818cc69cf Allow test to run standalone 2013-06-11 13:48:50 +02:00
Weblate
dd0f5aafb7 Merge remote-tracking branch 'origin/master' 2013-06-11 13:38:46 +02:00
Peter Rosa
5995b1e70a Translated using Weblate (Slovak) 
Currently translated at 72.5% (1933 of 2665)
 2013-06-11 13:38:43 +02:00
Madhura Jayaratne
31d448e7e6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 17:08:05 +05:30
Madhura Jayaratne
56db0c29c6 Update the call to renamed functions 2013-06-11 17:04:25 +05:30
Weblate
8cec5e2560 Merge remote-tracking branch 'origin/master' 2013-06-11 13:33:49 +02:00
Peter Rosa
6a35caf22d Translated using Weblate (Slovak) 
Currently translated at 72.4% (1929 of 2665)
 2013-06-11 13:33:45 +02:00
Michal Čihař
3af2a12162 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-11 13:33:31 +02:00
Michal Čihař
67543568b1 Merge commit 'f414eb577b13f908f4bea09d69ddc944b7f4629c' 
Conflicts:
	libraries/schema/Visio_Relation_Schema.class.php
 2013-06-11 13:33:25 +02:00
Madhura Jayaratne
9c681b30af Rename PMA_import_sessionCheck() -> PMA_Import_sessionCheck() 2013-06-11 17:02:20 +05:30
Weblate
b369f6a912 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-06-11 13:31:53 +02:00
Peter Rosa
29519cb165 Translated using Weblate (Slovak) 
Currently translated at 76.1% (1981 of 2603)
 2013-06-11 13:31:50 +02:00
Madhura Jayaratne
0ecadbba0d Rename PMA_import_progressCheck() -> PMA_Import_progressCheck() 2013-06-11 17:01:42 +05:30
Michal Čihař
f414eb577b bug #3631 Drop not working Visio schema export. 2013-06-11 13:31:33 +02:00
Madhura Jayaratne
afdb9ec796 Rename PMA_import_nopluginCheck() -> PMA_Import_nopluginCheck() 2013-06-11 17:00:54 +05:30
Madhura Jayaratne
37eaa0a680 rename PMA_import_apcCheck() -> PMA_Import_apcCheck() 2013-06-11 17:00:11 +05:30
Madhura Jayaratne
0dee9a7789 Wrap a long line 2013-06-11 16:58:55 +05:30
Michal Čihař
68dfc347f9 Fixed formatting of documentation URL (can contain %, so it can not be used as format string) 2013-06-11 13:23:43 +02:00
Michal Čihař
0ee0d8e8c5 bug #3962 Proper escaping of JSON export 
We now use json_encode instead of home made encoder. Also we now
generate JSON data on the fly, what reduces memory usage.
 2013-06-11 11:49:02 +02:00
Michal Čihař
d2ff57bf33 Changelog entries 2013-06-11 11:24:45 +02:00
Michal Čihař
f62b884294 Remove trailing dots from suggested database name 
This only makes it harder to type it new name (RFE #1429).
 2013-06-11 11:22:32 +02:00
Michal Čihař
bdcba3b082 Document switching extension as an option (RFE #1427) 2013-06-11 11:12:59 +02:00
Michal Čihař
95739f8104 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 11:04:34 +02:00
Michal Čihař
9e1a59b7d7 NDB supports relations since 7.3 
RFE #1433
 2013-06-11 11:03:48 +02:00
Weblate
24cb1cfac5 Merge remote-tracking branch 'origin/master' 2013-06-11 09:00:31 +02:00
Dadan Setia
00ef3cc354 Translated using Weblate (Indonesian) 
Currently translated at 71.4% (1904 of 2665)
 2013-06-11 09:00:23 +02:00
Michal Čihař
5e6d3eaa53 Whitespace cleanup 2013-06-11 08:59:58 +02:00
Michal Čihař
eba0fe6688 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-11 08:59:43 +02:00
Michal Čihař
82c0b75949 Merge commit 'd34f8d5182b34519de2b5b6778d09c49da5111dc' 2013-06-11 08:59:38 +02:00
Weblate
207f04a1d7 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-06-11 08:58:58 +02:00
Dadan Setia
a019f7e7b7 Translated using Weblate (Indonesian) 
Currently translated at 74.8% (1947 of 2603)
 2013-06-11 08:58:55 +02:00
Michal Čihař
d34f8d5182 Disable response wrapper in fatal error path 
There might be some critical pieces (eg. json, pcre or session) missing
and there is no way to make Response class working at this point.

Fixes #3981
 2013-06-11 08:57:49 +02:00
Michal Čihař
b6073bf722 Whitespace cleanup 2013-06-11 08:52:51 +02:00