Daniel Hensby
2b4954035f
NEW Add better HTTP cache-control manipulation ( #8086 )
2018-06-08 11:56:31 +12:00
Damian Mooyman
4a0e5b6367
BUG Fix crash on fixed_fields in default_sort
2018-06-07 14:54:04 +12:00
Daniel Hensby
9eeebceaa1
Merge branch '3.6' into 3
2018-06-05 16:31:22 +01:00
Daniel Hensby
801a51d0f7
Merge branch '3.5' into 3.6
2018-06-05 16:30:20 +01:00
Damian Mooyman
85a712e1c9
Fix postgres test
2018-06-05 11:34:27 +12:00
Aaron Carlino
dac3c5ee16
Remove segmentation from core caches
2018-06-05 10:30:18 +12:00
Aaron Carlino
7ca95b66d8
Remove messages
2018-06-05 10:30:17 +12:00
Aaron Carlino
265ad70011
Refactor per chillu, reverse linting
2018-06-05 10:30:17 +12:00
Aaron Carlino
5583565480
Add disable container
2018-06-05 10:30:17 +12:00
Aaron Carlino
05384df10b
Add new CacheProxy
2018-06-05 10:30:17 +12:00
Daniel Hensby
41e601a036
FIX Regression from #8009
2018-06-04 17:03:05 +01:00
Aaron Carlino
e4c0f271b0
[ss-2018-013] Ensure passwords do not get added to session on submission failure
2018-05-28 18:53:02 +12:00
Robbie Averill
4a9e991edb
Merge branch '3.6' into 3
2018-05-28 17:44:48 +12:00
Robbie Averill
dae8fefb1e
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-05-28 17:43:55 +12:00
Robbie Averill
df4648a308
Merge branch 'heads/3.5.8' into 3.5
2018-05-28 17:42:31 +12:00
Damian Mooyman
5771388821
[ss-2018-001] Restrict non-admins from being assigned to admin groups
2018-05-09 15:12:40 +12:00
Damian Mooyman
47a9cdfd49
ENHANCEMENT Backport of querystring work to 3.x ( #8026 )
...
* WIP Backport of querystring work to 3.x
* Remove dataextension requirement
* Fix up bootstrapping
* more backporting
* Bug fix some tests
* Fix up some tests
* Fix support for custom stages
Don't set empty stage
* Better cache typehint
* Make sure useDraftSite(false) re-enables secure site
* Remove unnecessary guard around controller property
2018-05-08 10:04:44 +12:00
Daniel Hensby
c31251911c
Merge branch '3.6' into 3
2018-04-18 13:14:46 +01:00
Daniel Hensby
8359f3dc97
Merge branch '3.5' into 3.6
2018-04-18 13:14:07 +01:00
UndefinedOffset
af3a9f3ec8
FIX: Duplicating many_many relationships looses the extra fields ( fixes #7973 )
2018-04-18 12:16:02 +01:00
Loz Calver
ebd3fb6526
FIX: Don't auto-generate indexes for Text field types ( fixes #7900 )
2018-04-09 16:44:31 +01:00
Daniel Hensby
09726333b7
Merge branch '3.6' into 3
2018-02-13 14:30:59 +00:00
Daniel Hensby
9c50b03b86
Merge branch '3.5' into 3.6
2018-02-13 14:30:29 +00:00
Jonathon Menz
c767e472dc
FIX DataObject singleton creation
...
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878 )
2018-02-12 20:30:35 -08:00
Daniel Hensby
747a98a07f
Merge branch '3.6' into 3
2018-02-09 13:21:15 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6
2018-02-09 13:20:38 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton
2018-02-08 12:26:29 +00:00
Damian Mooyman
f4b13fb2c4
Merge remote-tracking branch 'origin/3.6' into 3
...
# Conflicts:
# model/DataQuery.php
2018-02-05 16:53:15 +13:00
Damian Mooyman
4da99efd5d
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-01-31 16:03:42 +13:00
Daniel Hensby
9103816333
NEW Add php 7.2 support
2018-01-30 16:50:32 +00:00
Damian Mooyman
72e2326731
Merge pull request #7798 from kinglozzer/member-groupset-delete
...
FIX: Fix Member_GroupSet::removeAll() (fixes #3948 )
2018-01-25 09:20:30 +13:00
Loz Calver
c2cd6b3832
FIX: Fix Member_GroupSet::removeAll() ( fixes #3948 )
2018-01-24 17:17:20 +00:00
Daniel Hensby
7897b3bb25
Merge branch '3.6' into 3
2017-12-14 15:31:51 +00:00
Daniel Hensby
7b0500982e
Merge branch '3.5' into 3.6
2017-12-14 15:25:36 +00:00
Daniel Hensby
81150c5922
FIX Use PHP 5.3 array syntax
2017-12-14 15:24:53 +00:00
Damian Mooyman
50aa1f22a6
Merge branch '3.6' into 3
2017-12-07 13:20:58 +13:00
Daniel Hensby
89166a2ff2
Try using parseSortColumn from ArrayList
2017-12-06 13:38:58 +00:00
Daniel Hensby
2e43780a8a
NEW Add sort columns to DB index automatically
2017-12-06 13:38:25 +00:00
Damian Mooyman
d6a93f5215
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
...
# Conflicts:
# security/Member.php
2017-12-06 17:26:45 +13:00
Damian Mooyman
91cf85087b
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:21:09 +13:00
Damian Mooyman
dd4c5417e7
Merge pull request #49 from silverstripe-security/pulls/3.5/ss-2017-007
...
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.5)
2017-12-06 16:25:58 +13:00
Damian Mooyman
44de03da01
Merge pull request #53 from silverstripe-security/pulls/3.5/ss-2017-006
...
[ss-2017-006] Fix user agent invalidation on session startup (3.5 branch)
2017-12-06 16:25:39 +13:00
Damian Mooyman
3e2bcaa0b4
Merge pull request #54 from silverstripe-security/pulls/3.5/ss-2017-009
...
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt (3.5 branch)
2017-12-06 16:25:19 +13:00
Daniel Hensby
2aa1d8f2c4
remove create_function usage
2017-12-05 14:20:13 +00:00
Damian Mooyman
25e276cf37
[ss-2017-006] Fix user agent invalidation on session startup
2017-12-01 10:55:00 +13:00
Damian Mooyman
22ccf3e2f9
[ss-2017-007] Ensure xls formulae are safely sanitised on output
...
CSVParser now strips leading tabs on cells
2017-12-01 10:19:48 +13:00
Damian Mooyman
6ba00e829a
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt
2017-11-30 15:53:50 +13:00
Damian Mooyman
bac5f4c8aa
Merge branch '3.5' into pulls/3.5/update-pwd-encryption-on-change
2017-11-27 14:42:32 +13:00
Daniel Hensby
fd201bc71b
Merge branch '3.6' into 3
2017-11-25 16:18:46 +00:00
Daniel Hensby
badeb0cc8c
Merge branch '3.5' into 3.6
2017-11-25 16:17:36 +00:00
