gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,029 Commits 12 Branches 481 Tags 2.4 GiB
9f8615dfb4
Commit Graph

170 Commits

Author SHA1 Message Date
Jeff Chan
9a5603f908 Cast unit size value for formatByteDown to float to avoid overflow. 
Add another test case to formatByteDown which fails on HHVM 2.4

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-02-10 18:25:54 +00:00
Michal Čihař
767fc8c997 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:38:49 +01:00
Michal Čihař
47b1b31f49 Need to encode whole string here 2014-02-02 10:13:31 +01:00
Michal Čihař
8eaaad4826 Do not use HTML entities for quotes inside translatable messages 
First of all there is no reason to HTML encode them, if the string
should be encoded, it has to be done after getting the translation from
gettext as they can contain something to quote as well.

Also using HTML entities is sometimes confusing for translators.
 2014-02-02 10:06:23 +01:00
Madhura Jayaratne
cdd53ace21 Merge branch 'QA_4_1' 
Conflicts:
	libraries/Util.class.php
	test/libraries/PMA_insert_edit_test.php
 2014-01-29 23:30:33 +05:30
Madhura Jayaratne
c1c50b5944 Revert e8fa9e5335, ea0ad9d41c and f36fbfd4c6 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-29 23:06:43 +05:30
Marc Delisle
8cdb92be5a Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-29 08:10:23 -05:00
Marc Delisle
f36fbfd4c6 Bug #4258 Grid editing broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-29 07:58:19 -05:00
Marc Delisle
8ba4548146 Merge commit 'e8fa9e5' 2014-01-27 12:45:29 -05:00
Sampath Liyanage
e8fa9e5335 bug 4245 fix with minimum changes 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-01-27 21:29:27 +05:30
Marc Delisle
66963f6d06 Merge branch 'QA_4_1' 2014-01-22 13:29:56 -05:00
Marc Delisle
704107c3b7 bug #3579 NOW() function incorrectly selected (regression) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-22 13:28:34 -05:00
Atul Pratap Singh
0cc9230bd3 fix headers already sent warnings when using session_start() 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-22 20:16:47 +05:30
Atul Pratap Singh
9a9ab712bf Merge branch 'QA_4_1' 
Conflicts:
	libraries/Util.class.php
 2014-01-22 20:20:24 +05:30
Atul Pratap Singh
3a1031c262 Fix bug#4013 AJAX request waiting until version info is retrieved 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:
	libraries/Util.class.php
 2014-01-21 16:57:35 +05:30
Atul Pratap Singh
2f978adba9 Fix bug#4013 AJAX request waiting until version info is retrieved 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-20 10:27:29 +05:30
Marc Delisle
0b7b13fc0b Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-18 07:33:01 -05:00
Marc Delisle
d820a2551d Should be a static method 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-11 08:01:38 -05:00
Marc Delisle
203072c060 Refactor duplicate code for compression detection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-11 07:58:11 -05:00
Sachith Hasaranga Seneviratne
4e28aa1a81 (Feature Request 1466) 
Refactor PMA_Util::getLatestVersion() and PMA_sendErrorReport()
to further reuse curl_handle option setting code.

Signed-off-by: Sachith Seneviratne sachith500@gmail.com
 2014-01-08 19:08:18 +05:30
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Sachith Hasaranga Seneviratne
45b30c130f Refactor PMA_Util::getLatestVersion() and PMA_sendErrorReport() (Feature Request 1466) 
Signed-off-by: Sachith Seneviratne sachith500@gmail.com
 2014-01-05 09:11:04 +05:30
Hugues Peccatte
37f90df60d Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:52 +01:00
Hugues Peccatte
207466d59c Don't use function in for loop test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-18 22:18:02 +01:00
Michal Čihař
10bc618ebe Remove unused global variable access 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2013-12-04 09:42:56 +01:00
Marc Delisle
20770f3f33 Merge branch 'QA_4_1' 2013-11-27 12:41:45 -05:00
Marc Delisle
fbce9502e4 Fix merge conflicts 2013-11-27 12:41:01 -05:00
Marc Delisle
b22b76e7f5 bug #4158 Events page says no privileges with ALL PRIVILEGES 2013-11-27 12:36:51 -05:00
Madhura Jayaratne
ce75da4220 Wrap a long line 2013-11-27 07:27:47 +05:30
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Marc Delisle
2f1176d27c Fix merge conflicts 2013-11-10 08:14:19 -05:00
Marc Delisle
226295fa39 Fix typo; clarify bug reference and add explanation 2013-11-10 06:48:11 -05:00
Hugues Peccatte
d3601abf96 Global PHPDoc update. 2013-11-10 12:29:55 +01:00
Hugues Peccatte
80210a489a Update PHPDoc. 2013-11-08 19:28:20 +01:00
Hugues Peccatte
a7137df361 Update phpdoc. 2013-11-08 19:28:19 +01:00
Hugues Peccatte
d7df8b8185 Update types in PHPDoc. 2013-11-08 19:28:18 +01:00
Madhura Jayaratne
17e4f9eb39 Fix syntax highlighting. Use PMA_Util::formatSql() for SQL formatting 2013-10-19 10:56:47 +05:30
Madhura Jayaratne
a79e570329 class is optional 2013-10-13 12:35:16 +05:30
Madhura Jayaratne
6f27ec86cc Auto submit display direction dropdown 2013-10-13 12:10:30 +05:30
Marc Delisle
ffd3a06811 Merge branch 'QA_4_0' 2013-10-09 10:08:24 -04:00
Marc Delisle
4fb5088f86 bug #3678 Does not display or manipulate bit(64) fields appropriately 2013-10-09 10:06:47 -04:00
Mohamed Ashraf
2bb923284c Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-05 20:12:28 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-01 13:07:52 +02:00
Kasun Chathuranga
99c65f37e7 Table specific privileges 2013-08-30 18:49:03 +05:30
Isaac Bennetch
fa87bcec06 Merge pull request #582 from kasunchathuranga/fractionalSecs 
Use fractional seconds in time, datetime and timestamp
 2013-08-27 06:37:30 -07:00
Madhura Jayaratne
7ec7440c57 Query "inline" link disappears when running UPDATE query 2013-08-25 18:34:04 +05:30
Kasun Chathuranga
412b3b4c31 Do not add trailing 0s for 'CURRENT_TIMESTAMP' string 2013-08-18 22:39:14 +05:30
Kasun Chathuranga
b495061cdf Use fractional seconds in time 2013-08-10 11:26:43 +05:30
Michal Čihař
07c1e0a14a Revert "Use parser flags instead of regexp matching" 
This reverts commit 622523de41.

We don't have flags always available...
 2013-08-07 11:37:52 +02:00
Michal Čihař
865de7028a Use foreach instead of for 2013-08-07 11:25:18 +02:00