gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,628 Commits 12 Branches 481 Tags 2.4 GiB
8620242e68
Commit Graph

878 Commits

Author SHA1 Message Date
Madhura Jayaratne
caf96c3d8f Server need not be added to url_params; PMA_URL_getHiddenInputs() takes care of adding server to the form if needed. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 12:11:12 +05:30
Madhura Jayaratne
00fd7b6ca0 Merge branch 'QA_4_3' 2014-12-10 15:13:46 +05:30
Madhura Jayaratne
9f58a8188a Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 15:07:17 +05:30
Madhura Jayaratne
244a256d2c Merge branch 'QA_4_3' 2014-12-09 16:46:06 +05:30
Madhura Jayaratne
093be4b1ee Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 16:45:23 +05:30
Madhura Jayaratne
b02758e383 Merge branch 'QA_4_3' 2014-12-08 18:08:56 +05:30
Madhura Jayaratne
5233ee8bb1 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 18:07:58 +05:30
Chirayu Chiripal
94a94c05c1 fix tests for HHVM 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-07 13:52:56 +05:30
Madhura Jayaratne
d208ea0ed5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-05 20:05:39 +05:30
Madhura Jayaratne
1c78268a7b Update tests. Add meaningful values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 20:03:40 +05:30
Madhura Jayaratne
806178eca2 Upgrade GIS visualization page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 17:26:54 +05:30
Michal Čihař
e7a9575a02 Do not use multiline regexps here 
They don't seem to work reliable on hhvm.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 09:35:27 +01:00
Marc Delisle
3062152abf Merge branch 'QA_4_3' 2014-12-04 14:02:48 -05:00
Marc Delisle
00db138a47 bug #4620 Undefined index while adding to the central columns list 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 14:01:52 -05:00
Madhura Jayaratne
f9e430e0d3 Merge branch 'master' into multiquery 2014-12-01 16:51:48 +05:30
Madhura Jayaratne
8d9054f732 Use class attribute to select result_query div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 16:49:17 +05:30
Michal Čihař
b7e17814c1 Fix variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:59:07 +01:00
Michal Čihař
a6764bab9b Always restore mocked instance after test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:38:40 +01:00
Madhura Jayaratne
aff4046fdd Update getCheckbox to add id field. Remove id field from profiling checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 16:58:20 +05:30
Madhura Jayaratne
ad2de53286 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:52:08 +05:30
Madhura Jayaratne
3b2f62d3c2 Tracking improvements. Implements rfe #1562 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 17:31:53 +05:30
Marc Delisle
6ccd694f6b Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-23 07:42:54 -05:00
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
Hugues Peccatte
19cb4a7eb9 Fix PHPDoc for provider. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 18:59:51 +01:00
Hugues Peccatte
4922230bb6 Add test for PMA_StorageEngine::getEngine. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 17:22:26 +01:00
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
Hugues Peccatte
93c86da700 Minor style modifications. 
PHPDoc update.
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 17:34:10 +01:00
Marc Delisle
065397cd84 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-08 06:48:56 -05:00
Marc Delisle
1ed62c3fca bug Incorrect text/icon display in Tracking report 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-08 06:46:25 -05:00
Madhura Jayaratne
79adf3d4b6 Fix test failures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 07:00:28 +05:30
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
fd7f02f929 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:33:41 +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
Marc Delisle
2e130e8c36 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-01 08:11:47 -04:00
Hugues Peccatte
7ecbd977e6 Minor code style modifications. 
PHPDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 22:47:40 +01:00
Hugues Peccatte
e1e2669841 Remove old string manipulation test classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 22:27:52 +01:00
Hugues Peccatte
1911ece7ed Add multibytes constants. 
Update string tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 21:21:12 +01:00
Hugues Peccatte
3bf218519f Remove old manipulation string classes and tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 21:16:59 +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
Ann + J.M
c98356f9fc Fix unit test 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:55:30 +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
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
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
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