Commit Graph

92912 Commits

Author SHA1 Message Date
Michal Čihař
cef71eeaef Explicitely mention accepted types
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Michal Čihař
73ec80a455 Return integer when we claim so
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Michal Čihař
36da40f9d7 Explicitely mention return type
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Michal Čihař
54564305b6 Query options are integer (and are so handled in other methods)
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Madhura Jayaratne
9a12fe5d0b Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-06-06 18:23:56 +05:30
Madhura Jayaratne
3c21181678 Remove extra empty line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-06-06 18:19:30 +05:30
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ř
475eac8625 Document optional parameter type
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
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