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

93652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
662c54b77e Merge commit '588bb79' 2014-06-06 08:11:16 -04:00
Marc Delisle
588bb79413 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-06 08:10:32 -04:00
Marc Delisle
2fd9dad403 Merge pull request #1208 from smita786/QA_4_2 
Bug fix:Query error on submitting column change form containing disabled...
 2014-06-06 08:07:46 -04:00
Michal Čihař
01955f90a4 Correct types in documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:18:13 +02:00
Michal Čihař
db42258823 Correct type for text direction and special chars 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:16:06 +02:00
Michal Čihař
21c6c2e79f Pass correct types in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:13:48 +02:00
Michal Čihař
83073fe53c Remove duplicate variable initialization 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:12:51 +02:00
Michal Čihař
1cc4620d65 Pass correct types in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:12:26 +02:00
Michal Čihař
8c1482816a Fix type annotations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:11:13 +02:00
Michal Čihař
666e302564 Fix indefined variables in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:08:40 +02:00
Michal Čihař
3e4ef11ba1 Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:07:48 +02:00
Michal Čihař
bfadec2f2b Pass correct parameter values 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:05:26 +02:00
Michal Čihař
3e4da830ee Correctly set static properties in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:01:14 +02:00
Michal Čihař
dc825e82be Correctly document parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 12:58:50 +02:00
Michal Čihař
d6a3abcf81 Fix method call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 12:54:21 +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ř
02e51f2332 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-06 11:52:24 +02:00
கணேஷ் குமார்
de466141cc Translated using Weblate (Tamil) 
Currently translated at 27.9% (774 of 2770)

இப்போது அமைப்பாக்க கோப்புக்கு கமுக்க கடவுசொற்றொடர் தேவை (blowfish_secret)
 2014-06-06 11:45:19 +02:00
Michal Čihař
cbac30c99a Document that fetchResult can take array 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:34:38 +02:00
Michal Čihař
de7255f120 Share code for generating JOIN query for Drizlle 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:32:17 +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
Weblate
dd9fb91542 Merge remote-tracking branch 'origin/master' 2014-06-06 08:37:57 +02:00
கணேஷ் குமார்
8dfb8a8ee0 Translated using Weblate (Tamil) 
Currently translated at 27.9% (778 of 2782)
 2014-06-06 08:37:55 +02:00
Madhura Jayaratne
d4b241e71d Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 12:07:36 +05:30
Madhura Jayaratne
dcfd72abad Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-06-06 12:06:33 +05:30
Madhura Jayaratne
0c159c56f2 Allow saving query charts as images 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 12:06:13 +05:30
கணேஷ் குமார்
b8eb038cc6 Translated using Weblate (Tamil) 
Currently translated at 27.9% (773 of 2770)

திரும்பி->பின்செல்க
 2014-06-06 01:02:29 +02:00
கணேஷ் குமார்
4df51867c4 Translated using Weblate (Tamil) 
Currently translated at 27.9% (773 of 2770)
 2014-06-06 00:47:10 +02:00
கணேஷ் குமார்
d5904cb68d Translated using Weblate (Tamil) 
Currently translated at 27.9% (773 of 2770)

செல்க
 2014-06-06 00:44:06 +02:00
கணேஷ் குமார்
9f744c8eac Translated using Weblate (Tamil) 
Currently translated at 27.9% (773 of 2770)

வடிவியல் சேர்க்க->வரையமைப்பை சேர்க்க
 2014-06-06 00:34:02 +02:00
Michal Čihař
1beb22fddc Merge pull request #1205 from duncan3dc/amazon_rds 
Allow processes to be killed on Amazon RDS
 2014-06-05 22:36:35 +02:00
Smita Kumari
1b5901f45e Bug fix:Query error on submitting column change form containing disabled input 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-06 01:03:59 +05:30
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
Marc Delisle
17fd38e23e Merge branch 'QA_4_2' 2014-06-05 12:45:07 -04:00
Marc Delisle
94e43de453 Add enforcement of the minimum supported PHP version (5.3.0) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-05 12:44:34 -04:00
Marc Delisle
ee22d3e65d Merge branch 'QA_4_2' 2014-06-05 12:28:25 -04:00
Marc Delisle
9112d7c930 bug #4437 Problems due to missing enforcement of the minimum supported MySQL version 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-05 12:27:03 -04:00
Madhura Jayaratne
9455673a26 Merge branch 'QA_4_2' 2014-06-05 16:48:57 +05:30
Madhura Jayaratne
2e645ede7f bug #4436 Insert form numeric field with function drop-down list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-05 16:47:41 +05:30
Burak Yavuz
4099c29119 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-05 09:44:09 +02:00
Marc Delisle
27fc59702c Merge pull request #1200 from D-storm/changelog 
changelog: plus sign for rfe
 2014-06-04 12:31:08 -04:00
Ann + J.M
fea0fe03ef Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-04 18:02:44 +02:00
Michal Čihař
1ca50ed73e Adjust comment as this returns bool 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-04 10:15:20 +02: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
Hugues Peccatte
c0b5648cf6 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-06-03 21:36:03 +02:00
Hugues Peccatte
ceddfffac4 Update PHPDoc. 
Add return.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-03 21:35:25 +02:00
Marc Delisle
c8e33b2a96 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:59:55 -04:00