15223 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Loz Calver	28be51cab0	FIX: Config state leaking between unit tests	2015-06-11 16:37:26 +01:00
Daniel Hensby	3ee5b24898	Nest and unnest Config and Controller for each test and test suite	2015-06-11 16:37:25 +01:00
Daniel Hensby	6be0488731	FIX TreeDropdownField doesnt change label on unselect	2015-06-11 16:14:08 +01:00
Will Rossiter	38ca214e2b	Merge pull request #4266 from mediabeastnz/patch-2 ... Completed missing comment ending	2015-06-10 17:41:23 +12:00
Myles Beardsmore	67e1cee64a	Completed missing comment ending ... Completed missing comment ending	2015-06-10 16:56:31 +12:00
Nick	168955135b	Fix the order of params ... The parameters for the strpos and substr functions were wrong. strpos always failed so never triggered the substr. This would mean $fieldClass would be left with 'Varchar(255)' Fixing this had no speed or memory effect.	2015-06-10 13:49:52 +12:00
Damian Mooyman	c877882f7e	Merge pull request #4170 from kinglozzer/pulls/4137-leftandmain-tree ... Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135)	2015-06-10 09:18:05 +12:00
Daniel Hensby	c062670ba3	Removing unreachable test line	2015-06-09 16:01:33 +01:00
Loz Calver	c9d410d49e	Merge pull request #4262 from SpiritLevel/patch-1 ... Update 03_Environment_Management.md	2015-06-09 09:27:43 +01:00
Will Rossiter	29906f1599	Merge pull request #4199 from mthomsonnz/patch-2 ... DOCS: Add links to lessons 10-16 to the tutorials page	2015-06-09 17:19:41 +12:00
David Alexander	5a323f7fe3	Update 03_Environment_Management.md	2015-06-09 16:53:20 +12:00
Damian Mooyman	07c21e2880	BUG Fix deletion of orphaned versioned records when a parent _versions table has been deleted	2015-06-09 13:50:09 +12:00
Damian Mooyman	69e736a02c	Merge pull request #4260 from scott1702/spinner ... Tidy up loading gif	2015-06-09 13:45:13 +12:00
scott1702	f0bc073848	Tidy up loading gif	2015-06-09 13:41:21 +12:00
Damian Mooyman	b42ddd107c	Merge pull request #3499 from colymba/ie-multi-file-upload-fix ... FIX #3458 iframe transport multi file upload FIX #3343, FIX #3148	2015-06-09 13:22:10 +12:00
Damian Mooyman	54f4ef0e9f	Merge pull request #4249 from scott1702/tinymce-linkform-uploadfield ... Update #2908 for 3.2	2015-06-09 12:38:46 +12:00
Damian Mooyman	a8ace75341	API Support for multiple HTMLEditorConfig per page	2015-06-09 12:17:55 +12:00
Damian Mooyman	acf19b72e2	BUG Fix false values for many_many_ExtraFields not being saved ... Fixes #4067	2015-06-09 12:05:25 +12:00
Damian Mooyman	e9d4863828	API Formalise new additional arguments to DataObject::canCreate, DataExtension::augmentSQL, and DataObject::extendedCan	2015-06-09 11:31:34 +12:00
Damian Mooyman	786b1dd5d4	Merge remote-tracking branch 'origin/3' ... Conflicts: control/HTTPRequest.php filesystem/Upload.php model/ManyManyList.php	2015-06-09 11:10:14 +12:00
Damian Mooyman	f21e59585e	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-09 11:02:50 +12:00
Sam Minnée	2fa6f27073	Removed Mateusz from core committer list. ... Mateusz has decided to step down from the core committers group.	2015-06-08 22:28:29 +12:00
Stewart Wilson	9421374f91	check to ensure $values is not null or empty before exploding. Otherwise, return an empty array	2015-06-05 21:21:37 +10:00
Sam Minnée	836c8bf1c7	Merge pull request #4189 from tractorcow/pulls/3.2/archive-actions ... API Replace Page Delete with new Page Archive action	2015-06-04 19:03:36 +12:00
Damian Mooyman	358b7bfa05	Merge pull request #4251 from jonom/file-versions-prefix-master ... NEW Configurable file version prefix	2015-06-04 13:18:08 +12:00
Damian Mooyman	0189367be2	Merge pull request #4241 from jonom/file-versions-prefix-3 ... NEW: Configurable file version prefix	2015-06-04 13:17:49 +12:00
Jonathon Menz	223466a8b8	NEW Configurable file version prefix ... Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this. Filename | Old result | New result -----------|------------|-------------- IMG001.jpg | IMG2.jpg | IMG001-v2.jpg	2015-06-03 09:24:30 -07:00
Jonathon Menz	44b1ff1931	NEW: Configurable file version prefix ... Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this, with a default of '-v' proposed for SS4.0. Filename | Old result | New result (with '-v' prefix) -----------|------------|-------------- IMG001.jpg | IMG2.jpg | IMG001-v2.jpg	2015-06-03 08:55:38 -07:00
Damian Mooyman	a72bd16f42	API Deprecate delete in favour of archive ... Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology Add pop-up verification to destructive actions Fix bug in reporting publishing of error pages Restoring a page also restores parents	2015-06-03 14:24:27 +12:00
scott1702	a9d22f1fbf	NEW: Files can be uploaded directly in the 'Insert Link' form	2015-06-03 11:20:29 +12:00
Robert Reiz	747e87baeb	Adding dependency badge and reference badge	2015-06-03 08:57:07 +12:00
Daniel Hensby	d3b7abb0b5	Merge pull request #4242 from jonom/docs-database-defaults ... DOCS: Added default value examples	2015-06-02 18:01:06 +01:00
Damian Mooyman	51df4df9f1	Fix merge regressions / errors	2015-06-02 20:19:12 +12:00
Damian Mooyman	8331171f2c	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: .scrutinizer.yml admin/javascript/LeftAndMain.Panel.js core/startup/ParameterConfirmationToken.php dev/Debug.php dev/FixtureBlueprint.php docs/en/00_Getting_Started/05_Coding_Conventions.md docs/en/00_Getting_Started/index.md docs/en/02_Developer_Guides/01_Templates/01_Syntax.md filesystem/File.php filesystem/Folder.php forms/FieldList.php forms/LabelField.php forms/MoneyField.php forms/TextField.php forms/TreeDropdownField.php forms/Validator.php forms/gridfield/GridField.php forms/gridfield/GridFieldExportButton.php lang/de.yml lang/fi.yml model/DataObject.php model/SQLQuery.php parsers/ShortcodeParser.php security/ChangePasswordForm.php security/Security.php tests/control/DirectorTest.php tests/core/startup/ParameterConfirmationTokenTest.php tests/dev/FixtureBlueprintTest.php tests/forms/FieldListTest.php tests/forms/MoneyFieldTest.php tests/model/SQLQueryTest.php tests/security/SecurityTest.php	2015-06-02 19:13:38 +12:00
Sam Minnée	0f3e62f613	Merge pull request #4245 from tractorcow/pulls/3.1.14/fix-api ... FIX Incorrect env setting in 3.1.13	2015-06-02 15:16:48 +12:00
Damian Mooyman	0319f7855b	FIX Incorrect env setting in 3.1.13	2015-06-02 12:27:08 +12:00
Ingo Schommer	dac1b5818b	Merge pull request #4217 from tractorcow/pulls/3.1/fix-directortest ... BUG Fix DirectorTest failing when run with sake	2015-06-01 17:34:26 +12:00
Ingo Schommer	f3c722d508	Merge pull request #4195 from oddnoc/phpunit-version ... DOC: Correct composer invocation to install phpunit	2015-06-01 15:00:55 +12:00
Jonathon Menz	12e26407ef	DOCS: Added default value examples	2015-05-29 14:27:22 -07:00
Damian Mooyman	b92d47220b	Merge pull request #4239 from oddnoc/nginx-x-forwarded-host-docs ... Add defense against SS-2015-013 to nginx example	2015-05-29 12:53:14 +12:00
Fred Condo	9efc384582	Add defense against SS-2015-013 to nginx example	2015-05-28 17:00:33 -07:00
Damian Mooyman	71d766a8d8	Merge pull request #4108 from Turnerj/fix/many-many-extrafields-performance ... Fix/Performance: Combine multiple queries into one for ManyManyList::getExtraData	2015-05-29 10:26:56 +12:00
Damian Mooyman	25f2689833	Merge pull request #4202 from jonom/fix-treedropdown-folders ... FIX: TreeDropdownField Folder expansion	2015-05-29 10:14:46 +12:00
Damian Mooyman	e733efa195	Merge pull request #4206 from gregsmirnov/pulls/localised-moneyfield-fix ... BUG Fixed handling of numbers in certain locales	2015-05-29 09:21:43 +12:00
Loz Calver	8a74dc3e0f	Merge pull request #4237 from silverstripe/docs-fix-caption-field-name ... updated field name for caption text field.	2015-05-28 14:28:36 +01:00
Will Morgan	9324cc916c	Merge pull request #4224 from camfindlay/patch-25 ... DOCS Fix link to common subclasses of form fields	2015-05-28 13:41:02 +01:00
Will Morgan	e930bcf7b9	Merge pull request #4225 from camfindlay/patch-26 ... DOCS Fix issue with bullets and backticks thinking they are code blocks	2015-05-28 13:39:36 +01:00
Myles Beardsmore	06730bc1b3	updated field name for caption text field.	2015-05-28 13:34:59 +01:00
Damian Mooyman	50e33b8e5e	Merge remote-tracking branch 'origin/3.1.13' into 3.1	2015-05-28 19:08:12 +12:00
Damian Mooyman	04b803dfc6	Added 3.1.13 changelog	2015-05-28 18:59:11 +12:00