Commit Graph

6391 Commits

Author SHA1 Message Date
Michal Čihař
86f566ce7b Merge branch 'QA_3_4' 2010-11-28 18:12:10 +01:00
Michal Čihař
adaa0ab3a5 Merge branch 'MAINT_3_4_0' into QA_3_4
Conflicts:
	ChangeLog
2010-11-28 18:12:01 +01:00
Marc Delisle
1199f7a3db Merge branch 'QA_3_4' 2010-11-28 08:16:37 -05:00
Marc Delisle
ae764b973f fix merge conflicts 2010-11-28 08:15:53 -05:00
garas
a3ae93f776 patch #3112792 [navi] Left panel table grouping incorrect 2010-11-28 08:12:22 -05:00
Herman van Rink
fff3afc08e bug #3115519: Prevent long queries from being shown in confirmation popup 2010-11-26 20:55:58 +01:00
Marc Delisle
87fa9bd524 ChangeLog for XSS fix 2010-11-26 09:12:18 -05:00
Marc Delisle
968a8d2ad7 ChangeLog for XSS fix 2010-11-26 09:10:47 -05:00
Marc Delisle
3f12de1746 ChangeLog for XSS fix 2010-11-26 09:08:51 -05:00
Dieter Adriaenssens
468d08f975 Merge branch 'QA_3_4' 2010-11-24 16:59:12 +01:00
Dieter Adriaenssens
4e6a1bb0a9 Merge branch 'MAINT_3_4_0' into QA_3_4 2010-11-24 16:58:58 +01:00
Dieter Adriaenssens
d1a6f043e2 Merge branch 'QA_3_3' into MAINT_3_4_0 2010-11-24 16:58:06 +01:00
Craig Duncan
d6a7bd40fa patch #3117535, replication : Add quotes to database in initial statement 2010-11-24 16:56:32 +01:00
Marc Delisle
782beabb6a 3.4.1-dev 2010-11-22 13:26:56 -05:00
Marc Delisle
9c8514fb97 3.5.0-dev 2010-11-22 13:23:08 -05:00
Marc Delisle
3b74d9ba01 credits 2010-11-19 13:07:49 -05:00
Marc Delisle
b2d7a78012 rfe #3111455 [interface] Column highlighting and marking in table view 2010-11-18 17:11:04 -05:00
Dieter Adriaenssens
65fcab4122 Merge branch 'QA_3_3' 2010-11-14 21:08:28 +01:00
Dieter Adriaenssens
63aec5b328 bug #1762306, Copy database with view of a view 2010-11-14 21:03:13 +01:00
Dieter Adriaenssens
57c5abf579 Merge branch 'QA_3_3' 2010-11-14 18:28:10 +01:00
Dieter Adriaenssens
8277c92e25 bug #3077463, Events were not copied when copying/renaming database 2010-11-14 18:27:10 +01:00
Marc Delisle
5f4604c9bb bug #3103853 [js] Double quotes were not escaped in generated js; I think this only applies to 3.3.x 2010-11-06 07:51:06 -04:00
Marc Delisle
e93a16f5a3 fix merge conflicts 2010-11-04 06:35:35 -04:00
jirand
81a338db80 patch #3101490 Default function for TIMESTAMP 2010-11-04 06:27:31 -04:00
Marc Delisle
fff8f28a53 Merge branch 'QA_3_3' 2010-10-29 05:39:02 -04:00
Marc Delisle
540cd447a3 bug [doc] Fix references to MySQL doc 2010-10-29 05:38:12 -04:00
Marc Delisle
f734c4c1ac 3.3.8 release 2010-10-25 12:20:34 -04:00
Marc Delisle
60e468cd18 3.3.8 release 2010-10-25 12:19:24 -04:00
Michal Čihař
10bbd76fc1 bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. 2010-10-21 11:32:49 +02:00
Marc Delisle
61851eb80d 3.3.9-dev 2010-10-18 06:11:12 -04:00
Marc Delisle
266b8e3aaf 3.3.9-dev 2010-10-18 06:09:38 -04:00
Marc Delisle
7cbdcd6be1 fix merge conflicts 2010-10-09 06:37:30 -04:00
Marc Delisle
2d4b9e2aea support ARIA storage engine as well as its previous name MARIA 2010-10-09 06:35:06 -04:00
Dieter Adriaenssens
90c48f8696 Merge branch 'QA_3_3' 2010-10-07 20:51:08 +02:00
Dieter Adriaenssens
8c34269e52 bug #3062454, Display routines/events also when no tables are defined 2010-10-07 20:32:07 +02:00
Marc Delisle
d1bebc67f6 fix merge conflicts 2010-10-03 09:42:40 -04:00
Marc Delisle
1c49cd3d64 bug #3038193 [display] Error when editing row with GEOMETRY column 2010-10-03 09:34:08 -04:00
Marc Delisle
f503d5667e Merge branch 'QA_3_3' 2010-09-29 08:04:47 -04:00
Marc Delisle
22fa5adee3 bug #3056023 [import] USE query not working 2010-09-29 08:04:32 -04:00
Dieter Adriaenssens
1fe6e59d73 Merge branch 'QA_3_3' 2010-09-28 20:07:00 +02:00
Dieter Adriaenssens
c0d1c7a2ae export/copy procedures and routines before tables 2010-09-28 19:37:03 +02:00
Michal Čihař
728034d7ea bug #1669459 [interface] Do not automatically mark PDF schema rows to delete 2010-09-16 16:18:23 +02:00
Michal Čihař
8417db5866 rfe #2956556 [interface] Allow to wrap enum values. 2010-09-16 16:02:49 +02:00
Michal Čihař
1b187c909d rfe #1105678 [interface] Drop page-break-before as it is useless for smaller tables.
In real world you have quite a lot of tables with just few fields and
for these page-break-before is really a bad idea.
2010-09-16 15:35:36 +02:00
Michal Čihař
f47e0933c3 [core] Force generating of new session on login
This improves security because session ID and token are generated fresh
for each user.
2010-09-16 15:19:46 +02:00
Dieter Adriaenssens
ae04356ed2 Merge branch 'QA_3_3' 2010-09-11 16:34:16 +02:00
Dieter Adriaenssens
adaa35a87f Update library PHPExcel to version 1.7.4 2010-09-11 16:18:42 +02:00
Dieter Adriaenssens
77b6fb172d Merge branch 'QA_3_3'
Conflicts:

	ChangeLog
2010-09-10 17:34:52 +02:00
Dieter Adriaenssens
194e357a99 BIGINT field type added to table analysis on import 2010-09-10 17:28:12 +02:00
Marc Delisle
db08d6ad3a 3.3.7 release 2010-09-07 12:33:58 -04:00