Daniel Hensby
|
17690ff6bc
|
Merge branch '3.3' into 3.4
|
2016-11-28 13:30:29 +00:00 |
|
Daniel Hensby
|
fc83321b6e
|
Merge tag '3.4.2' into 3.4
Release 3.4.2
|
2016-11-28 13:29:33 +00:00 |
|
Daniel Hensby
|
6552dce70e
|
Merge branch '3.2' into 3.3
|
2016-11-28 13:26:31 +00:00 |
|
Daniel Hensby
|
b299a7921d
|
Merge tag '3.3.4' into 3.3
Release 3.3.4
|
2016-11-28 13:20:07 +00:00 |
|
Daniel Hensby
|
214c3d2582
|
Merge branch '3.1' into 3.2
|
2016-11-28 13:16:27 +00:00 |
|
Daniel Hensby
|
f7fd0d3f21
|
Merge tag '3.2.6' into 3.2
Release 3.2.6
|
2016-11-28 13:16:21 +00:00 |
|
Daniel Hensby
|
612a9164af
|
Merge tag '3.1.21' into 3.1
Release 3.1.21
|
2016-11-28 13:13:48 +00:00 |
|
Damian Mooyman
|
76ce9fb94f
|
Merge pull request #6335 from webbuilders-group/shortcode-location-fix
BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone
|
2016-11-25 10:56:25 +13:00 |
|
UndefinedOffset
|
a4760b8ee4
|
BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone
|
2016-11-24 17:28:15 -04:00 |
|
Daniel Hensby
|
464af18346
|
Merge pull request #6291 from dhensby/pulls/3.4/fix-uploadfield-max-size
FIX UploadField incorrectly setting max upload size
|
2016-11-24 12:40:04 +00:00 |
|
Daniel Hensby
|
dd9ade4294
|
FIX UploadField incorrectly setting max upload size
|
2016-11-24 11:54:44 +00:00 |
|
Daniel Hensby
|
406307c77b
|
Merge branch '3.3' into 3.4
|
2016-11-23 23:29:25 +00:00 |
|
Daniel Hensby
|
b7bb7a46da
|
Merge branch '3.2' into 3.3
|
2016-11-23 22:26:15 +00:00 |
|
Daniel Hensby
|
17eb351f81
|
Merge branch '3.1' into 3.2
|
2016-11-23 21:54:22 +00:00 |
|
Damian Mooyman
|
730512f036
|
Merge pull request #6328 from dhensby/pulls/3.1/test-i18n-fix
FIX Tests shouldnt set date or time format to null
|
2016-11-24 10:01:42 +13:00 |
|
Daniel Hensby
|
03b4e6ea32
|
FIX Tests shouldnt set date or time format to null
|
2016-11-23 12:36:53 +00:00 |
|
Dan Hensby
|
3067bcbd24
|
Added 3.4.2 changelog
|
2016-11-21 13:28:00 +00:00 |
|
Dan Hensby
|
50f456eed8
|
Update translations
|
2016-11-21 13:27:57 +00:00 |
|
Dan Hensby
|
375df539eb
|
Added 3.3.4 changelog
|
2016-11-21 12:37:09 +00:00 |
|
Dan Hensby
|
0d2710c31b
|
Update translations
|
2016-11-21 12:37:07 +00:00 |
|
Dan Hensby
|
4a82041061
|
Added 3.2.6 changelog
|
2016-11-18 15:14:42 +00:00 |
|
Dan Hensby
|
5890f6f7e2
|
Update translations
|
2016-11-18 15:14:40 +00:00 |
|
Dan Hensby
|
586e5281e0
|
Added 3.1.21 changelog
|
2016-11-18 12:17:03 +00:00 |
|
Daniel Hensby
|
69974d940a
|
Merge branch '3.3' into 3.4
|
2016-11-18 11:33:39 +00:00 |
|
Daniel Hensby
|
0ae4b57754
|
Merge branch '3.2' into 3.3
|
2016-11-18 11:32:36 +00:00 |
|
Daniel Hensby
|
5df077f24d
|
Merge branch '3.1' into 3.2
|
2016-11-18 11:29:19 +00:00 |
|
Damian Mooyman
|
c2287c14ff
|
Merge pull request #6216 from jonom/fix-version-sql
FIX Versioned sort by ID
|
2016-11-17 15:47:44 +13:00 |
|
Jonathon Menz
|
bec5adf09b
|
FIX Versioned sort by ID
Prevent SQL error from a Versioned DataObject with e.g. $default_sort = 'ID DESC'
|
2016-11-16 12:16:33 -08:00 |
|
Daniel Hensby
|
6b123fe1c9
|
Merge pull request #35 from silverstripe-security/patch/3.1/ss-2016-016
[SS-2016-016] FIX Properly escape backURL for template injection
|
2016-11-15 11:11:38 +00:00 |
|
Daniel Hensby
|
8336cb96b9
|
Merge pull request #29 from silverstripe-security/patch/3.1/SS-2016-010
[SS-2016-010] Prevent readonly fields loading submitted data
|
2016-11-15 11:08:15 +00:00 |
|
Damian Mooyman
|
8a0383e5a9
|
Merge pull request #6312 from dhensby/pulls/3.4/httpresponse-phpdoc
DOCS Update PHPDoc for SS_HTTPResponse
|
2016-11-15 13:36:13 +13:00 |
|
Damian Mooyman
|
cc9d17063a
|
Add tests for FormField submission behaviour
Fix ReadonlyField casting with empty values
Restore Value() behaviour for TextareaField
|
2016-11-15 11:55:48 +13:00 |
|
Daniel Hensby
|
6136cf8502
|
DOCS Update PHPDoc for SS_HTTPResponse
|
2016-11-14 19:02:56 +00:00 |
|
Daniel Hensby
|
4440b88730
|
[SS-2016-010] FIX Form@httpSubmission will no longer load submitted data to disabled or readonly fields
|
2016-11-14 10:38:16 +00:00 |
|
Daniel Hensby
|
61e4055bdb
|
[SS-2016-010] FIX Cast FormField values as Text to prevent readonly fields embeding rogue HTML
|
2016-11-14 10:38:15 +00:00 |
|
Daniel Hensby
|
17097a4d11
|
[SS-2016-016] FIX Properly escape backURL for template injection
|
2016-11-10 17:00:03 +00:00 |
|
Daniel Hensby
|
d15d80ea2c
|
Merge pull request #6307 from open-sausages/pulls/3.4/fix-aggregrate-error
BUG Fix regression in aggregate column lookup from #6199
|
2016-11-09 22:44:23 +00:00 |
|
Damian Mooyman
|
ebae480c66
|
BUG Fix regression in aggregate column lookup from #6199
|
2016-11-10 11:13:02 +13:00 |
|
Daniel Hensby
|
d2f6ff4873
|
Merge pull request #6304 from kinglozzer/member-currentuser
FIX: Correct return type for Member::currentUser()
|
2016-11-09 15:59:44 +00:00 |
|
Loz Calver
|
6bf36fbd30
|
FIX: Correct return type for Member::currentUser()
|
2016-11-09 14:20:44 +00:00 |
|
Martijn
|
1ec56a1202
|
Prevent undefined index notices
|
2016-11-07 15:09:35 +00:00 |
|
Daniel Hensby
|
cbd3aa0949
|
Merge pull request #6299 from silverstripe/revert-6237-modeladmin-showImportForm
Revert "Added $showSearchForm to ModelAdmin"
|
2016-11-07 13:42:55 +00:00 |
|
Daniel Hensby
|
27206c9240
|
Revert "Added $showSearchForm to ModelAdmin"
|
2016-11-07 13:42:47 +00:00 |
|
Daniel Hensby
|
250a4672fb
|
Merge pull request #6237 from Zauberfisch/modeladmin-showImportForm
Added $showSearchForm to ModelAdmin
|
2016-11-07 13:42:34 +00:00 |
|
Daniel Hensby
|
d5402d9dce
|
Merge pull request #6186 from ntd/pr5
BUG Use simplexml_load_string instead of simplexml_load_file
|
2016-11-07 12:16:32 +00:00 |
|
Damian Mooyman
|
df1354238a
|
Merge pull request #6276 from dhensby/pulls/3.4/versioned-phpdoc
DOCS Fix up some PHPDoc on Versioned
|
2016-11-07 08:56:46 +13:00 |
|
Daniel Hensby
|
5f99c4aa5f
|
Merge branch '3.3' into 3.4
|
2016-11-03 13:27:11 +00:00 |
|
Daniel Hensby
|
fad53ae33e
|
Merge branch '3.2' into 3.3
|
2016-11-03 13:26:30 +00:00 |
|
Daniel Hensby
|
6eebf07a8e
|
Merge branch '3.1' into 3.2
|
2016-11-03 13:20:11 +00:00 |
|
Daniel Hensby
|
c914dde7d1
|
Update travis build to use target branch as core release
|
2016-11-03 13:17:41 +00:00 |
|