3762 Commits

Author	SHA1	Message	Date
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
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
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	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
Robbie Averill	063d765e94	Add test assertion for response instance ... This prevents middlewares that return null (like the example delegate in this test) from killing a testsuite	2018-05-29 17:26:29 +12:00
Luke Edwards	385e9e105c	Create GridField Actions Menu component (#8083) ... * WIP GridField action menu work, the gist of the idea is using a new gridfield component * Add delete action to actions menu * Actions are added automatically to action menu (allows for extension) * Add test and minor changes * Add docs and minor changes * Refactor ActionMenuItem into distinct types, general ActionMenu cleanup * Add icons and fix title * Pass columnName, so it can be used by components * Update test to open and find action menu buttons * Add section in changelog upgrade section for GridField_ActionMenu	2018-05-29 16:10:52 +12:00
Robbie Averill	c3e5ab2258	Merge pull request #65 from silverstripe-security/pulls/4.2/ss-2018-009 ... [SS-2018-009] Allow forced redirects to HTTPS for responses with basic authentication	2018-05-28 18:57:38 +12:00
Robbie Averill	ea16e28aa7	Merge branch '4.1' into 4	2018-05-28 18:33:56 +12:00
Robbie Averill	6d98a912c9	Merge branch 'heads/4.1.1' into 4.1	2018-05-28 18:26:20 +12:00
Robbie Averill	3a537bc745	Merge branch 'heads/4.0.4' into 4.0	2018-05-28 17:50:07 +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
Robbie Averill	722202fef4	Merge remote-tracking branch 'origin/4.0.4' into 4.1.1 ... # Conflicts: # src/Control/Director.php	2018-05-24 15:41:11 +12:00
Robbie Averill	e7e32d13a3	FIX Add namespace and encryptor to tests that expect blowfish to be available	2018-05-24 11:24:56 +12:00
Damian Mooyman	865ebb3398	ENHANCEMENT Improve upgrading experience. (#8025) ... * ENHANCEMENT Improve upgrading experience. Show errors and back button if errors encountered during install BUG Fix hard-coded 'mysite' folder Fixes #8024 * Patch behat tests to work with new buttons	2018-05-21 22:08:34 +12:00
Daniel Hensby	1a57c7c1d0	NEW Add getJoinTable to MMTL	2018-05-14 11:19:24 +01:00
Aaron Carlino	f847f186b1	[ss-2018-013] Remove password text from session data on failed submission	2018-05-14 17:14:38 +12:00
Robbie Averill	5887201dd5	Merge pull request #64 from silverstripe-security/pulls/4.0/ss-2018-010 ... [SS-2018-010] Fix regression of SS-2017-002	2018-05-14 17:12:45 +12:00
Robbie Averill	beec0c0d47	[SS-2018-010] Fix regression of SS-2017-002	2018-05-14 17:12:07 +12:00
Robbie Averill	1e6790bfb6	Merge pull request #62 from silverstripe-security/pulls/4.0/ss-2018-001 ... [ss-2018-001] Restrict non-admins from being assigned to admin groups	2018-05-14 17:11:03 +12:00
Damian Mooyman	e409d6f673	[ss-2018-001] Restrict non-admins from being assigned to admin groups	2018-05-14 17:10:22 +12:00
Robbie Averill	39b62e5fbb	Merge pull request #61 from silverstripe-security/pulls/4.0/ss-2018-008 ... [ss-2018-008] Validate against malformed urls	2018-05-14 17:07:09 +12:00
Damian Mooyman	9053014a7e	[ss-2018-008] Validate against malformed urls	2018-05-14 17:06:47 +12:00
Robbie Averill	6f50728b18	Merge pull request #59 from silverstripe-security/pulls/4.0/ss-2018-006 ... [ss-2018-006] Prevent code execution in template value resolution	2018-05-14 17:06:04 +12:00
Damian Mooyman	2e13ae746f	[ss-2018-006] Prevent code execution in template value resolution	2018-05-14 17:05:31 +12:00
Damian Mooyman	d935140a95	[ss-2018-005] Prevent unauthenticated isDev / isTest being allowed	2018-05-14 17:03:39 +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
Daniel Hensby	80bf0fc487	FIX bad syntax	2018-05-02 11:43:12 +01:00
Daniel Hensby	d5e2d3fa67	Merge branch '3.6' into 4.0	2018-05-01 21:47:17 +01:00
Robbie Averill	30e2d9c4df	[SS-2018-009] Allow forced redirects to HTTPS for responses with basic authentication	2018-04-24 14:44:29 +12:00
UndefinedOffset	fe4b90edc0	FIX: Duplicating many_many relationships looses the extra fields in 4.0	2018-04-18 11:49:20 -03: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
Damian Mooyman	9a12fac218	BUG Prevent password validator min score producing false negatives ... Replaces #7995	2018-04-18 10:35:31 +12:00
Damian Mooyman	87c7a53511	Merge remote-tracking branch 'origin/4.1' into 4 ... # Conflicts: # .travis.yml	2018-04-13 09:56:58 +12:00
Damian Mooyman	5a8c5601a9	Merge remote-tracking branch 'origin/4.0' into 4.1 ... # Conflicts: # .travis.yml # composer.json	2018-04-13 09:55:23 +12:00