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

81376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Prokopenko
c828b72de1 Translated using Weblate (Ukrainian) 
Currently translated at 82.2% (2137 of 2599)
 2013-01-30 14:23:18 +01:00
Marc Delisle
db77bc6ad2 4.0.0-alpha2 2013-01-28 07:59:35 -05:00
Marc Delisle
70a73190b8 Fix merge conflicts 2013-01-28 07:35:46 -05:00
Marc Delisle
8a3f909538 Merge branch 'QA_3_5' 2013-01-28 07:35:19 -05:00
Marc Delisle
360a9f4a0c Fix merge conflict 2013-01-28 07:32:45 -05:00
Marc Delisle
9727db8647 Merge branch 'MAINT_3_5_6' into QA_3_5 2013-01-28 07:32:03 -05:00
Marc Delisle
2e627b9ae5 3.5.6 release 2013-01-28 07:31:40 -05:00
Weblate
cf067f33a9 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-28 13:28:37 +01:00
Rodrigo Severo
35dca4aef4 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.5% (2524 of 2562)
 2013-01-28 13:28:33 +01:00
Marc Delisle
2dc656b943 Fix merge conflicts 2013-01-28 07:25:20 -05:00
Marc Delisle
7cd82758d3 Merge branch 'MAINT_3_5_6' into QA_3_5 2013-01-28 07:22:45 -05:00
Marc Delisle
d4730db69c Escape HTML for index drop confirmation message 2013-01-28 07:21:45 -05:00
Michal Čihař
0f85d83d58 Merge remote-tracking branch 'origin/QA_3_5' 2013-01-28 10:54:03 +01:00
Weblate
2d32200164 Merge remote-tracking branch 'origin/master' 2013-01-28 08:18:19 +01:00
Rodrigo Severo
7b89b9bf01 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 96.3% (2503 of 2599)
 2013-01-28 08:18:15 +01:00
Michal Čihař
b202e8c5dc Merge pull request #147 from lem9/bug-3786 
Bug #3786 PHP error when dropping user
 2013-01-27 23:17:33 -08:00
Dieter Adriaenssens
cc4c7a02b5 exclude blowfish.php from code quality checks, it is an external lib 2013-01-27 21:34:32 +01:00
Marc Delisle
6673414095 Dead code 2013-01-27 14:49:29 -05:00
Marc Delisle
eba6aad22a Bug #3786 PHP error when dropping user 2013-01-27 13:47:08 -05:00
Rouslan Placella
fe4f341b1b Fixed XSS in "change column" functionality 2013-01-27 18:21:03 +00:00
Marc Delisle
4aa55cb334 Merge pull request #146 from ruleant/bug_3783 
fix bug #3783, instanciate class before calling static method
 2013-01-27 10:16:45 -08:00
Andrey Prokopenko
b4177977bc Translated using Weblate (Ukrainian) 
Currently translated at 86.1% (2207 of 2562)
 2013-01-27 18:22:05 +01:00
Madhura Jayaratne
ffd2e5b46c Throw error if no sql query is set 2013-01-27 21:57:53 +05:30
Dieter Adriaenssens
27148aa738 fix bug #3783, instanciate class before calling static method 2013-01-27 17:19:51 +01:00
Madhura Jayaratne
24275dd07e Coding style improvements 2013-01-27 21:42:17 +05:30
Madhura Jayaratne
467c06501e Merge pull request #145 from zixtor/master 
When unable to display chart, show appropriate error message.
 2013-01-27 08:06:18 -08:00
Dieter Adriaenssens
afcf4ec7e0 add comment why variables are still needed 2013-01-27 16:55:05 +01:00
Dieter Adriaenssens
0a3953d26b Revert "remove unused variables" 
This reverts commit cb9e34d42a.

-> $error_header, $lang and $dir are used in the included file
libraries/error.inc.php
 2013-01-27 16:52:22 +01:00
Atul Pratap Singh
effd5a3cce Show error messages when unable to display chart 2013-01-27 20:48:07 +05:30
Marc Delisle
fcc51cea40 Merge pull request #143 from Gemorroj/master 
fixed undefined variable $is_display for method _getCheckBoxesForMultipleRowOperations
 2013-01-26 11:06:33 -08:00
Gemorroj
658c0fa299 correct test for getCheckBoxesForMultipleRowOperations / part 2 2013-01-26 21:10:04 +03:00
Gemorroj
9ab129dd0e correct test for getCheckBoxesForMultipleRowOperations 2013-01-26 21:01:10 +03:00
Gyeongsu Han
65b5463842 Translated using Weblate (Korean) 
Currently translated at 42.3% (1084 of 2562)
 2013-01-26 18:22:04 +01:00
Gemorroj
0b26a1454c fixed undefined variable $is_display for method _getCheckBoxesForMultipleRowOperations 2013-01-26 17:19:36 +03:00
Gemorroj
8805a55053 selected = "selected" to better fit the xml 2013-01-26 16:50:57 +03:00
Marc Delisle
594a1c7e4f Merge pull request #142 from Gemorroj/master 
many fixes, see diff
 2013-01-26 05:31:11 -08:00
Gemorroj
0f573fbd78 see https://github.com/phpmyadmin/phpmyadmin/pull/142#discussion_r2784623 2013-01-26 16:11:42 +03:00
Gemorroj
fc51a91713 many some minor fixes (sorry, see diff) 2013-01-26 15:35:29 +03:00
Marc Delisle
c3f2796544 Anonymous functions are incompatible with PHP 5.2 2013-01-26 06:44:36 -05:00
Marc Delisle
4e565265f7 Bug #3783 (PHP 5.2 incompability) 2013-01-26 05:56:49 -05:00
Victor Volkov
c64dae9557 Translated using Weblate (Russian) 
Currently translated at 100.0% (2562 of 2562)
 2013-01-26 08:31:32 +01:00
Victor Volkov
fb2b3e46d3 Translated using Weblate (Russian) 
Currently translated at 100.0% (2599 of 2599)
 2013-01-26 08:30:32 +01:00
Andrey Prokopenko
ef415e8e6f Translated using Weblate (Russian) 
Currently translated at 99.9% (2560 of 2562)
 2013-01-26 08:29:01 +01:00
Weblate
ba03c864e2 Merge remote-tracking branch 'origin/master' 2013-01-26 00:22:13 +01:00
Dieter Adriaenssens
688642560d use 'self' when calling static methods 2013-01-26 00:20:57 +01:00
Dieter Adriaenssens
d53f984a71 don't use static call on a class instance 2013-01-26 00:15:52 +01:00
Weblate
f81a54fde7 Merge remote-tracking branch 'origin/master' 2013-01-25 21:03:28 +01:00
Andrey Prokopenko
ef22653c51 Translated using Weblate (Ukrainian) 
Currently translated at 81.1% (2107 of 2599)
 2013-01-25 21:03:26 +01:00
Dieter Adriaenssens
36c208e32d move _tables property to the right class 2013-01-25 20:56:00 +01:00
Weblate
6d34c96056 Merge remote-tracking branch 'origin/master' 2013-01-25 18:02:29 +01:00