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

95885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
01c514e060 Manage empty values of slave replication. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-11 16:08:40 +01:00
Hugues Peccatte
6991720ea2 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-11 10:03:07 +01:00
Hugues Peccatte
a0f348beea Merge branch 'removeUnusedVariables_master' 2014-11-11 10:02:54 +01:00
Madhura Jayaratne
3b3bd0c2eb Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 10:41:56 +05:30
Madhura Jayaratne
1d54c59049 #4584 Edit dialog for routines is too long for smaller displays 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 10:35:00 +05:30
Madhura Jayaratne
ffcd97aa48 bug #4404 Recordset return from procedure display nothing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 10:28:58 +05:30
Hugues Peccatte
b61ea0a10c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-10 23:28:33 +01:00
Hugues Peccatte
13b5690bac Fix typo in class name. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 23:28:19 +01: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
Marc Delisle
bade25f747 Merge pull request #1395 from nisargjhaveri/typoInExport 
Fixed typo in SQL export
 2014-11-10 15:47:25 -05:00
Nisarg Jhaveri
fb130bf20d Fixed typo in SQL export 
Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-11-11 00:47:38 +05:30
Marc Delisle
516352237b Fix undefined index notices 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-10 13:27:45 -05:00
Marc Delisle
b417fd62e1 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-10 11:22:26 -05:00
Marc Delisle
bef5f3cb5b Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-10 11:22:24 -05:00
Hugues Peccatte
cb94250d08 Minor coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 16:50:18 +01:00
Marc Delisle
c80ab10539 Merge pull request #1388 from Tithugues/b4495_master 
Fix #4495 Comment lines in multiquery
 2014-11-10 10:10:15 -05:00
Hugues Peccatte
f74ed544f6 Remove trailing whitespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 13:50:03 +01:00
Hugues Peccatte
58c629f6fd Merge branch 'master' into b4495_master 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
 2014-11-10 13:48:33 +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
89ae63ddf9 Merge pull request #1392 from Tithugues/SQLWithoutDelimiter_master 
Allow import SQL without delimiter till EOF.
 2014-11-10 13:44:44 +01:00
Madhura Jayaratne
ab3a82fb25 Eliminate duplicates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 16:33:19 +05:30
Madhura Jayaratne
19e146ee4b Correctly match with separator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 16:21:07 +05:30
Madhura Jayaratne
2d8fa546e1 ChangeLog entry for bug #3869 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 15:35:19 +05:30
Madhura Jayaratne
a1c1590254 Cache binary_logs variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 14:31:45 +05:30
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
da07378c36 Allow debugging queries executed by the navigation panel 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 12:23:43 +05:30
Madhura Jayaratne
2377ba4dd7 bug #4582 Debug SQL works only for the first page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 11:30:33 +05:30
Madhura Jayaratne
63861210d8 Partial fix for bug #4581 Some links in query_result doesn't work 2014-11-10 07:00:59 +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
ed51a25c8f Allow import SQL without delimiter till EOF. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 22:54:44 +01:00
Hugues Peccatte
1110aa3c0e Fix undefined variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 19:27:20 +01:00
Hugues Peccatte
b6f390ef09 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 19:20:55 +01:00
Hugues Peccatte
7a60853443 Replace $replication_info by a global variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 19:14:26 +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
2768d398b5 Reduce nesting levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 17:36:14 +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
Marc Delisle
8a3af94d35 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-09 08:04:30 -05:00
Hugues Peccatte
fe3941b9bd Fix #4495 Comment lines in multiquery 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 20:02:10 +01:00
Hugues Peccatte
80eb1091ee Refactorise code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 19:33:05 +01:00
Hugues Peccatte
604edcbd44 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 18:07:47 +01:00
Hugues Peccatte
076ff24cb3 PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 18:06:56 +01:00
Hugues Peccatte
a93288e508 Reduce nested levels. 
Remove unused local variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 17:58:57 +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
Hugues Peccatte
6827afb2bd Replace parameters by class attributes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 15:36:21 +01:00
Hugues Peccatte
458afb0391 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-08 15:27:33 +01:00
Hugues Peccatte
aa9700de68 Replace parameters by class attributes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 15:25:40 +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
685b116172 Merge commit '2a58116' 2014-11-08 06:47:22 -05:00