19481 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	9b30024d86	Merge branch '3.6' into 4.0	2018-01-16 10:26:21 +00:00
Damian Mooyman	bb37bc5491	Added 3.6.4 changelog	2018-01-16 16:40:43 +13:00
Daniel Hensby	f3d00f1b4b	Merge branch '3.6' into 4.0	2018-01-15 16:51:20 +00:00
Damian Mooyman	39a8410460	Merge pull request #7754 from oetiker/patch-1 ... JSON.parse does not like empty strings	2018-01-15 10:56:15 +13:00
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
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
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	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	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
Andrew Aitken-Fincham	fb5476cb70	check for UPLOAD_ERR_NO_FILE on FileField::saveinto	2018-01-03 12:01:18 +00: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
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
Damian Mooyman	ce07e4781e	BUG Do database migrations before default records ... Fixes #7703	2017-12-18 16:37:21 +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
Robbie Averill	aa7ab0c494	Update test assertions to be more readable	2017-12-17 16:22:26 +13:00
Robbie Averill	ea8ed5067d	FIX Allow Requirements::block to handle module resource paths	2017-12-17 16:09:22 +13:00
Raissa North	369653b5df	FIX Ensure last GridField column when non sortable has its title displayed	2017-12-15 16:45:46 +13:00
Gorrie Coe	ef74911922	Added ModuleResourceLoader to javascriptTemplate	2017-12-15 11:20:20 +13:00
Daniel Hensby	1c72d6946d	Merge branch '3.6' into 4.0	2017-12-14 21:01:35 +00:00
Daniel Hensby	7b0500982e	Merge branch '3.5' into 3.6	2017-12-14 15:25:36 +00:00
Daniel Hensby	81150c5922	FIX Use PHP 5.3 array syntax	2017-12-14 15:24:53 +00:00
Daniel Hensby	7733e9caed	Merge pull request #7701 from open-sausages/pulls/4.0/better-summary-merging ... BUG Fix incorrect merge of associative / non-associative summary fields	2017-12-14 13:25:51 +00:00
Damian Mooyman	1c8576cee7	Linting cleanup	2017-12-14 14:18:41 +13:00
Damian Mooyman	ed6561d9f5	BUG Fix incorrect merge of associative / non-associative summary fields ... Fixes #7696	2017-12-14 14:17:19 +13:00
Damian Mooyman	a2fa9f0943	Merge pull request #7694 from creative-commoners/pulls/4.0/injection-session ... FIX Use Injector to retrieve the current session	2017-12-12 16:47:36 +13:00
Robbie Averill	eb6c1fc6de	FIX Allow the current controller as well as injectable HTTPRequest objects	2017-12-12 16:35:53 +13:00
Robbie Averill	097d0697c5	FIX Use Injector to retrieve the current session	2017-12-12 16:03:16 +13:00
Damian Mooyman	6be554a29e	Merge pull request #7691 from kinglozzer/warn-table-name ... FIX: Only show table_name warning on dev/build	2017-12-12 10:02:11 +13:00
Damian Mooyman	2391af5ba7	Fix literal linting	2017-12-12 09:22:18 +13:00
Loz Calver	0e1753f33d	FIX: Only show table_name warning on dev/build	2017-12-11 17:33:39 +00:00
Simon Erkelens	9aadd8db38	Add PR template ... Update as per discussion	2017-12-11 14:08:41 +13:00
Robbie Averill	7643c90410	Merge pull request #7688 from open-sausages/pulls/4.0/less-breaking-warnings ... BUG Don't warn on table name for classes without tables	2017-12-11 10:39:54 +13:00
Damian Mooyman	69decdf3a4	BUG Don't warn on table name for classes without tables ... Fixes #7686	2017-12-11 09:55:57 +13:00
Damian Mooyman	052f11a427	Remove merge artifact	2017-12-08 11:52:48 +13:00
Damian Mooyman	c22726bfd7	Merge remote-tracking branch 'origin/3.5' into 3	2017-12-07 14:09:02 +13:00
Damian Mooyman	e3c382a4de	Added 4.0.1 changelog	2017-12-07 13:46:52 +13:00
Damian Mooyman	bf74e8347a	Added 3.6.3 changelog	2017-12-07 13:35:49 +13:00