Marc Delisle
|
a02fe53391
|
Merge branch 'QA_3_5'
|
2012-02-18 07:18:35 -05:00 |
|
Marc Delisle
|
33635fbe19
|
Merge branch 'QA_3_4' into QA_3_5
|
2012-02-18 07:17:20 -05:00 |
|
Marc Delisle
|
67d9eca21d
|
Fix merge conflicts
|
2012-02-18 07:16:15 -05:00 |
|
Marc Delisle
|
9c8c9e88fc
|
[security] XSS in replication setup, see PMASA-2012-1
|
2012-02-18 07:12:50 -05:00 |
|
Madhura Jayaratne
|
6c9c571e1b
|
Merge branch 'QA_3_5'
|
2012-02-18 17:28:22 +05:30 |
|
Madhura Jayaratne
|
ff11bfbe64
|
Merge branch 'QA_3_4' into QA_3_5
Conflicts:
libraries/common.lib.php
|
2012-02-18 17:25:38 +05:30 |
|
Madhura Jayaratne
|
f9b2f08f21
|
bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
|
2012-02-18 17:17:01 +05:30 |
|
Madhura Jayaratne
|
374062112e
|
Merge branch 'QA_3_5'
|
2012-02-18 15:18:11 +05:30 |
|
Madhura Jayaratne
|
e14b73d23e
|
Merge branch 'QA_3_4' into QA_3_5
Conflicts:
libraries/common.lib.php
|
2012-02-18 14:51:23 +05:30 |
|
Madhura Jayaratne
|
0d1407f178
|
bug #3486970 [import] Exception on XML import
|
2012-02-18 14:43:05 +05:30 |
|
Marc Delisle
|
cbf1f6a3d4
|
Merge branch 'QA_3_5'
|
2012-02-14 11:31:52 -05:00 |
|
Marc Delisle
|
b096e67563
|
Merge branch 'QA_3_4' into QA_3_5
|
2012-02-14 11:31:38 -05:00 |
|
Marc Delisle
|
686fc0a25d
|
3.4.10 release
|
2012-02-14 11:31:13 -05:00 |
|
Marc Delisle
|
3471319da3
|
3.4.10 release
|
2012-02-14 11:30:31 -05:00 |
|
Marc Delisle
|
0352af889e
|
Switch to major version 4 which will require JavaScript-enabled browsers
|
2012-02-13 06:25:46 -05:00 |
|
Eric Krona
|
a3b790512e
|
Patch #3480999 Activate codemirror in the query window
|
2012-02-09 12:45:58 -05:00 |
|
Marc Delisle
|
52249c2db3
|
Merge branch 'QA_3_5'
|
2012-02-09 12:24:24 -05:00 |
|
Marc Delisle
|
16f991179f
|
FULLTEXT support for InnoDB, starting with MySQL 5.6.4
|
2012-02-09 12:24:14 -05:00 |
|
Michal ฤihaล
|
431cf327fd
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-02-08 11:58:56 +01:00 |
|
Michal ฤihaล
|
e33c665dc6
|
bug #3423717 [core] Improved detection of SSL connection
|
2012-02-08 11:58:05 +01:00 |
|
Marc Delisle
|
f9584261dc
|
Merge branch 'QA_3_5'
|
2012-02-01 11:43:39 -05:00 |
|
Marc Delisle
|
aa8eb9360b
|
bug #3482734 [interface] No warning on syntax error in search form
|
2012-02-01 11:40:46 -05:00 |
|
Eric Krona
|
e61a0a5dc6
|
patch #3481047 for rfe #3480477 Insert as new row enhancement
|
2012-01-30 04:13:03 -05:00 |
|
Marc Delisle
|
f0b647292b
|
Merge branch 'QA_3_5'
|
2012-01-30 03:56:26 -05:00 |
|
Marc Delisle
|
2f8fdcda24
|
Merge branch 'QA_3_4' into QA_3_5
|
2012-01-30 03:55:24 -05:00 |
|
Marc Delisle
|
496cdc62e6
|
Merge branch 'MAINT_3_4_10' into QA_3_4
|
2012-01-30 03:54:13 -05:00 |
|
Marc Delisle
|
12e2e8b7fc
|
ChangeLog for bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145)
|
2012-01-30 03:53:56 -05:00 |
|
Marc Delisle
|
693b0a59aa
|
Put back 3.6.0-dev version info
|
2012-01-28 04:50:14 -05:00 |
|
Marc Delisle
|
52f60156cb
|
Put back correct version in this branch (was lost during commit f196b4804d)
|
2012-01-28 04:06:37 -05:00 |
|
Marc Delisle
|
519024e05c
|
Starting 3.6.0
|
2012-01-25 05:19:15 -05:00 |
|
Marc Delisle
|
3a5203e33e
|
Maybe 3.4.11 ?
|
2012-01-24 12:28:57 -05:00 |
|
Marc Delisle
|
badc93d5d4
|
Maybe 3.4.11 ?
|
2012-01-24 12:28:06 -05:00 |
|
Yuichiro
|
786358531b
|
patch #3475424 [import] Fixed CSV escape for the import
|
2012-01-22 04:24:03 -05:00 |
|
Yuichiro
|
82aa0b7dc1
|
patch #3472899 [export] Fixed CSV escape for the export
|
2012-01-22 04:09:29 -05:00 |
|
Madhura Jayaratne
|
f5ffad3583
|
Merge branch 'QA_3_4'
Conflicts:
libraries/tbl_replace_fields.inc.php
|
2012-01-22 12:10:44 +05:30 |
|
Madhura Jayaratne
|
3c7b233d9c
|
bug #3477063 [edit] Missing set fields and values in generated INSERT query
|
2012-01-22 11:55:28 +05:30 |
|
Marc Delisle
|
ac95cf21a8
|
Merge branch 'QA_3_4'
|
2012-01-21 06:56:25 -05:00 |
|
Marc Delisle
|
346c70d6fd
|
bug #3469254 [edit] Setting data to NULL and drop-downs
|
2012-01-21 06:56:16 -05:00 |
|
Gareth Pursehouse
|
73edcc1511
|
patch #3303195 [interface] Checkbox to have SQL input remain
|
2012-01-07 07:00:56 -05:00 |
|
Marc Delisle
|
fc928ad7b6
|
bug #3093145 [display] Page through rows returned from a view
|
2012-01-05 07:57:12 -05:00 |
|
Marc Delisle
|
d5dede3530
|
Fix merge conflicts
|
2011-12-29 09:41:55 -05:00 |
|
Glenn
|
8697ec3d48
|
patch #3458944 copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'
|
2011-12-29 09:37:43 -05:00 |
|
Marc Delisle
|
554a55134d
|
Fix merge conflicts
|
2011-12-28 08:44:04 -05:00 |
|
Marc Delisle
|
f7a9d2a36a
|
bug #3463933 [display] SELECT DISTINCT displays wrong total records found
|
2011-12-28 08:40:31 -05:00 |
|
Madhura Jayaratne
|
25b78bef1b
|
Merge branch 'QA_3_4'
|
2011-12-24 21:33:35 +05:30 |
|
Madhura Jayaratne
|
cd294e5b97
|
bug #3049209 [import] Import from ODS ignores cell that is the same as cell before
|
2011-12-24 21:31:08 +05:30 |
|
Marc Delisle
|
34e1b1c3da
|
3.4.9
|
2011-12-21 15:04:59 -05:00 |
|
Marc Delisle
|
bc8735efa3
|
3.4.9
|
2011-12-21 15:04:40 -05:00 |
|
Marc Delisle
|
87ecb350c9
|
bug #3340842 [structure] Error dropping index of non-existing column
|
2011-12-20 08:33:20 -05:00 |
|
Madhura Jayaratne
|
d6f12a7044
|
but #3461750 [edit] Sort by key generates wrong sql with limit clause
|
2011-12-18 10:58:25 +05:30 |
|
