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

13227 Commits

Author SHA1 Message Date
Madhura Jayaratne
6f3001e69e Merge branch 'QA_4_3' into QA_4_4 2015-03-05 08:07:52 +05:30
Madhura Jayaratne
cf97e8626e Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-03-05 08:03:51 +05:30
Madhura Jayaratne
8f28b8fa27 bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-05 07:59:54 +05:30
Marc Delisle
d3c01d1b45 4.4.0-alpha1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-04 14:46:21 -05:00
Marc Delisle
d8b37769e6 [security] Risk of BREACH attack 
Thanks to Michal Čihař for the message suggestion.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-04 12:44:21 -05:00
Marc Delisle
ba15663212 [security] Risk of BREACH attack 
Thanks to Michal Čihař for the message suggestion.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-04 12:41:50 -05:00
Marc Delisle
edba4bbd1c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-03 15:39:04 -05:00
Marc Delisle
17932ae84b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-03 15:37:42 -05:00
Marc Delisle
1a9015080e Changelog entry; fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-03 15:27:06 -05:00
Marc Delisle
bec16f75df Merge pull request #1527 from tapanhalani/QA_4_3 
Fix bug#4746:- Right-aligned columns have left-aligned header
 2015-03-03 15:13:00 -05:00
tapanhalani
b661cd7c9b Fix bug#4746:- Right-aligned columns have left-aligned header 
Signed-off-by: tapanhalani <tapanhalani231@gmail.com>

Fix bug#4746: Right-aligned columns have left-aligned header

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>
Fix bug#4746:- Right-aligned columns have left-aligned header.

Fix bug#4746- Right-aligned columns have left-aligned header

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>
Fix bug#4746:- Right-aligned columns have left-aligned header.

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>

Fix bug#4746- Right-aligned columns have left-aligned header.

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>

Fix bug#4746:- Right-aligned columns have left-aligned headers.

Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-04 00:38:20 +05:30
Marc Delisle
f9c9a098e9 Missing definition in default configuration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-03 05:31:38 -05:00
Marc Delisle
8b5f4f4a8b 4.3.12-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-02 12:23:03 -05:00
Marc Delisle
cb57c53de4 Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-01 06:38:22 -05:00
Marc Delisle
ff35677c26 Merge pull request #1523 from madhuracj/rfe1602 
Alternative implementation for rfe #1602
 2015-03-01 06:33:41 -05:00
Marc Delisle
e7ced7194b Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-28 06:21:50 -05:00
Marc Delisle
f5a9002209 Merge pull request #1520 from madhuracj/rfe1441 
rfe #1441 Add regexp match when using AllowArbitraryServer
 2015-02-28 06:17:36 -05:00
Marc Delisle
5678401701 Merge pull request #1528 from rakeshkaundilya/master 
Feature Request:#1608 Allowing signed/unsigned attribute central column
 2015-02-27 09:30:43 -05:00
Michal Čihař
a6713cf771 First resolve method name and then use it 
Otherwise this fails with PHP 7 (-> is evaluated before [], so we're
dereferencing object by array).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-02-27 14:25:54 +01:00
Michal Čihař
a940279dff Optimize stripping b' prefix and ' suffix 
Use ltrim/rtrim is better than strtr with array.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-02-27 14:25:54 +01:00
Madhura Jayaratne
71ee86196b rfe #501 Support for SSL GRANT option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-27 15:53:12 +05:30
Rakesh Kumar
eec4e6a0ff Feature Request:#1608 Allowing signed/unsigned attribute central column 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2015-02-27 09:39:07 +05:30
Madhura Jayaratne
2ee6daaf70 Merge remote-tracking branch 'remotes/origin/master' into rfe1327 2015-02-27 08:36:21 +05:30
Madhura Jayaratne
177b110105 Bug #1327 Hide 'Add user' link if user does not have privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-27 08:35:00 +05:30
Madhura Jayaratne
1b939fb3d3 rfe #1441 Add regexp match when using AllowArbitraryServer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 17:02:09 +05:30
Madhura Jayaratne
f014821409 Alternative implementation for rfe #1602 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 16:35:10 +05:30
Madhura Jayaratne
e506afc3b0 Revert "Save unfinished work" 
This reverts commit 3007c6a6ef.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 11:53:48 +05:30
Madhura Jayaratne
bb21148393 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 11:02:40 +05:30
Madhura Jayaratne
04665a72c9 bug #4780 Notice when timestamp column does not have default value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 10:59:36 +05:30
Madhura Jayaratne
a07548273f Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-25 21:29:19 +05:30
Madhura Jayaratne
209f9c6de7 bug #4778 SQL error when database list is sorted by additional columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-25 21:25:07 +05:30
Marc Delisle
df7f409f1b rfe #1575 "Disable database expansion" : unclear directive name and explanation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-24 13:10:48 -05:00
Madhura Jayaratne
ea0c0ba4ff rfe #1207 Export users associated with a specific schema/database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-24 12:26:41 +05:30
Madhura Jayaratne
cf70ed404f Merge branch 'QA_4_3' 2015-02-23 18:53:32 +05:30
Madhura Jayaratne
228f9c8de1 bug #4760 Cannot re-import settings from local storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 18:39:49 +05:30
Madhura Jayaratne
073712a442 Use empty string as the default value. Otherwise it gives trouble importing stored settings 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 18:23:39 +05:30
Madhura Jayaratne
8f9ff979fa Merge branch 'QA_4_3' 2015-02-23 15:12:15 +05:30
Madhura Jayaratne
7ddabcaf1b bug #4767 Drizzle: undefined index in mysql_charsets.inc.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 15:05:08 +05:30
Madhura Jayaratne
2bb6492834 More default transformations for pmadb 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 13:09:23 +05:30
Madhura Jayaratne
6642772f43 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 11:59:37 +05:30
Madhura Jayaratne
55dccb6138 bug #4777 Some images are missing in Designer for original theme 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 11:58:26 +05:30
Madhura Jayaratne
a43c9b2df0 Activate/deactivate tracking with a single parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 08:45:33 +05:30
Hugues Peccatte
05ebf9a3a7 Fix typos. 
Minor PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:54:09 +01:00
Hugues Peccatte
e669cb4708 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-02-22 22:52:35 +01:00
Hugues Peccatte
4846ef6bf7 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:51:12 +01:00
Marc Delisle
17c9592f3c Use standard backquote method 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 16:03:08 -05:00
Marc Delisle
d2de03ebbe Use shorter operator 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 15:58:25 -05:00
Marc Delisle
e71496dc84 Merge pull request #1508 from devenbansod/feat-req-1606 
Adding Filter Process List | Feature #1606
 2015-02-22 15:52:31 -05:00
Hugues Peccatte
52bfc94d74 Update PHPDoc. 
Fix typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 20:03:32 +01:00
Deven Bansod
42d5a90f2f Add Filter to Process List | Feature #1606 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-02-22 22:52:47 +05:30