4195 Commits

Author	SHA1	Message	Date
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
Damian Mooyman	687d0a6af1	Refactor everything out of HTTP and into separate middlewares	2018-06-13 17:56:47 +12:00
Damian Mooyman	6f32762268	Fix unit tests	2018-06-13 14:09:31 +12:00
Damian Mooyman	aa1ba0ef90	Fix inverted condition ... Remove unnecessary yml block Deprecate HTTP::set_cache_age()	2018-06-13 13:56:47 +12:00
Daniel Hensby	e76cf93514	Migrate tests	2018-06-13 11:33:46 +12:00
Damian Mooyman	6c985c4e5f	Merge remote-tracking branch 'origin/4.1' into 4	2018-06-13 11:25:20 +12:00
Daniel Hensby	ce58890baf	Merge branch '4.0' into 4.1	2018-06-11 09:27:42 +01:00
Robbie Averill	27e24a4728	Merge pull request #8142 from open-sausages/pulls/4.0/fix-injector-empty ... BUG Safely handle empty injector factory responses	2018-06-11 15:20:24 +12:00
Damian Mooyman	77a45c0dbc	Merge remote-tracking branch 'origin/4.1' into 4 ... # Conflicts: # src/Forms/HTMLEditor/HTMLEditorSanitiser.php # src/ORM/DataObjectSchema.php # src/ORM/Queries/SQLSelect.php # src/View/Parsers/ShortcodeParser.php	2018-06-11 10:19:04 +12:00
Damian Mooyman	546c6c3e22	Merge pull request #8125 from open-sausages/pulls/4/date-field-tweaks ... Remove legacy logic from DateField_Disabled	2018-06-11 09:23:33 +12:00
Daniel Hensby	e260319823	Merge branch '4.0' into 4.1	2018-06-08 23:05:24 +01:00
Daniel Hensby	cfe93b7f23	Merge branch '3.6' into 4.0	2018-06-08 14:41:04 +01:00
Daniel Hensby	1d6d601050	Use chaining syntax for setting up middleware	2018-06-08 14:00:59 +01:00
Maxime Rainville	582c69d32f	BUG Fix issue with Disabled DateField always display (not set).	2018-06-08 13:51:22 +01:00
Ingo Schommer	48304fd6f0	Merge pull request #8102 from creative-commoners/pulls/4.1/response-assertion ... Add test assertion for response instance	2018-06-08 14:08:25 +12:00
Damian Mooyman	e37e3e1746	BUG Fix test that relies on implicit ID order breaking postgres	2018-06-08 11:23:24 +12:00
Aaron Carlino	31ad3cdaab	BUGFIX: Allow buttons to opt out of display (#8113) ... * Allow buttons to opt out of display * Linting * Remove redundant function call * Add test for group delete action * Add menu group check and test for delete action * Fix linting	2018-06-06 21:14:29 +12:00
Damian Mooyman	c070e989c4	BUG Safely handle empty injector factory responses ... Fixes issue with ImageBackendFactory returning null and breaking injector	2018-06-06 16:45:16 +12:00
Damian Mooyman	0aa13da0d9	BUG Backport bugfix for belongs_many_many with many_many through. ... Partial backport of #7928 Fixes #8131	2018-06-06 09:43:04 +12:00
Daniel Hensby	801a51d0f7	Merge branch '3.5' into 3.6	2018-06-05 16:30:20 +01:00
Daniel Hensby	41e601a036	FIX Regression from #8009	2018-06-04 17:03:05 +01:00
Daniel Hensby	0bec6e07dc	Merge pull request #8111 from open-sausages/pulls/4/7.2-is-just-out-of-each ... BUGFIX: Refactor difflib to not use each()	2018-06-04 12:47:59 +01:00
Robbie Averill	8064ed8220	FIX Minor updates to unit tests to pass with HTML5 parser and various themes	2018-06-01 17:47:03 +12:00
Maxime Rainville	adb64c074a	✅ Making our diff unit test a bit more forgiving of spaces. ... #8053	2018-06-01 13:02:49 +12:00
Maxime Rainville	33b14e7ec2	✅ Test updated no-each logic ... Added a test that trigger the DiffEngine::diag. This test when run against the old `each` loop under PHP 7.2 triggers a deprecated warning. #8053	2018-06-01 11:16:03 +12:00
Damian Mooyman	2510935b53	Merge pull request #8065 from dhensby/pulls/4/mmtl-jointable ... NEW Add getJoinTable to MMTL	2018-06-01 10:33:46 +12:00
Robbie Averill	e0993043f8	Merge branch '4.1' into 4	2018-05-30 15:08:39 +12:00
Robbie Averill	c8b0bc0ad7	Merge branch '4.0' into 4.1 ... # Conflicts: # src/ORM/DataObject.php # tests/php/ORM/DataObjectDuplicationTest.php # tests/php/ORM/DataObjectDuplicationTest/Class1.php	2018-05-30 14:52:07 +12:00
Robbie Averill	7a8a24d175	Reset force SSL domain/patterns in setup to prevent global state pollution	2018-05-29 17:34:22 +12:00