20134 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	0eaebe54f9	DOCS Correct usage of publishRecursive() in docs	2018-01-24 14:41:06 +13:00
Robbie Averill	1a421dc947	Merge pull request #7792 from open-sausages/pulls/4.0/fix-limit-phpdoc ... DOC Fix phpdoc on ArrayList::limit	2018-01-24 11:20:37 +13:00
Chris Joe	c0085efae6	Merge pull request #7785 from open-sausages/pulls/4.0/better-upload-message ... BUG Better upload error message	2018-01-24 10:37:47 +13:00
Damian Mooyman	3fce5372b0	DOC Fix phpdoc on ArrayList::limit ... Fixes #7781	2018-01-24 10:18:15 +13:00
Robbie Averill	795c07c51d	Merge pull request #7787 from NightJar/patch-2 ... FIX: Allow absolute URLs be use as resources	2018-01-24 09:44:16 +13:00
Dylan Wagstaff	e1a4b89912	Code lint fix ... change `else if` to `elseif`	2018-01-24 09:04:22 +13:00
Damian Mooyman	83de0a0d36	Merge pull request #7783 from emteknetnz/emteknetnz-member-id-cast ... Ensure currentUserID() returns an int	2018-01-23 18:18:28 +13:00
Dylan Wagstaff	943821f984	Add a test for external resource support ... `SimpleResourceURLGenerator` has been altered to allow absolute URLs to be loaded directly, as so is now also tested to ensure the added functionality is true to design.	2018-01-23 17:43:01 +13:00
Dylan Wagstaff	9c3feb4ab4	FIX: Allow absolute URLs be use as resources ... At current certain interfaces exist that assume only local assets will be loaded (e.g. `SilverStripe\Forms\HTMLEditor\TinyMCEConfig::getConfig()`), where as someone may wish to load an off site resource via the use of an absolute URL (e.g. for fontawesome css provided via a CDN). Because asset path parsing is filtered through a `SilverStripe\Core\Manifest\ResourceURLGenerator`, one must either know in advance if they want an internal or external resource (loading different generators), or the API must allow for this (i.e. an inclusion function for each type of asset). So we can either double the API on the implementing class, or simply make an exception for an absolute URL as high as possible; inside the filter - for which the `vendor/module : path/to/file.asset` shorthand syntax was specifically designed not to conflict with.	2018-01-23 17:31:43 +13:00
Damian Mooyman	b44273d1d6	BUG Better upload error message ... Fixes https://github.com/silverstripe/silverstripe-asset-admin/issues/720	2018-01-23 16:08:42 +13:00
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
Damian Mooyman	04050b2753	API Director::host() now formally includes port in host ... API Add Director::hostName() and Director::port() Fixes #7685	2018-01-23 12:19:09 +13:00
Chris Joe	0e905b99a3	Merge pull request #7782 from open-sausages/pulls/4/fix-gridfield-versioned-tests ... BUG Prevent versioned from breaking gridfield tests	2018-01-23 10:43:45 +13:00
Damian Mooyman	c32b3dd5ba	BUG Prevent versioned from breaking gridfield tests	2018-01-23 09:29:42 +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
Chris Joe	6a63b61623	Merge pull request #7774 from open-sausages/pulls/4/gridfield-versioned-state-refactor ... API Deprecate GridFieldVersionedState	2018-01-22 16:55:42 +13:00
Damian Mooyman	f4092f7bcf	API Deprecate GridFieldVersionedState	2018-01-22 15:28:09 +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
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	bb63031b35	Merge pull request #7766 from dhensby/pulls/4/test-ns-fix ... FIX Misnamed test namespaces	2018-01-17 10:36:09 +00:00
Robbie Averill	40b2aeb7a3	Merge pull request #7760 from open-sausages/pulls/4/fix-editor-public-resolve ... BUG Fix themed editor.css url not being resolved properly	2018-01-17 12:08:32 +13: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	c959160375	FIX Misnamed test namespaces	2018-01-16 17:41:18 +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
Daniel Hensby	ebeaf3e40d	Merge branch '3' into 4	2018-01-16 11:47:39 +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
Daniel Hensby	7f6af0f0ed	Merge branch '4.0' into 4	2018-01-16 10:28:24 +00:00
Daniel Hensby	9b30024d86	Merge branch '3.6' into 4.0	2018-01-16 10:26:21 +00:00
Robbie Averill	cc90cb0125	FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase	2018-01-16 23:20:52 +13:00
Daniel Hensby	58a8463441	Merge pull request #7759 from open-sausages/pulls/4/fix-doctor-public ... BUG Fix `upgrade-code doctor` with public path	2018-01-16 08:40:18 +00:00
Damian Mooyman	e770146141	Merge remote-tracking branch 'origin/3.6' into 3	2018-01-16 17:06:59 +13:00
Damian Mooyman	bb37bc5491	Added 3.6.4 changelog	2018-01-16 16:40:43 +13:00
Damian Mooyman	ca2fe3b1f6	BUG Fix themed editor.css url not being resolved properly	2018-01-16 16:25:17 +13:00
Damian Mooyman	20348b5f42	BUG Fix upgrade-code doctor with public path	2018-01-16 15:38:12 +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