151 Commits

Author	SHA1	Message	Date
Robbie Averill	cb7f15a681	Merge branch '4.0' into 4.1	2019-02-19 08:36:41 +07:00
Benedikt Seidl	d530bc2fb6	fix user feedback when jquery could not be loaded	2019-01-24 20:51:48 +01:00
Robbie Averill	9aabe0a0f7	[SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls	2018-11-07 11:33:24 +13:00
Robbie Averill	5425195238	[SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls	2018-11-07 11:32:55 +13:00
Daniel Hensby	8703839eb1	FIX updateValidatePassword calls need to be masked from backtraces	2018-07-15 01:06:45 +01:00
Ingo Schommer	80c30c7b05	Merge pull request #8089 from creative-commoners/pulls/4.1/fix-maori-macron ... FIX Add macron to Māori language name	2018-06-08 14:07:05 +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	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	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	c308416afa	FIX Add macron to Māori language name	2018-05-23 11:22:30 +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	b07e13d2f8	BUG Fix incorrect installer base tag generation (#8018) ... Fixes #7926	2018-04-24 10:53:08 +12:00
Damian Mooyman	f83691e7f7	BUG Make invalid dev actions 404 not 500 error ... Fixes #8012	2018-04-18 11:37:31 +12:00
Robbie Averill	09b4f26151	Merge branch '4.0' into 4.1	2018-04-10 16:18:08 +12:00
Damian Mooyman	e11ba9a2d7	BUG Fix many_many through crashing ModelAdmin	2018-04-10 14:51:49 +12:00
Will Rossiter	20c6ddd354	Use ModuleResourceLoader for fixtures path ... This adds the ability to refer to a fixture file path by the ModuleResourceLoader path (e.g protected static $fixture_file = 'vendor/module:tests/fixtures.yml')	2018-03-28 10:36:56 +13:00
Daniel Hensby	7ec5fa2c8d	Merge branch '4.0' into 4.1	2018-02-09 15:19:15 +00:00
Damian Mooyman	0a486b8f57	BUG Fix issue with CLIDebugView failing on class name of existing class ... Fixes #7827	2018-02-09 09:52:32 +13:00
Damian Mooyman	dd3fbf2c73	BUG Fix installer checking wrong location for files	2018-02-08 10:50:27 +13: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	288aaf083c	BUG Fix issue with DebugView failing on class name of existing class ... Fixes #7827	2018-02-05 10:45:49 +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
Damian Mooyman	20348b5f42	BUG Fix upgrade-code doctor with public path	2018-01-16 15:38:12 +13: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
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	6b384f4b35	Merge branch '4.0' into 4	2017-12-07 13:52:00 +13:00
Damian Mooyman	b46b858847	Merge pull request #48 from silverstripe-security/pulls/4.0/fix-install-redacting ... [SS-2017-010] Prevent install.php from disclosing system passwords	2017-12-06 18:22:36 +13:00
Damian Mooyman	99e772b361	Merge pull request #51 from silverstripe-security/pulls/4.0/ss-2017-007 ... [ss-2017-007] Ensure xls formulae are safely sanitised on output (4.0)	2017-12-06 18:22:11 +13:00
Daniel Hensby	eb55c27124	Merge branch '4.0' into 4	2017-12-05 12:14:22 +00:00
Russell Maclean	3a4c6705c1	Fix db autodiscover comment on loading behavior.	2017-12-02 10:52:49 +10:30
Damian Mooyman	cfe1d4f481	[ss-2017-007] Ensure xls formulae are safely sanitised on output ... CSVParser now strips leading tabs on cells	2017-12-01 10:24:49 +13:00
Damian Mooyman	9666222637	BUG Fix _configure_database.php being ignored ... Fixes #7590	2017-11-29 12:01:24 +13:00
Damian Mooyman	7a79cd039a	[SS-2017-010] Prevent install.php from disclosing system passwords	2017-11-27 18:15:53 +13:00
Sil3ntStorm	0b879d690a	Reintroduce checking against original php.ini values. ... Seems to have been accidentally removed in 806ffb934e Fixes https://github.com/silverstripe/silverstripe-installer/issues/211	2017-11-26 01:36:40 +01:00
Daniel Hensby	0ceb4cfa18	Merge branch '3' into 4	2017-11-25 17:34:24 +00:00
Daniel Hensby	07a0f75426	Merge branch '3.6' into 4.0	2017-11-25 16:56:50 +00:00
Damian Mooyman	8b063026f0	ENHANCEMENT Ensure that non-writable assets files are notified during install ... Fixes #7580	2017-11-15 13:30:19 +13:00
Russell Michell	bf20d59cb8	FIX: Fixes SapphireTest masking userland coding errors.	2017-11-09 15:39:20 +13:00
Damian Mooyman	8497b9e1e6	BUG Disable directory index with missing slash	2017-11-08 12:12:10 +13:00
Damian Mooyman	1929ec46bb	BUG Prevent logOut() from clearing site stage during bootstrapping due to flushed session	2017-11-03 16:22:11 +13:00
Jay Devlin	af9caa4e51	Warn if theme.yml isn't writeable	2017-11-02 11:34:36 +01:00
Christopher Joe	f6b7cf8889	Feature disable current user from removing their admin permission	2017-10-30 12:34:06 +13:00
Damian Mooyman	97f9eddf90	Warn if env isn't writable	2017-10-25 15:07:35 +13:00
Damian Mooyman	2f82d08460	BUG Fix env loading in installer	2017-10-25 14:06:57 +13:00
Damian Mooyman	b9cb1e69e6	BUG Replace phpdotenv with thread-safe replacement	2017-10-20 18:43:11 +13:00
Damian Mooyman	11b2c74533	ENHANCEMENT Improve upgrade experience for beta3 -> beta4 upgrade	2017-10-10 15:27:41 +13:00