2522 Commits

Author	SHA1	Message	Date
Ingo Schommer	34d08cf458	Merge branch 'master' into pulls/4.0/admin-module	2017-03-15 12:01:28 +13:00
Chris Joe	319ce1861e	Merge pull request #1758 from open-sausages/pulls/4.0/form-refactor ... Update SearchForm	2017-03-13 15:22:53 +13:00
Damian Mooyman	c7d9947976	Update SearchFormTest	2017-03-13 11:45:29 +13:00
Damian Mooyman	5092e0fc65	Add dependency on admin module	2017-03-10 16:33:32 +13:00
Damian Mooyman	f65a164818	Update SearchForm ... Fix RedirectorPageTest	2017-03-10 15:04:02 +13:00
Mike Cochrane	cb955f08f7	Fix non_virtual_fields being ignored ... Fix non_virtual_fields and initially_copied_fields being ignored in classes that extent VirtualPage	2017-03-09 17:45:37 +13:00
Damian Mooyman	8537d6ddb1	Simplify code to use dataFields()	2017-02-28 16:34:46 +13:00
Christopher Joe	2fafff084f	Fix history comparison fields will now show diff properly, rather than escaped html diff	2017-02-28 16:26:11 +13:00
Damian Mooyman	8766a4c91b	Cleanup unit test classes	2017-02-28 15:46:19 +13:00
Damian Mooyman	dfe25c27f0	BUG Fix allowedChildren() and link tracking	2017-02-28 15:46:07 +13:00
Damian Mooyman	4885736b0e	API Upgrade CMS to use new Config API	2017-02-28 11:30:22 +11:00
Ingo Schommer	6bae804744	API Use symfony/cache ... See https://github.com/silverstripe/silverstripe-framework/issues/6252	2017-02-26 14:57:52 +13:00
Damian Mooyman	945eba8efb	Update CMS for new i18n API	2017-02-09 16:11:11 +13:00
Daniel Hensby	8a76a2ea8f	Merge branch '3'	2017-02-08 10:27:35 +00:00
Daniel Hensby	68b49921f9	Merge branch '3.5' into 3	2017-02-07 17:41:18 +00:00
Daniel Hensby	27f8acf373	Merge pull request #1705 from dhensby/pulls/3/cleanup ... Remove redundant label	2017-02-03 11:20:37 +00:00
Daniel Hensby	aa2d0fb247	Merge branch '3.4' into 3.5	2017-01-31 20:09:00 +00:00
Damian Mooyman	ac6083c9a2	Merge pull request #1731 from trewq/asset-upload-directory-fix ... Fix error when uploading file and ASSETS_DIR is a subdirectory	2017-01-31 15:47:16 +13:00
Damian Mooyman	c7214b4dcd	Auto-convert to psr2	2017-01-31 13:59:35 +13:00
Brendan Halley	10d9f9080b	Fix to allow ASSETS_DIR to be a subdirectory	2017-01-31 09:46:14 +11:00
Damian Mooyman	fa2b87172c	Upgrade cms for new i18n backend	2017-01-26 11:39:20 +13:00
Damian Mooyman	732b1f0a57	BUG Fix reference to Install_deleteinstallfiles ... Fixes #1719	2017-01-25 18:03:18 +13:00
Colin Tucker	00c81d8672	Changed init() visibility to protected	2017-01-22 09:35:14 +11:00
Daniel Hensby	3f53da050c	Merge branch '3'	2017-01-17 12:33:26 +00:00
Daniel Hensby	6f05242e3b	Merge branch '3.5' into 3	2017-01-17 12:33:03 +00:00
Daniel Hensby	cb3008956f	Merge branch '3.4' into 3.5	2017-01-17 12:31:18 +00:00
Matthew Hailwood	df0ce184bf	Clean up code ... Just making it a little clearer what's going on by changing the variable names and removing some redundant code.	2017-01-16 13:20:44 +13:00
Daniel Hensby	05b5e545e0	Merge pull request #1703 from robbieaverill/feature/psr2-compliant-controller-names ... API Allow controller discovery without underscore (PSR-2 compliance)	2017-01-11 15:28:11 +00:00
Paul Clarke	333b4b3e79	add icon to page in menu	2017-01-11 17:36:30 +13:00
Will Rossiter	b3896a0ba6	Swap out icons on change.	2017-01-11 17:36:30 +13:00
Paul Clarke	9f4acfe3bf	Main save/publish actions to change icons when state changed	2017-01-11 17:36:30 +13:00
Will Rossiter	2d17f2f33b	Tidy up publish and save buttons.	2017-01-11 17:36:30 +13:00
Will Rossiter	5bb430ef43	Remove references to ss-ui	2017-01-11 17:36:30 +13:00
Robbie Averill	cf3a74ec57	FIX Remove deprecation tests, bump deprecation version to 5.0	2017-01-11 10:02:51 +13:00
Robbie Averill	0927e54780	API Allow controller discovery without underscore (PSR-2 compliance)	2017-01-11 10:02:51 +13:00
Daniel Hensby	5bba7264c6	FIX Dont attempt to iterate over null in SiteTree::allowedChildren	2017-01-10 16:20:22 +00:00
Colin Tucker	9959ef63f2	Fix double-escaped ampersands in CMSMain_TreeView and CMSMain::LinkPageAdd	2017-01-10 15:41:26 +11:00
Daniel Hensby	577a024109	Remove redundant label	2017-01-04 15:55:32 +00:00
Mike Cochrane	2108d8ef08	Use SiteTree instead of Page class in more places. Allows developers to extend SiteTree directly.	2017-01-03 20:38:45 +13:00
Daniel Hensby	7a296a541b	Merge branch '3'	2016-12-28 17:00:32 +00:00
Daniel Hensby	0b952e277e	Merge branch '3.5' into 3	2016-12-19 11:56:55 +00:00
Daniel Hensby	f833bb53c3	Merge branch '3.4' into 3.5	2016-12-16 16:46:28 +00:00
Damian Mooyman	bf58c5aef4	API Update to use new form submission handling (#1691)	2016-12-09 16:00:46 +13:00
Ingo Schommer	4fea439139	Merge branch 'master' into patch-3	2016-12-08 21:28:21 +13:00
Daniel Hensby	e90715d6c6	Merge branch '3.4' into 3.5	2016-12-07 13:43:34 +00:00
Damian Mooyman	224b2a4cba	BUG Fix localisation issues in CMS	2016-12-07 12:15:54 +13:00
hirenpatel	0dd81fcbe8	Removed dud Requirements breaking the RedirectorPage ... Also removed the dependency	2016-11-30 12:51:04 +00:00
Daniel Hensby	4a1cf3d4fb	Merge branch '3.5' into 3	2016-11-28 14:02:13 +00:00
Daniel Hensby	ca76b9488f	Merge branch '3.4' into 3.5	2016-11-28 14:01:01 +00:00
Daniel Hensby	21d9b7cdf1	Merge branch '3.3' into 3.4	2016-11-28 13:57:38 +00:00