155 Commits

Author	SHA1	Message	Date
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
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
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
Robbie Averill	ea16e28aa7	Merge branch '4.1' into 4	2018-05-28 18:33:56 +12:00
Robbie Averill	3a537bc745	Merge branch 'heads/4.0.4' into 4.0	2018-05-28 17:50:07 +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
Damian Mooyman	d935140a95	[ss-2018-005] Prevent unauthenticated isDev / isTest being allowed	2018-05-14 17:03:39 +12:00
Damian Mooyman	7351caf487	API Allow non-DataExtension Extensions to decorate dataobject	2018-03-23 12:22:27 +13:00
Damian Mooyman	26402f3bb5	ENHANCEMENT Enable request handlers to be extended	2018-03-21 15:50:31 +13:00
Christopher Joe	1cdbab45c9	Added comment about array_merge() not working	2018-02-27 09:52:42 +13:00
Aaron Carlino	0863bac29a	Update getVariables to return a copy of globals rather than including the reference in an array merge	2018-02-27 09:52:36 +13:00
Christopher Joe	f650c92436	Added comment about array_merge() not working	2018-02-26 12:24:02 +13:00
Aaron Carlino	d91648dd6e	Update getVariables to return a copy of globals rather than including the reference in an array merge	2018-02-23 16:25:41 +13:00
Damian Mooyman	e809c0fd62	Merge remote-tracking branch 'origin/4.0' into 4.1	2018-02-15 09:27:51 +13:00
Damian Mooyman	0b7cf80331	BUG Fix incorrect convert slashes argument	2018-02-13 16:33:35 +13:00
zanderwar	9ce21338a3	ENHANCEMENT composer.json missing notice	2018-02-13 09:03:01 +10:00
Daniel Hensby	62057befdb	Merge branch '4.0' into 4	2018-02-06 10:08:17 +00:00
Daniel Hensby	28ca11dd7e	FIX Regex range identifier correctly escaped	2018-02-05 15:17:20 +00:00
Damian Mooyman	e359948eb3	Merge remote-tracking branch 'origin/4.0' into 4 ... # Conflicts: # src/Core/CoreKernel.php	2018-02-05 17:52:38 +13:00
Damian Mooyman	cb30e09130	Update reference from $databaseConfig to .env	2018-02-01 12:58:55 +13:00
Raissa North	cd6faac7a9	FIX Fix typo in error message	2018-01-30 15:48:42 +13:00
Damian Mooyman	a3c52f901a	Merge remote-tracking branch 'origin/4.0' into 4 ... # Conflicts: # src/Core/TempFolder.php # src/ORM/DataObject.php # src/View/ThemeResourceLoader.php # src/includes/constants.php # tests/php/Control/SimpleResourceURLGeneratorTest.php # tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php # tests/php/View/RequirementsTest.php	2018-01-22 14:57:05 +13:00
Daniel Hensby	db610aaf3b	Fixing string concat CS issues	2018-01-16 18:39:30 +00:00
Daniel Hensby	e4b936c7c7	Merge branch '4.0' into 4	2018-01-12 14:40:33 +00:00
Damian Mooyman	8d077203d4	API Implement support for public/ webroot folder (#7741) ... * API Implement support for public/ webroot folder * Bugfixes and refactor based on feedback	2018-01-12 16:25:02 +13:00
Daniel Hensby	7d66342496	FIX Allow extension instances to be overridden by injector	2018-01-12 00:38:15 +00:00
Damian Mooyman	529e341dbc	Merge pull request #7699 from open-sausages/pulls/4/html-in-security-msg ... ENHANCEMENT Allow html in security failure message	2017-12-14 14:30:09 +13:00
Damian Mooyman	1c8576cee7	Linting cleanup	2017-12-14 14:18:41 +13:00
Damian Mooyman	8b1b9f022b	Fix linting issues	2017-12-14 13:50:52 +13:00
Damian Mooyman	ee27329728	Minor linting / style updates	2017-12-11 16:46:59 +13:00
Aaron Carlino	86458941be	Refactor to MemberCacheFlusher	2017-12-11 16:46:59 +13:00
Aaron Carlino	eecb9f64d3	Add new InheritedPermissionFlusher extension, CacheFlusher service	2017-12-11 16:46:59 +13:00
Daniel Hensby	eb55c27124	Merge branch '4.0' into 4	2017-12-05 12:14:22 +00:00
Damian Mooyman	9666222637	BUG Fix _configure_database.php being ignored ... Fixes #7590	2017-11-29 12:01:24 +13:00
Daniel Hensby	6d5cbe0a0e	Merge branch '4.0' into 4	2017-11-25 17:19:31 +00:00
Andrew Aitken-Fincham	3620e57b5b	check for apc.enable_cli when running from CLI	2017-11-22 08:50:20 +00:00
Damian Mooyman	420041f2b6	Merge remote-tracking branch 'origin/4.0' into 4	2017-11-03 17:04:44 +13:00
Reece Alexander	9c836c0d3d	Added missing @deprecated tags ... This PR just adds a couple of @deprecated tags where they were missing, where IDE's like PHPStorm immediately alert the user that it's deprecated.	2017-11-02 20:28:01 +13:00
Damian Mooyman	0b3ed7ff15	Merge 4.0 -> 4	2017-11-02 16:52:05 +13:00
Damian Mooyman	df50c8da03	BUG Use parse_str in place of guzzle library ... Fixes #7540	2017-11-02 11:52:39 +13:00
Damian Mooyman	29af6dbafd	Merge remote-tracking branch 'origin/4.0' into 4	2017-10-25 16:59:19 +13:00
Damian Mooyman	ff992de231	Merge pull request #7493 from kinglozzer/require-me-some-isolation ... FIX: Use isolated scope when requiring files for module activation	2017-10-24 14:19:37 +13:00
Sam Minnee	4bec62ba51	Merge branch '4.0' into 4	2017-10-20 18:45:16 +13:00
Damian Mooyman	b9cb1e69e6	BUG Replace phpdotenv with thread-safe replacement	2017-10-20 18:43:11 +13:00
Loz Calver	bb9501797f	FIX: Use isolated scope when requiring files for module activation	2017-10-20 09:11:00 +13:00
Chris Joe	cafa3fc29a	BUG switch to trigger_error() when a resource is not found (#7468) ... * BUG switch to `trigger_error()` when a resource is not found rather than throw an exception * Add unit test for module url failing	2017-10-16 16:11:42 +13:00
Loz Calver	7afab3043d	Merge pull request #7461 from open-sausages/pulls/4.0/fix-icon-urls ... Fix references to resource paths / urls	2017-10-10 09:08:08 +01:00