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

866 Commits

Author SHA1 Message Date
Madhura Jayaratne
3e1455a5db Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-13 14:02:08 +05:30
Hugues Peccatte
a68ea85d4d Remove unused locale variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 23:26:57 +01:00
Hugues Peccatte
8e6d16cf7e Merge pull request #1389 from Tithugues/replicationInfo_master 
Use $replication_info everywhere, instead of $server_* variables.
 2014-11-10 13:45:39 +01:00
Madhura Jayaratne
686924d628 Update doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 12:29:53 +05:30
Madhura Jayaratne
dfea0a4fa0 Fix footer test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 12:27:04 +05:30
Madhura Jayaratne
5c739d6c2d Define variables needed for testing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 06:20:18 +05:30
Hugues Peccatte
49836e6e6f Use $replication_info everywhere, instead of $server_* variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 16:30:07 +01:00
Madhura Jayaratne
09fa8dc860 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 13:41:36 -08:00
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
eea3332acf Remove unused parameters. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 17:49:22 +01:00
Hugues Peccatte
dc4b7fc239 Minor test update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 16:07:12 +01:00
Hugues Peccatte
037a034b43 Minor coding style modifications. 
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:04:35 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Marc Delisle
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
RFE 1550: PMA_URL_getCommon(): new style
 2014-10-28 08:14:45 -04:00
Marc Delisle
5d62fcbf78 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 15:01:29 -04:00
Marc Delisle
e7598d7cc9 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 12:57:35 -04:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Ann + J.M
953e865fc6 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:44:50 +02:00
Ann + J.M
6feb3b0d3a Fix failing unit tests 
Signed-off-by: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:06:14 +02:00
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 16:58:00 +02:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Madhura Jayaratne
8785ea0e34 Adjust tests for commit 3ec96cb038 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-19 08:22:06 +05:30
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Madhura Jayaratne
aaa2116b01 Fix some of the failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-18 21:59:33 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Madhura Jayaratne
771847102f SHOW GRANTS based privilege checking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 10:55:33 +05:30
Madhura Jayaratne
98ea25d9ea Additional unit tests for new execution paths 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 18:51:12 +05:30
Madhura Jayaratne
c925d46f92 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 15:21:15 +05:30
Madhura Jayaratne
b587d7cd3d Fix more failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 07:18:11 +05:30
Madhura Jayaratne
d441a217ec Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:56:49 +05:30
Madhura Jayaratne
62b15dc2f6 Revert "The DisableIS directive is being deprecated" 
This reverts commit 8fd0d79405.

Conflicts:
	libraries/navigation/Nodes/Node.class.php
	test/classes/navigation/PMA_Node_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:31:33 +05:30
Madhura Jayaratne
603b31d023 Revert "The DisableIS directive is being deprecated" 
This reverts commit 57ef25eed8.

Conflicts:
	test/classes/plugin/export/PMA_ExportSql_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:30:16 +05:30
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +05:30
Hugues Peccatte
bb85376b89 Minor PHPDoc modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-30 21:50:20 +02:00
Hugues Peccatte
0ee7063220 Replace PMA_String calls by mb_* calls in tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-29 18:52:54 +02:00
Marc Delisle
1347aa60e3 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-21 09:16:50 -04:00
Marc Delisle
ea2dd3c171 bug #4361 Can't change font size (when config.inc.php not present) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-21 09:13:18 -04:00
Chanaka Dharmarathna
31da8b1cdc Remove unsed variable 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:21:10 +05:30
Chanaka Dharmarathna
08e8ab1cda Remove unused parameter 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:04:01 +05:30
Chanaka Dharmarathna
866a62800d Remove unused variable in _getPlacedLinks() function 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-15 22:25:25 +05:30
Hugues Peccatte
ebda4090db Coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 15:47:14 +02:00
Marc Delisle
c8b4217e42 Fix tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:54:46 -04:00
Marc Delisle
fde42eb2e8 No need to have a distinct file 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-06 14:11:04 -04:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Hugues Peccatte
4960f208e2 Add PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-30 21:14:30 +02:00
Marc Delisle
e3fb12e385 Merge commit '3b479f5' 2014-08-28 15:43:36 -04:00
Smita Kumari
3b479f52f9 fix unit test 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 22:48:35 +05:30
Madhura Jayaratne
a908121b59 Fix more failing tests 2014-08-24 21:56:35 +05:30
Madhura Jayaratne
c33374e243 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 21:31:05 +05:30
Madhura Jayaratne
681bca3560 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-24 07:36:53 +05:30