19928 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tobias Oetiker	396005381f	JSON.parse does not like empty strings ... Add some protection for the case that envent.data is empty or null	2018-01-12 16:21:33 +01:00
Daniel Hensby	e4b936c7c7	Merge branch '4.0' into 4	2018-01-12 14:40:33 +00:00
Loz Calver	67ea95bc2a	Merge pull request #7750 from creative-commoners/pulls/4.1/remove-relation-setters ... NEW Add getter and setter for removeRelation in GridFieldDeleteAction	2018-01-12 09:58:23 +00:00
Damian Mooyman	a15c6887fc	Merge pull request #7746 from dhensby/pulls/4.0/allow-injector-extensions ... FIX Allow extension instances to be overridden by injector	2018-01-12 17:10:04 +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
Robbie Averill	9fddb5de99	NEW Add getter and setter for removeRelation in GridFieldDeleteAction ... This allows users to modify the property value in the component without having to remove it and add a new one when they want to change it.	2018-01-12 14:23:22 +13:00
Daniel Hensby	7d66342496	FIX Allow extension instances to be overridden by injector	2018-01-12 00:38:15 +00:00
Daniel Hensby	3312a68dc2	Merge pull request #7747 from open-sausages/pulls/4.0/fix-nginx-try ... DOCS Fix try_files index.php reference	2018-01-11 21:25:18 +00:00
Ingo Schommer	fb1be0619f	Removed version numbers from OS req docs ... Too icky to keep updated as version numbers change. It's really just a matter of what PHP version supports which OS, from a SilverStripe side we don't have any constraints there. Well, technically Windows 3.11 won't work because the filesystem will fall over, but otherwise LAMP/WAMP is pretty forgiving.	2018-01-12 10:24:13 +13:00
Damian Mooyman	2b868b09f5	DOCS Fix try_files index.php reference ... Fixes https://github.com/silverstripe/silverstripe-cms/issues/2067#issuecomment-356879060	2018-01-12 09:26:37 +13:00
Daniel Hensby	de6afd4405	TEST Cant reliably use Injector to replace Extensions	2018-01-11 14:08:29 +00:00
Daniel Hensby	4c51cf67e7	Merge pull request #7742 from nglasl/3.6 ... FIX, adding a missing return statement.	2018-01-09 23:43:18 +00:00
Nathan	2ef4a2d4ee	FIX, adding a missing return statement. ... This causes issues such as an `_function` to incorrectly return null.	2018-01-10 09:50:18 +11:00
Daniel Hensby	c80cc17cf6	Merge branch '3.6' into 3	2018-01-09 13:35:45 +00:00
Daniel Hensby	a049876418	Merge branch '3.5' into 3.6	2018-01-09 13:34:56 +00:00
Daniel Hensby	2de2a3e1a9	Merge pull request #7738 from open-sausages/pulls/4.0/fix-polymorphic-docs-dataobject ... DOCS Correct docs on polymorphic dataobject usage	2018-01-08 21:22:17 +00:00
Damian Mooyman	ea50b01d32	Merge pull request #7733 from lloy0076/patch-1 ... Fix Missing Part of Sentence	2018-01-08 15:05:27 +13:00
Damian Mooyman	d615da0e99	Merge pull request #7736 from andrewandante/BUGFIX/filefield_validation ... check for UPLOAD_ERR_NO_FILE on FileField::saveinto	2018-01-08 15:04:53 +13:00
Damian Mooyman	164edd7df3	DOCS Correct docs on polymorphic dataobject usage ... Fixes #7732	2018-01-08 14:10:11 +13:00
Damian Mooyman	677336fbef	Merge pull request #7726 from dhensby/pulls/3.5/functionaltest-html5-forms ... FIX Allow HTML 5 input tags in FunctionalTest form submissions	2018-01-08 13:32:44 +13:00
David Lloyd	b3ae11fe47	Fix Missing Part of Sentence ... It seems to be missing the words **PHP error log**. Add words (without bold type).	2018-01-08 09:48:22 +13:00
Andrew Aitken-Fincham	fb5476cb70	check for UPLOAD_ERR_NO_FILE on FileField::saveinto	2018-01-03 12:01:18 +00:00
Daniel Hensby	844a4c96e4	Merge pull request #7731 from elliot-sawyer/patch-1 ... Update CMS_Alternating_Button.md	2018-01-02 11:34:40 +00:00
elliot sawyer	b61debe3fb	Update CMS_Alternating_Button.md ... The URL that points to ReactJS development appears to be case-sensitive. This fixes the link	2017-12-31 21:15:56 +13:00
Daniel Hensby	02761d6ca8	Merge pull request #7712 from creative-commoners/pulls/4.0/fix-last-non-sortable-column ... FIX Ensure last GridField column when non sortable has its title displayed	2017-12-28 11:53:14 +00:00
Daniel Hensby	44930f211b	FIX Allow HTML 5 input tags in FunctionalTest form submissions	2017-12-22 11:15:56 +00:00
Chris Joe	a80312ff14	Merge pull request #7723 from open-sausages/pulls/4.0/fix-cgi-basic-auth ... BUG Fix basic auth in PHP-CGI	2017-12-21 16:40:11 +13:00
Damian Mooyman	f885101a1b	BUG Fix basic auth in PHP-CGI ... Fixes #7717	2017-12-21 14:58:19 +13:00
Daniel Hensby	2bc0064791	Merge pull request #7722 from open-sausages/pulls/4.1/to-test-or-not-to-test ... FIX Amend rules to ignore test files only	2017-12-20 14:11:58 +00:00
Chris Joe	6c885f118f	Merge pull request #7698 from open-sausages/pulls/4/not-auth-ful-middleware ... API Shift basic auth checking into middleware	2017-12-20 13:12:52 +13:00
Damian Mooyman	c4ff8443bb	API Shift basic auth checking into middleware ... Fixes #7554	2017-12-20 11:39:04 +13:00
Christopher Joe	fe319e85cc	FIX Amend rules to ignore test files only	2017-12-20 11:13:07 +13:00
Robbie Averill	f925022877	Merge pull request #7720 from silverstripe/pulls/4/docs-remove-tutorials ... Docs: Remove tutorials and fix forum references	2017-12-20 09:29:12 +13:00
Chris Joe	7e4ff1fb90	Merge pull request #7704 from open-sausages/pulls/4.0/before-class-migration ... BUG Do database migrations before default records	2017-12-19 12:02:09 +13:00
Ingo Schommer	bf8790a893	Docs: Remove forum and IRC references	2017-12-19 11:45:27 +13:00
Ingo Schommer	2fa1114bd3	Removed deprecated tutorials from docs	2017-12-19 11:45:27 +13:00
Daniel Hensby	58046a3a3f	Merge pull request #7719 from open-sausages/pulls/4/docs-debug-toolbar ... Docs about debug toolbar	2017-12-18 21:04:27 +00:00
Damian Mooyman	3bd4aae521	Merge remote-tracking branch 'origin/4.0' into 4	2017-12-19 10:02:41 +13:00
Ingo Schommer	7526f6e9de	Docs about debug toolbar	2017-12-19 09:25:10 +13:00
Chris Joe	17ff90c614	Merge pull request #7711 from open-sausages/pulls/4/css-conventions ... Update CSS conventions doc	2017-12-19 07:38:35 +13:00
Damian Mooyman	ce07e4781e	BUG Do database migrations before default records ... Fixes #7703	2017-12-18 16:37:21 +13:00
Saophalkun Ponlu	e0e50c79fd	Update CSS conventions doc	2017-12-18 16:01:52 +13:00
Chris Joe	4ad9ceca6b	Merge pull request #7702 from open-sausages/pulls/4/fix-message-casting-permissions ... BUG Fix message casting for html security messages	2017-12-18 15:43:35 +13:00
Damian Mooyman	d9d1e13735	Merge pull request #7707 from gorriecoe/Requirements-javascriptTemplate-ModuleResourceLoader ... FIX: Added ModuleResourceLoader to javascriptTemplate	2017-12-18 14:27:32 +13:00
Damian Mooyman	11b15f6c1a	Merge pull request #7713 from creative-commoners/pulls/4.0/block-via-reference ... FIX Allow Requirements::block to handle module resource paths	2017-12-18 14:22:37 +13:00
Damian Mooyman	623daed5ab	Merge pull request #6472 from silbinarywolf/feat-fieldlist-nestedfields ... feat(FieldList): Add nestedFields() function to return a flat array of all deeply nested fields in a FieldList.	2017-12-18 13:43:36 +13:00
Chris Joe	a892eae4f6	Merge pull request #7705 from open-sausages/pulls/4.0/director-mock-request ... BUG Fix incorrect BASE_DIR inferred in CLI	2017-12-18 09:22:11 +13:00
Reece Alexander	9c91e9820e	Returns chainability in setValue from parent	2017-12-17 17:21:42 +10:00
Robbie Averill	2ff0cf7bfb	Merge pull request #7697 from open-sausages/pulls/4/validate-nine-ten ... DOC: Add documentation for FormValidationManager	2017-12-17 17:13:22 +13:00
Robbie Averill	cd9695eda9	Merge pull request #7695 from open-sausages/pulls/4/versions-of-atlantis ... Update framework docs / phpdoc for versioning changes	2017-12-17 16:33:59 +13:00