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

303 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
d0b1002893 Include by default 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-18 20:15:10 +05:30
Madhura Jayaratne
55114b95e0 Wrap more long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:07:25 +05:30
Madhura Jayaratne
8ef9ced453 Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 12:51:28 +05:30
Madhura Jayaratne
55d90fd018 Bug #4561 PHP error in transformations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 12:49:18 +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
13155b65a2 Merge branch 'master' into Bug4537 
Conflicts:
	ChangeLog
 2014-10-06 14:25:17 +05:30
Madhura Jayaratne
65f360b33f bug #4551 Wrong test in source code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-06 10:20:47 +05:30
Hugues Peccatte
48bd3b8ee5 Remove unused $pmaString. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 10:42:44 +02:00
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-03 23:08:43 +02:00
Madhura Jayaratne
516f62561b bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-02 10:10:40 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
447d763a48 PHPDoc modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-20 18:31:12 +02: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
fe17e81299 Remove unused variables 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-16 23:19:04 +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
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Hugues Peccatte
d4bbde9ec5 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:05:00 +02:00
Hugues Peccatte
fe452a7240 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 13:56:42 +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
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
chanaka
29d81b3506 Fixed codesniffer error in documentation 
Signed-off-by: chanaka <chanaka@oneit.com.au>
 2014-07-28 19:34:26 +05:30
Michal Čihař
f060e5905d Fixed path to transformation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-07-24 07:27:05 +02:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Atul Pratap Singh
ab1d28fb79 Merge commit '2819506' 2014-07-02 14:08:13 +05:30
Atul Pratap Singh
2819506bb0 Have single-sort url besides multi-sort for each column and make single-sort default on click 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-01 23:32:05 +05:30
Marc Delisle
5b6331cb7e Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 16:03:34 -04:00
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00
Hugues Peccatte
09a8a40300 Merge pull request #1240 from Tithugues/scrutinizer 
Fix some Scrutinizer issues
 2014-06-22 16:38:59 +02:00
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Marc Delisle
67a705b053 Merge branch 'QA_4_2' 2014-06-20 15:41:05 -04:00
Marc Delisle
a30405fe0b bug #4467 shell_exec() has been disabled for security reasons 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 15:39:09 -04:00
Hugues Peccatte
66f82fbfac Update PHPDoc and remove useless variables and methods to fix scrutinizer errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-19 22:09:18 +02:00
Chirayu Chiripal
c8a6ea0467 scrutinizer issues fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-19 17:10:55 +05:30
Marc Delisle
c43df7d140 Clarify parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 17:42:08 -04:00
Marc Delisle
d4a45f66cc Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:36:55 -04:00
Marc Delisle
03fb581447 Refactor vertical display links 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:34:06 -04:00
Michal Čihař
c1959a2e05 Fix parameter type declaration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:23:06 +02:00
Michal Čihař
c3630c3cf7 Remove unused parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:23:06 +02:00
Michal Čihař
4638c051f5 Use passed parameter instead of calculating it again 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:23:06 +02:00
Michal Čihař
900ce069ee Correctly store kill query for later use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:56:47 +02:00
Michal Čihař
11f76e66b3 Fix typo in variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:54:12 +02:00
Michal Čihař
3e268dbdf9 Make _addClass a bit more readable 
We now construct an array which we join in the end. This avoids need to
care about spaces in the class names.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:21:04 +02:00
Michal Čihař
444c5828a6 Avoid double conditions for DELETE_ROW/KILL_PROCESS, handle all of that in _getDeleteAndKillLinks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:12:27 +02:00
Michal Čihař
7bc9eba9bc One place to generate KILL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:08:40 +02:00
Craig Duncan
17fd6b576a Dynamically detect an amazon rds instance 
This is to avoid more configuration options

Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2014-06-05 19:38:57 +01:00
Craig Duncan
812d1ce67d Allow processes to be killed on Amazon RDS 
The 'KILL' syntax isn't available but a procedure to do the same thing is
http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Appendix.MySQL.CommonDBATasks.html

Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2014-06-03 22:39:04 +01:00
Marc Delisle
673fce8145 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:33:25 -04:00
Ann + J.M
ddf78c212b Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-26 10:39:50 +02:00