3823 Commits

Author	SHA1	Message	Date
Daniel Hensby	d0598c02c5	Merge branch '4.2' into 4	2018-07-30 11:07:15 +01:00
Daniel Hensby	ec5640cbd9	Merge tag '4.2.0' into 4.2 ... Release 4.2.0	2018-07-30 11:04:57 +01:00
Ingo Schommer	d12c2fe631	Properly deprecate HTTP.cache_control	2018-07-23 19:09:11 +01:00
Ingo Schommer	d426ecbb89	Add $maxAge arg for caching API ... See https://github.com/silverstripe/silverstripe-framework/issues/8272	2018-07-23 19:09:10 +01:00
Daniel Hensby	cc0320b2a7	Merge branch '4.2' into 4	2018-07-23 17:42:43 +01:00
Daniel Hensby	ccbbcd45a2	FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important	2018-07-23 14:15:24 +01:00
Daniel Hensby	6e1c7c2781	FIX remove personal information from password reset confirmation screen	2018-07-23 14:13:52 +01:00
Maxime Rainville	c77042aa8b	Fix linting.	2018-07-23 14:12:44 +01:00
Maxime Rainville	7fda52b2cd	Add a MERGE_AS_SUBMITTED_VALUE flag for Form::loadDataFrom	2018-07-23 14:12:43 +01:00
Maxime Rainville	3fa2c056d7	FIX Don't reload form session data using FormField::setSubmittedValue (#8056)	2018-07-23 14:12:43 +01:00
Ingo Schommer	73026292bf	Test coverage for session data change	2018-07-23 14:09:43 +01:00
Daniel Hensby	e37b3b95f4	FIX updateValidatePassword calls need to be masked from backtraces	2018-07-23 14:08:26 +01:00
Daniel Hensby	540c9aba69	TEST Add tests for (im)mutablity of states	2018-07-23 14:07:11 +01:00
Damian Mooyman	8ea3bb36a0	Maybe fix it?	2018-07-23 14:01:21 +01:00
Daniel Hensby	b984959170	Merge branch '4.1' into 4.2	2018-07-23 13:30:49 +01:00
Ingo Schommer	c541283093	Test coverage for session data change	2018-07-20 15:13:26 +12:00
Daniel Hensby	921b98112e	Merge pull request #8262 from open-sausages/pulls/4/falsifying-tab-evidence ... MINOR removeField(s)FromTab no longer creates a tab if it doesn't exist	2018-07-16 17:26:41 +01:00
Loz Calver	b317bf163c	Merge pull request #8213 from creative-commoners/pulls/4.2/falsy-forms ... FIX FormField::Link works when no form is currently set	2018-07-16 13:53:58 +01:00
Robbie Averill	b93e94c0c3	FIX FormField::Link now throws a LogicException if no form is set yet	2018-07-16 13:02:58 +01:00
Daniel Hensby	1a634f5ba6	Merge pull request #8244 from altwohill/column-not-distinct ... Make column query not distinct	2018-07-16 13:01:32 +01:00
Al Twohill	3292a8b773	NEW Add columnUnique API SS_List classes.	2018-07-16 12:16:17 +01:00
Al Twohill	91068c23b5	FIX Make column query not distinct ... When selecting a column, it doesn't make sense to have it distinct. As an alternative, the API could be changed to give the end user the option (eg `->column($field, $distinct = false)`) However if we did that, we would need to make sure we do something similar with `SilverStripe\ORM\UnsavedRelationList` to ensure consistency.	2018-07-16 11:38:41 +01:00
Damian Mooyman	c6952b46c4	Merge pull request #8245 from dhensby/pulls/4.2/http-cache-fixes ... HTTPCacheControlMiddleware fixes	2018-07-16 13:13:12 +12:00
Luke Edwards	c8b338b0a3	Add findTab test	2018-07-16 11:59:08 +12:00
Daniel Hensby	8703839eb1	FIX updateValidatePassword calls need to be masked from backtraces	2018-07-15 01:06:45 +01:00
Daniel Hensby	ac5c3416a4	Merge branch '4.2' into 4	2018-07-13 17:06:51 +01:00
Daniel Hensby	bd2abc7a12	Merge branch '4.1' into 4.2	2018-07-13 16:44:23 +01:00
Daniel Hensby	ec9281ee02	Merge branch '4.0' into 4.1	2018-07-13 16:42:00 +01:00
Daniel Hensby	4acec33562	FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important	2018-07-12 00:55:39 +01:00
Daniel Hensby	28f2ceac6f	TEST Add tests for (im)mutablity of states	2018-07-10 16:58:08 +01:00
Harsh Chokshi	6af736a9e1	Change DBCurrency scaffolded form field to CurrencyField (fixes #8246) ... Add test ensuring DBCurrency scaffolds CurrencyField	2018-07-09 10:57:01 +12:00
Daniel Hensby	560fe9820a	FIX remove personal information from password reset confirmation screen	2018-07-05 14:19:15 +12:00
Robbie Averill	a39a221c4c	Merge branch '4.2' into 4	2018-06-25 13:45:03 +12:00
Damian Mooyman	6da72d686f	Maybe fix it?	2018-06-20 14:46:50 +12:00
Robbie Averill	7d90a14f37	NEW Shift Embeddable and EmbedResource from asset-admin, lazy load Embed to allow injected dependencies (#8194)	2018-06-20 11:40:28 +12:00
Robbie Averill	12cc2c68a5	Merge pull request #8023 from silverstripe-terraformers/feature/lookup_field_set_value_fix ... LookupField value handling corrected	2018-06-19 21:37:36 +12:00
Damian Mooyman	82634bf08c	Merge remote-tracking branch 'origin/4.2' into 4	2018-06-19 17:20:49 +12:00
Damian Mooyman	cfc3b851e7	Merge remote-tracking branch 'origin/4.1' into 4.2 ... # Conflicts: # lang/sv.yml	2018-06-19 17:20:25 +12:00
Maxime Rainville	3f80e2dc67	FIX Don't reload form session data using FormField::setSubmittedValue… (#8184)	2018-06-19 11:27:09 +12:00
Maxime Rainville	c3b556d246	Restore travis-upload-artifacts.php ... travis-upload-artifacts.php was moved to admin as part of #8112. However many modules expect it to be available under framework, so we have to bring it back.	2018-06-18 13:20:15 +12:00
Damian Mooyman	6c14cc86f0	Restore _manifest_exclude to tests/behat	2018-06-15 12:20:17 +12:00
Robbie Averill	5fa5abf295	Merge branch '4.1' into 4 ... # Conflicts: # src/Forms/DateField.php	2018-06-15 11:52:07 +12:00
Aaron Carlino	7eeb91880a	Shift behat test from framework to admin (#8172)	2018-06-15 11:28:40 +12:00
Damian Mooyman	b636587945	Respect semver and add tests	2018-06-15 11:04:12 +12:00
Damian Mooyman	c414388220	FIX DatetimeFieldTest	2018-06-14 18:14:12 +12:00
Ingo Schommer	1c5876acf0	Merge pull request #8179 from open-sausages/pulls/4/safer-test-clear ... BUG Make regression in #7839 safer	2018-06-14 17:28:13 +12:00
Damian Mooyman	d52c4dd602	BUG Make regression in #7839 safer	2018-06-14 16:45:09 +12:00
Damian Mooyman	c271a43904	Linting fixes	2018-06-14 12:19:55 +12:00
Damian Mooyman	163f1523e9	Add upgrade rule for HTTPCacheControl	2018-06-14 11:55:05 +12:00
Damian Mooyman	59ba208df0	Fix HTTPTest	2018-06-14 11:46:28 +12:00