15660 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
assertchris	f6effb9347	Changed comments in forms\ToggleCompositeField.php	2016-04-20 16:02:40 +12:00
assertchris	8e7e783dd0	Changed style in forms\ToggleField.php	2016-04-20 15:00:38 +12:00
assertchris	29ee58abc3	Changed comments in forms\Validator.php	2016-04-20 14:27:50 +12:00
Daniel Hensby	f32c893546	[SS-2016-005] FIX Apply brute force protection to default admin	2016-04-19 23:20:29 +01:00
Damian Mooyman	43b00520fe	API Remove artifact datalist overrides from UnsavedRelationList	2016-04-20 08:55:32 +12:00
Daniel Hensby	f49c0b58d9	Merge pull request #5344 from sminnee/new-committers	2016-04-19 12:11:26 +01:00
Sam Minnee	82a89a94f4	Add 2 new committers, remove 1 who has left.	2016-04-19 23:05:59 +12:00
JorisDebonnet	72a014d933	Allow '0' in DropdownField (#5199) ... Display falsey values as option titles when they have been included.	2016-04-19 17:40:14 +12:00
Daniel Hensby	3c0f2e8e11	[SS-2015-029] FIX Add CSFR protection to tree reorganise	2016-04-19 00:01:04 +01:00
Michael Strong	1f820b0b1c	DOCS allowed_actions access control (#5333)	2016-04-18 17:49:30 +12:00
Damian Mooyman	936dcb691b	Merge pull request #5300 from patricknelson/issue-5299-injector-minor-doc ... FIX for #5299 Adding <code> blocks to Injector documentation.	2016-04-18 11:56:21 +12:00
Daniel Hensby	52226dc462	Merge pull request #5322 from tractorcow/pulls/5105 ... fix to support facebook autodiscover	2016-04-15 14:27:19 +01:00
Damian Mooyman	6f548a0ed0	Add unit tests for oembed autodiscover and thumbnail detection	2016-04-15 14:00:10 +12:00
Loz Calver	69858760e1	Merge pull request #5312 from dhensby/pulls/3.1/fix-5281 ... FIX Stop "success" message showing in CMS	2016-04-12 16:56:06 +01:00
Daniel Hensby	36283b86d5	FIX Stop "success" message showing in CMS ... fixes #5281	2016-04-12 16:14:31 +01:00
Marijn Kampf	ea3aa0063a	Addition of extend for newRowClasses (#4711) ... * Addition of extend for newRowClasses Allows for creation of extension of row classes in gridfield. * Update GridField.php Including suggestions by @tractorcow and @dhensby.	2016-04-12 15:48:02 +01:00
Damian Mooyman	e1f281fd8b	Merge pull request #5236 from dhensby/pulls/3.2/avoid-plain-text-friendlyerrors ... FIX Dont allow plain text friendly errors	2016-04-12 12:00:54 +12:00
Patrick Nelson	707aa14c6c	FIX for #5299 Adding <code> blocks to Injector documentation.	2016-04-11 10:56:46 -07:00
Daniel Hensby	e57d26bb8e	Merge pull request #5298 from bummzack/patch-email-tests-3.2 ... Fix Email test issue discovered in #5271.	2016-04-11 15:06:15 +01:00
Roman Schmid	9146450c49	Fix Email test issue discovered in #5271. ... Updated/added tests for changed- and forgot-password Emails. Updated fixture and tests to no longer use a real Email address.	2016-04-11 13:46:41 +02:00
Damian Mooyman	4ea0c92c3c	Merge pull request #5142 from chillu/pulls/3.3/include-cms-tests-in-travis ... Include CMS smoke tests in Travis builds	2016-04-11 10:15:43 +12:00
Daniel Hensby	c7de1f40e1	Merge pull request #3900 from chillu/pulls/behat-wait-cms-load ... Behat: Wait until CMS loading overlay is removed	2016-04-06 15:19:55 +01:00
Ingo Schommer	539fbe94d8	Include CMS smoke tests in Travis builds ... We've had a few failures where framework caused regressions in CMS, so these builds are helpful. They'll increase the overall build times on the "silverstripe" user because of Travis' build limitations. The parallel per-build run times shouldn't increase, since framework builds take longer than cms builds anyway: CMS Behat build took 13:53 on last 3.3 run, framework MySQL PDO build took 16:12.	2016-04-06 19:55:43 +12:00
Damian Mooyman	1d3b621460	Merge pull request #5274 from patricknelson/patch-2 ... Removal of FlushGeneratedImagesTask was not documented.	2016-04-06 11:05:40 +12:00
Patrick Nelson	49e6d701e5	Removal of FlushGeneratedImagesTask was not documented. ... This task appears to have been superseded by a new task called `RegenerateCachedImagesTask` but it was not documented, so `FlushGeneratedImagesTask` simply appeared to have vanished. This will update the documentation to reflect this change for both v3.2 and v3.3 (separate PR).	2016-04-05 15:09:46 -07:00
Damian Mooyman	4cd29e80b7	Merge pull request #5252 from SilbinaryWolf/breadcrumb-title-bug ... Fixed bug where breadcrumb title wouldn't appear if title was blank	2016-04-04 11:56:11 +12:00
Damian Mooyman	5a8db29c5b	Merge pull request #5259 from patricknelson/issue-5251-url-parsing ... FIX for #5251 to address minor URL decoding/parsing bug.	2016-04-04 11:35:06 +12:00
Patrick Nelson	9d9c572cf8	FIX for #5251 to address minor URL decoding/parsing bug.	2016-04-01 11:44:29 -07:00
Sean Harvey	3b7cfd0118	Merge pull request #5256 from tractorcow/pulls/3.1/fix-error-displayed ... BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false	2016-04-01 12:10:22 +13:00
Damian Mooyman	6ec2656201	BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false ... Fixes #5250	2016-04-01 11:04:06 +13:00
Damian Mooyman	bea85c22a5	Merge pull request #5233 from kinglozzer/5129-gridfield-shortcode-parsing ... FIX: GridField::FieldHolder() should not attempt to parse shortcodes (fixes #5129)	2016-03-31 10:52:44 +13:00
Loz Calver	83663b4b8c	Merge pull request #5249 from tractorcow/pulls/3.2/customise ... Standardise spelling of "customise"	2016-03-30 08:42:26 +01:00
Jake Bentvelzen	43c9f15647	Fixed bug where breadcrumb title wouldn't appear if title was blank	2016-03-30 16:46:18 +11:00
Damian Mooyman	f6dca68be1	Merge pull request #5234 from kinglozzer/gridfield-onbeforerender ... NEW: Add onBeforeRender() hook to GridField	2016-03-30 17:53:04 +13:00
Damian Mooyman	2cfd3ab997	Merge pull request #5231 from kinglozzer/sqlselect-docs ... Fix code docs for SQLSelect::count()	2016-03-30 14:12:11 +13:00
Damian Mooyman	b8e7f9a934	Standardise spelling of "customise" ... Fixes #3988	2016-03-30 13:17:28 +13:00
Damian Mooyman	fd64fe5572	Merge pull request #5248 from micmania1/patch-10 ... Filter PDO construct on failure	2016-03-30 13:05:32 +13:00
Michael Strong	159dce337d	Filter PDO construct on failure	2016-03-30 11:35:15 +13:00
Ingo Schommer	4714eeee6b	Merge pull request #5146 from chillu/pulls/3.2/disable-xdebug-travis ... Disable xdebug on Travis runs	2016-03-30 07:49:32 +13:00
Ingo Schommer	fb660225c2	Behat: Wait until CMS loading overlay is removed ... This makes tests more robust at the expense of an additional check with every step. The "ajax steps" logic works similarly, but does not respect the loading indicator. While this logic waits for a short time after ajax requests are finished, in some cases that isn't enough time for the browser to process the response and remove the loading indicator. Since the "ajax steps" logic applies to operations outside of the CMS as well, we can't add the loading indicator check there.	2016-03-29 17:24:47 +13:00
Ingo Schommer	85a361444c	Disable xdebug on Travis runs ... We're not using it for code coverage, and it's slowing down both composer and phpunit builds. Recommended by Travis: https://docs.travis-ci.com/user/speeding-up-the-build/#PHP-optimisations	2016-03-29 17:21:55 +13:00
Ingo Schommer	7ba4b5b6ef	Merge pull request #5241 from timkung/pulls/upload-validator-filesize-spelling ... BUG changing all cases of filesize spelling to file size	2016-03-29 16:15:27 +13:00
Tim Kung	7907d20da7	BUG changing all cases of filesize spelling to file size	2016-03-29 13:38:24 +13:00
Daniel Hensby	aeb4aa9565	FIX Dont allow plain text friendly errors	2016-03-28 01:20:18 +01:00
Loz Calver	1e7281a2ba	NEW: Add onBeforeRender() hook to GridField	2016-03-27 10:55:58 +01:00
Loz Calver	5ede516c77	FIX: GridField::FieldHolder() should not attempt to parse shortcodes (fixes #5129)	2016-03-27 10:51:46 +01:00
Loz Calver	4353d35c0a	Fix code docs for SQLSelect::count()	2016-03-27 10:23:11 +01:00
Daniel Hensby	2b261e226c	Merge pull request #5228 from christopherdarling/patch-4 ... DOCS: DataList::filter() broken examples	2016-03-26 21:20:34 +00:00
Daniel Hensby	3a932c963f	Merge pull request #5230 from kinglozzer/1684-textfield ... Deprecate TextField::InternallyLabelledField() (closes #1684)	2016-03-26 21:14:33 +00:00
Loz Calver	d9798af30c	Deprecate TextField::InternallyLabelledField() (closes #1684)	2016-03-26 11:07:33 +00:00