Commit Graph

8873 Commits

Author SHA1 Message Date
Marc Delisle
cb2b266602 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-28 06:25:14 -05:00
Marc Delisle
12eb5c259c ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-27 09:40:06 -05: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
Madhura Jayaratne
c127f9803b ChangeLog entry for rfe #1327
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-27 08:38:16 +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
Marc Delisle
6a11d02455 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-25 12:31:51 -05:00
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
282a0af29e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-24 14:30:44 +05:30
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
Chirayu Chiripal
86fa2ed548 these does not change external behavior 2015-02-23 22:11:35 +05:30
Madhura Jayaratne
cf70ed404f Merge branch 'QA_4_3' 2015-02-23 18:53:32 +05:30
Madhura Jayaratne
bf428dc0ca Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-23 18:52:37 +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
Marc Delisle
f2170d3bc6 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-23 08:00:44 -05:00
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
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
5619047ab9 rfe Change tracking activation status from db level tracking page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-23 09:37:45 +05:30
Marc Delisle
5a8208f67c ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-22 15:54:10 -05:00
Marc Delisle
c132f6697b Merge branch 'QA_4_3' 2015-02-22 08:34:52 -05:00
Marc Delisle
efbfe9a0b4 bug #4768 MariaDB: version mismatch
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-22 08:33:18 -05:00
Atul Pratap Singh
0697b0b859 Merge commit '0abfb99' 2015-02-21 22:46:55 +05:30
Marc Delisle
cf8b3330d3 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-21 07:18:26 -05:00
Atul Pratap Singh
11638d3559 Fix bug#4774 SQL links are completely wrong
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-02-21 00:53:47 +05:30
Marc Delisle
9f4a2b15a4 4.3.10 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-20 07:46:04 -05:00
Marc Delisle
06d6158104 4.3.11-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-20 07:44:57 -05:00
Madhura Jayaratne
805679626a rfe #685 Editor for HTML content
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-20 12:41:56 +05:30
Marc Delisle
0ea06dc2b5 Merge branch 'QA_4_3' 2015-02-19 08:00:25 -05:00
Marc Delisle
88d3aafef1 bug #4771 Central Columns not working, showing error
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-19 07:59:46 -05:00
Madhura Jayaratne
3d3c672545 rfe #1275 CodeMirror based JSON editor as an input transformation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-19 13:54:57 +05:30
Madhura Jayaratne
6ee59b7eec rfe CodeMirror based SQL editor as an input transformation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-19 13:20:32 +05:30
Marc Delisle
e7f9076af7 Merge commit 'a1d9749' 2015-02-18 08:03:32 -05:00
Marc Delisle
a1d97497b8 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-18 07:57:07 -05:00
Marc Delisle
8ab8ccd786 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-17 07:57:00 -05:00
Marc Delisle
563fef9fd8 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-16 08:05:51 -05:00
Madhura Jayaratne
9ccc5322dc Merge branch 'QA_4_3' 2015-02-16 09:58:22 +05:30
Madhura Jayaratne
40a82f6011 bug #4769 Previously set column aliases are destroyed if returned to the same table
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-16 09:57:35 +05:30
Madhura Jayaratne
7bc50e5f56 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-16 09:34:07 +05:30
Madhura Jayaratne
1d73964695 bug #4763 Database export with more than 512 tables fails
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-16 09:20:29 +05:30
Marc Delisle
1fe0d1ad44 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-15 06:14:57 -05:00
Marc Delisle
f263e0a05e ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-13 09:28:14 -05:00
Marc Delisle
71c7af80b8 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-12 13:14:19 -05:00
Marc Delisle
5e765233cd Bug Undefined index DisableIS
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-12 13:07:09 -05:00
Madhura Jayaratne
4a90211202 rfe #1549 Reset auto-increment when exporting structure
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-12 16:16:51 +05:30
Madhura Jayaratne
b14e08d0b6 ChangeLog entry for d40a48ec39
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-12 16:13:56 +05:30
Madhura Jayaratne
2d19714b46 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-11 12:54:25 +05:30