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

2074 Commits

Author SHA1 Message Date
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
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
Marc Delisle
5efd2feb49 Merge pull request #1378 from nisargjhaveri/bug_4558 
bug #4558 Unable to Add Rows while Creating Table
 2014-10-16 10:39:39 -04:00
Nisarg Jhaveri
310b76c585 bug #4558 Unable to Add Rows while Creating Table 
- Remove inline JS from add column button.
- Remove unnecessary eventhandler to submit form on enter.
- Added event handler to add column field to add on enter.
- Fix tests

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-16 19:43:52 +05:30
Madhura Jayaratne
8059f3fff0 Merge pull request #1375 from madhuracj/DisableIS 
Performance improvements related to IS
 2014-10-16 18:49:18 +05:30
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
Marc Delisle
3fb80ff57f Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-12 10:02:08 -04:00
Marc Delisle
9d187c0df6 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-10 08:03:25 -04:00
Madhura Jayaratne
92ccb972e3 Merge branch 'master' into DisableIS 2014-10-10 11:44:31 +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
Marc Delisle
dbf5533376 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-09 10:01:15 -04:00
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
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Madhura Jayaratne
8d8135893d Function name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 15:07:55 +05:30
Madhura Jayaratne
adf2b0d78d Fix more failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 06:24:33 +05:30
Madhura Jayaratne
6f9381101d Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-06 23:22:11 +05:30
Marc Delisle
03debd0a6e Refactor: we had three similar functions, refactored into just one. 
Also, these functions returned false, or a string containing the type,
but the string was only used to indirectly mean a true value; now
we explicitely return true in this case.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-04 08:27:50 -04:00
Chanaka Dharmarathna
4e68ada908 Remove dead codes 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-04 11:40:39 +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
c326107d13 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-29 12:40:10 -04:00
Hugues Peccatte
af2d548d19 Fix typo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 17:21:59 +02:00
Hugues Peccatte
8463a44bb0 Create new PMA mb_* functions and initialise unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 14:08:04 +02:00
Marc Delisle
7a83b16df9 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-27 12:47:01 -04:00
Marc Delisle
b92a156739 Fix parameter type; remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-26 08:13:47 -04: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
Marc Delisle
9ab4ade266 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 11:34:32 -04:00
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
7b6c4e01e3 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-12 08:28:42 -04:00
Marc Delisle
9f65021d1e Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-09 09:21:27 -04:00
Hugues Peccatte
3cd1d69f8b Improve PMA_String* unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-08 21:49:55 +02:00
Marc Delisle
ac964a1470 rfe #1544 MySQL 5.7.5 compatibility 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-08 13:20:04 -04:00
Marc Delisle
b3bcdf55ee Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-07 09:40:02 -04:00
Marc Delisle
2905b29f68 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-07 09:25:14 -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
ff0011ac3f Merge pull request #1353 from Tithugues/securityStringSquash 
Mass modifications to use PMA_String.
 2014-09-06 19:15:06 +02:00
Hugues Peccatte
623715c5f9 Add PMA_String::substrCount. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:53:30 +02: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