Commit Graph

13241 Commits

Author SHA1 Message Date
Rakesh Kumar
92d276b3ac Add missing database link
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-10 06:52:52 +05:30
Madhura Jayaratne
19a1f376f5 Fix testPMAGetCentralColumnsCount()
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 18:25:44 +05:30
Madhura Jayaratne
547606bd26 Fix testPMAGetColumnsList()
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 18:03:05 +05:30
Madhura Jayaratne
19116baec0 Check whether there are columns.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 15:58:52 +05:30
Madhura Jayaratne
3821b724cc Move col_extra handling code to a single method. Add such missing col_extra handling.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 15:49:11 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
7dde05cc41 phpUnit is unable to mock private methods
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 14:17:15 +05:30
Madhura Jayaratne
df39cff9ef Return value from the new method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 13:53:12 +05:30
Madhura Jayaratne
42bbc5e04d bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-09 13:24:28 +05:30
Marc Delisle
a08353de46 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-07 06:42:40 -05:00
Madhura Jayaratne
390a36eeea Compatibility with central columns of version 4.4
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 15:52:44 +05:30
Madhura Jayaratne
4b057ae45f Simplify handling values from previous version by using comma separated values
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 15:28:27 +05:30
Madhura Jayaratne
8d7caf61f9 Merge branch 'QA_4_3' into QA_4_4 2015-03-06 08:47:05 +05:30
Madhura Jayaratne
1bb782aa46 bug #4790 DROP TABLE/VIEW IF EXISTS are not tracked
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-06 08:14:52 +05:30
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