3094 Commits

Author	SHA1	Message	Date
Aaron Carlino	5123361b5b	Merge branch '3.6' into 3.7	2019-02-20 11:45:46 +13:00
Maxime Rainville	ab5f09a9f3	FIX Updated unit test were targeting Float/Int which don't exist on PHP7 (#8810)	2019-02-20 11:44:45 +13:00
Aaron Carlino	c44f06cdf1	[SS-2018-021] Patch SQL Injection vulnerability when arrays are assigned to DataObject Fields	2019-02-12 21:58:27 +13:00
Aaron Carlino	6bf9542d66	[SS-2018-021] Patch SQL Injection vulnerability when arrays are assigned to DataObject Fields	2019-02-12 21:36:50 +13:00
Robbie Averill	4182d1b60c	Merge branch '3.6' into 3.7	2019-01-29 13:59:56 +02:00
Loz Calver	746c0679ad	FIX: Injector may instantiate prototypes as if they're singletons (fixes #8567)	2019-01-23 11:47:28 +00:00
Robbie Averill	214c6ddb8e	Merge branch '3.6' into 3.7	2018-11-15 14:15:08 +02:00
Loz Calver	86701b8cd0	FIX: Redirect loop with multiple URL tokens (fixes #8607)	2018-11-15 11:15:41 +00:00
Aaron Carlino	a7d511e739	Merge branch '3.6' into 3.7	2018-11-07 11:36:17 +13:00
Loz Calver	598edd9134	[SS-2018-019] Add confirmation token to dev/build	2018-11-07 11:35:31 +13:00
Loz Calver	8061e72bb4	Merge pull request #8435 from sminnee/faster-cleartable-ss3 ... FIX: Use DELETE FROM instead of TRUNCATE for clearTable	2018-10-11 12:32:33 +02:00
Sam Minnee	c5201dc01a	FIX: Allow DataObjectTest to be run by itself	2018-10-03 13:19:29 +13:00
Sam Minnee	d6117630bd	FIX: Stricter regex syntax for PHP7.3 support.	2018-10-02 18:48:12 +13:00
Daniel Hensby	5f48b3e5d2	FIX txt/json is not a valid content type	2018-08-13 12:16:42 +01:00
Sam Minnee	fa7f1954be	Fix test to match	2018-07-04 15:56:47 +12:00
Damian Mooyman	4035b3ff87	Reverse 5b6a39e71a	2018-06-19 11:06:13 +12:00
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