Commit Graph

7520 Commits

Author SHA1 Message Date
Marc Delisle
0c6e134d36 Fix merge conflicts 2013-08-07 08:31:38 -04:00
Marc Delisle
c2b2c7b6e9 Bug #4048 Cannot select foreign value in Search 2013-08-07 08:27:34 -04:00
Michal Čihař
d7c3b58337 Dropped MySQL manual type configuration
Nothing but default settings is really working now:

- most formats are no longer available on MySQL formats
- for downloadable doc our links are in most cases broken and nobody
  noticed this, so I assume nobody is using this
- anyway most current installations don't have troubles with internet
  access what was main motivation for this configuration directive
2013-08-07 08:32:01 +02:00
Michal Čihař
d9278f4a04 Document dropping some of the configuration 2013-08-06 13:38:45 +02:00
Marc Delisle
8b772f59ee Merge branch 'QA_4_0' 2013-08-04 07:01:18 -04:00
Marc Delisle
cce1fa2735 Fix merge conflicts 2013-08-04 07:00:04 -04:00
Marc Delisle
d9fecc136d Fix merge conflicts 2013-08-02 08:27:01 -04:00
Marc Delisle
4711126d12 Missing hints when changing a column's structure 2013-08-02 08:23:52 -04:00
Marc Delisle
09e4d7a84c Merge commit '81a228e' 2013-07-31 14:05:04 -04:00
J.M.
81a228e57f Fix bug 4038: PMASA-2013-8 not mentioned in 4.0.4.2 ChangeLog 2013-07-31 19:14:24 +02:00
Marc Delisle
917d8033eb Fix merge conflicts 2013-07-30 08:30:32 -04:00
Marc Delisle
baf3dd9b6a Bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) 2013-07-30 08:27:12 -04:00
Madhura Jayaratne
4f93739fc5 Fix typo 2013-07-30 17:46:35 +05:30
Isaac Bennetch
0174f102aa Merge pull request #546 from kasunchathuranga/exportView
Export views as if they were tables
2013-07-29 21:14:21 -07:00
Marc Delisle
30c1ed99cb Merge branch 'QA_4_0' 2013-07-29 16:34:46 -04:00
Marc Delisle
5d946eaf57 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-29 16:32:03 -04:00
Marc Delisle
66fe475d4f ChangeLog entry for Improved protection against cross framing 2013-07-29 16:31:44 -04:00
Kasun Chathuranga
091a1a707a ChangeLog entry for 'Export view as if it was a table' 2013-07-29 09:16:22 +05:30
Marc Delisle
e73bfee67c 4.0.6-dev 2013-07-28 09:34:39 -04:00
Marc Delisle
fdb0ad1f69 Merge branch 'QA_4_0' 2013-07-28 06:26:12 -04:00
Marc Delisle
0e9e7f28a2 Fix merge conflicts 2013-07-28 06:25:48 -04:00
Marc Delisle
af5ca358d2 Fix merge conflicts 2013-07-28 06:23:57 -04:00
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Dieter Adriaenssens
e0c8704f72 [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 2013-07-28 02:26:26 +02:00
Dieter Adriaenssens
b9c814ed6d [security] Fix unencoded json object, see PMASA-2013-11 2013-07-28 01:50:46 +02:00
Isaac Bennetch
1a41ce1f59 Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables
Conflicts:
	ChangeLog
2013-07-27 14:01:35 -04:00
Madhura Jayaratne
2a28436bdd #4035 Query "inline" link disappears when turning off "Explain SQL" option 2013-07-27 20:03:26 +05:30
Marc Delisle
ab7f0a143c Merge branch 'QA_4_0' 2013-07-27 06:33:34 -04:00
Marc Delisle
3fde4efd51 #3578 transformations for text/plain on a BLOB column 2013-07-27 06:32:58 -04:00
Marc Delisle
4e40875d02 Merge branch 'QA_4_0' 2013-07-26 09:06:15 -04:00
Marc Delisle
69c82e1380 Missing ChangeLog entry in master 2013-07-26 09:04:58 -04:00
Marc Delisle
4a6b6bda90 bug #3998 Non-permanent SQL history not working 2013-07-26 08:59:04 -04:00
Atul Pratap Singh
c598c59d8a changelog entry for bug#4009 2013-07-25 20:57:39 +05:30
Marc Delisle
93c5a23a72 bug #4024 Editing field a record is selected by makes pma load forever 2013-07-24 10:51:14 -04:00
Marc Delisle
1293e9b6e9 [security] Fix self-XSS in schema export, see PMASA-2013-14 2013-07-23 11:05:10 -04:00
Marc Delisle
8ef025ef3d [security] Fix control user SQL injection in schema_export.php, see PMASA-2015 2013-07-23 08:48:53 -04:00
Marc Delisle
974d0dedee [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15 2013-07-23 08:35:07 -04:00
Kasun Chathuranga
4f0f77390b Add ChangeLog entry for rfe #1385 - Hide tables, functions, procedures, events and views in navigation tree 2013-07-23 10:00:27 +05:30
Marc Delisle
61731b8651 Merge branch 'QA_4_0' 2013-07-20 10:26:15 -04:00
Marc Delisle
6ac33adc15 ChangeLog entry for bug 4012 fix
Fix another case of parameter incorrectly passed by reference
Adjust functions parameter doc
2013-07-20 10:23:20 -04:00
Marc Delisle
dc92c72e8a Merge commit '77e67c3' 2013-07-19 09:13:51 -04:00
Marc Delisle
77e67c3f2c - bug #4019 Create database if not exists (export): add an option to the
interface to enable generating CREATE DATABASE and USE (false by default)
2013-07-19 09:09:24 -04:00
Marc Delisle
257bd7349c ChangeLog entry for full path disclosure fixes 2013-07-17 15:27:57 -04:00
Marc Delisle
13cd72a269 Fix merge conflict 2013-07-17 07:15:06 -04:00
Marc Delisle
5720fb3843 Incorrect Drizzle 7 detection (backport from 37781045) 2013-07-17 07:08:35 -04:00
Isaac Bennetch
77467421f3 ChangeLog for configurable menus 2013-07-14 00:26:45 -04:00
Isaac Bennetch
63694eb049 Merge pull request #496 from kasunchathuranga/EditView
Edit a view
2013-07-12 10:04:01 -07:00
Kasun Chathuranga
ecc0e3d5eb ChangeLog entry for rfe #1373 2013-07-12 21:07:01 +05:30
Marc Delisle
a8007e46d0 Merge branch 'QA_4_0' 2013-07-12 06:46:29 -04:00