19760 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Steve Boyd	f214cd52e0	Ensure currentUserID() returns an int ... Cast $id returned from Session as an int to ensure it's never returned as a string	2018-01-23 13:37:06 +13:00
Loz Calver	7603c6d798	Merge pull request #7779 from open-sausages/pulls/4.0/fix-login-casting ... BUG Fix double casting in login authenticator name	2018-01-22 09:10:35 +00:00
Damian Mooyman	60fa7558d3	BUG Fix double casting in login authenticator name ... Fixes #7769	2018-01-22 14:06:24 +13:00
Loz Calver	4a8f9a8da8	Merge pull request #7773 from open-sausages/pulls/4.0/safer-gridfield-version ... BUG Make GridFieldConfig less susceptible to error when versioned isn't installed	2018-01-18 09:23:06 +00:00
Damian Mooyman	16ad7e8fea	BUG Make GridFieldConfig less susceptible to error when versioned isn't installed	2018-01-18 16:43:51 +13:00
Damian Mooyman	24e6794352	Merge pull request #7771 from DrMartinGonzo/patch-1 ... Added style_formats example + links to docs	2018-01-18 10:50:43 +13:00
Damian Mooyman	6b69907d1e	Merge pull request #7770 from dhensby/pulls/4.0/add-public-dir-constants ... Add `PUBLIC_*` constants to 4.0.x for easier compatibility	2018-01-18 09:02:36 +13:00
Martin Portevin	0ca152c156	Added style_formats example	2018-01-17 18:27:28 +01:00
Daniel Hensby	3eaa83ed82	Add PUBLIC_* constants to constants.php for easier backwards compatible support of 4.0 and 4.1	2018-01-17 15:16:15 +00:00
Daniel Hensby	6aaee429db	Remove inaccurate comment from constants.php	2018-01-17 15:15:38 +00:00
Daniel Hensby	7a0d432ece	Merge pull request #7744 from dhensby/pulls/4.0/force-spaces-around-string-concat ... CS Force spaces around string concat operators	2018-01-17 11:00:15 +00:00
Daniel Hensby	db610aaf3b	Fixing string concat CS issues	2018-01-16 18:39:30 +00:00
Daniel Hensby	ff05a7265e	CS Force spaces around string concat operators	2018-01-16 18:39:24 +00:00
Daniel Hensby	5203ddff42	Merge pull request #7486 from wernerkrauss/improve-test-dataproviders ... Improve test dataproviders	2018-01-16 15:57:50 +00:00
Daniel Hensby	42511d8061	Merge pull request #7714 from @zanderwar	2018-01-16 15:43:18 +00:00
Werner M. Krauß	422857f381	SapphireTestTest: use named data providers and more error messages ... * use keys for naming each data set * adding error messages * clean up a bit	2018-01-16 15:25:40 +00:00
Loz Calver	daac577e62	Merge pull request #7763 from creative-commoners/pulls/4.0/fix-remove-header ... FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase	2018-01-16 11:04:03 +00:00
Robbie Averill	a8c156ae98	Merge pull request #7756 from dhensby/pulls/4.0/fix-bad-request-form-handlers ... Forms with FormHandlers don't have access to current request object	2018-01-16 23:32:00 +13:00
Robbie Averill	4618998479	Merge pull request #7758 from open-sausages/pulls/4.0/prevent-unlogout-basicauth ... BUG Prevent basic-auth from disallowing logout	2018-01-16 23:30:40 +13:00
Robbie Averill	cc90cb0125	FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase	2018-01-16 23:20:52 +13:00
Damian Mooyman	bb37bc5491	Added 3.6.4 changelog	2018-01-16 16:40:43 +13:00
Damian Mooyman	f86b855c90	BUG Prevent basic-auth from disallowing logout ... Fixes #7555	2018-01-16 15:24:20 +13:00
Robbie Averill	fc0e0442c8	Merge pull request #7757 from open-sausages/pulls/4.0/update-editorcss-docs ... DOCS Update editor.css usage docs	2018-01-16 14:34:10 +13:00
Damian Mooyman	971a1f0703	DOCS Update editor.css usage docs	2018-01-16 12:36:00 +13:00
Daniel Hensby	f3d00f1b4b	Merge branch '3.6' into 4.0	2018-01-15 16:51:20 +00:00
Daniel Hensby	dc96862cac	FIX Forms run through FormHandler rather than Controllers now have access to current Request	2018-01-15 13:08:43 +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