4499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	f55b22bd75	Merge branch '3.1' into 3.2 ... Conflicts: CONTRIBUTING.md code/reports/BrokenLinksReport.php code/reports/SideReport.php tests/model/RedirectorPageTest.php tests/reports/ReportTest.php	2015-07-20 11:09:29 +01:00
Damian Mooyman	8bb09086fe	Merge pull request #1246 from chillu/pulls/fix-behat-image-hotlink ... Behat tests hotlinking to non-existant image	2015-07-20 19:39:12 +12:00
Ingo Schommer	ce85764292	Behat tests hotlinking to non-existant image ... Caused by silverstripe.com redesign. Ideally we'd have a permanent asset hosted there which is clearly marked as a test dependency. Or create a placeholder for images linked served localhost within the Behat tests, in which case we wouldn't require a network connection to execute Behat.	2015-07-18 15:38:44 +12:00
Ingo Schommer	d5043ed5c8	Merge pull request #1245 from torleif/patch-2 ... Update CONTRIBUTING.md	2015-07-15 09:23:17 +12:00
torleif	4c050b727b	Update CONTRIBUTING.md ... [Fix] dead links for 3.1	2015-07-15 09:17:29 +12:00
Damian Mooyman	2771f2708b	Merge pull request #1239 from oddnoc/broken-links-report-broken-link-31 ... Correct doubly-escaped " marks	2015-07-14 15:29:57 +12:00
Daniel Hensby	2371830790	Merge pull request #1243 from torleif/patch-1 ... [fix] update dead links	2015-07-13 14:28:04 +01:00
torleif	1975511c63	[fix] update dead links	2015-07-13 12:39:45 +12:00
Fred Condo	f9cceaada0	Correct doubly-escaped " marks ... The links in the Broken Links Report had extraneous " marks that made them unusable. This fixes the links.	2015-07-01 17:42:26 -07:00
Ingo Schommer	cb0fa4263e	Merge pull request #1236 from tractorcow/pulls/3.2/fix-behat ... BUG fix behat tests	2015-07-01 14:38:31 +12:00
Damian Mooyman	3b90fef04f	BUG fix behat tests ... Fixes #1223	2015-07-01 13:24:44 +12:00
Daniel Hensby	2f624299f2	Merge pull request #1228 from JayDevlin/3.2-CMSSettingsController ... Increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain	2015-06-28 08:03:12 +01:00
Daniel Hensby	284a0f0e13	Merge pull request #1231 from kinglozzer/pulls/redirectorpage-finished-response ... FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished (fixes #1230)	2015-06-26 16:46:52 +01:00
Loz Calver	d78d325073	FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished (fixes #1230)	2015-06-26 10:47:39 +01:00
Daniel Hensby	524b36b75c	Merge pull request #1213 from nglasl/3.1 ... FIX Enforced the published/draft selection for SS reports, which was bein…	2015-06-24 08:08:37 +01:00
Damian Mooyman	3ac29817ba	Merge pull request #1206 from ss23/permissions_fix ... Fix duplicate not having the correct permission check	2015-06-23 17:32:35 +12:00
Stephen Shkardoon	b71a521c21	Fix incorrect permission check on duplicate() ... Will now properly fall back to the canCreate() on the parent	2015-06-23 16:42:08 +12:00
Devlin	bc4dc5cf79	increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain	2015-06-22 14:15:49 +02:00
Nathan Glasl	0de71d45db	Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring.	2015-06-22 16:05:13 +10:00
Daniel Hensby	c678855c46	MINOR Bump PHP version for 3.2	2015-06-20 11:34:18 +01:00
Damian Mooyman	12bcf382ad	Update translations	2015-06-19 18:25:53 +12:00
Hamish Friedlander	124de94e67	Merge pull request #1222 from tractorcow/pulls/3.2/deprecations ... Set deprecation level for all changes in 3.x to 4.0	2015-06-19 15:59:25 +12:00
Damian Mooyman	04a513b0a8	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 12:00:42 +12:00
Damian Mooyman	d5c7bf66a2	Fix test regressions	2015-06-19 10:47:19 +12:00
Damian Mooyman	8de0106fea	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-06-19 10:35:00 +12:00
Daniel Hensby	0b92a61e51	Updating docs link in default install ... Fixing the default Content for Homepage to link to docs.silverstripe.org (there's an "s" at the end of "docs")	2015-06-18 16:47:10 +01:00
Damian Mooyman	4cad75d9af	Remove -dev dependencies from 3.2 branch	2015-06-18 11:39:52 +12:00
Daniel Hensby	5e9bce0c06	Merge pull request #1218 from scott1702/quick-fixes ... Increase click-size of multi-selection button	2015-06-17 16:20:52 +01:00
Daniel Hensby	e9fde144eb	Merge pull request #1201 from scott1702/update-content ... Update default home content	2015-06-17 15:40:17 +01:00
scott1702	bf25dd9492	Increase click-size of multi-selection button	2015-06-17 22:12:00 +12:00
Damian Mooyman	0a30972e6b	Merge pull request #1215 from tractorcow/pulls/3.2/fix-public-validate ... API Revert DataObject::validate to 3.1 method signature (protected)	2015-06-17 15:50:26 +12:00
scott1702	60c68098eb	Update default home content	2015-06-17 13:04:29 +12:00
Damian Mooyman	e6fb217fb2	Merge pull request #1217 from scott1702/drag-drop ... Add drag/drop icons to smaller site tree	2015-06-17 12:33:48 +12:00
scott1702	2ad395ed37	Add drag/drop icons to smaller site tree	2015-06-17 10:24:27 +12:00
Damian Mooyman	cc2f3ae603	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-17 10:14:01 +12:00
Damian Mooyman	f3e1472493	API Revert DataObject::validate to 3.1 method signature (protected)	2015-06-16 11:44:19 +12:00
Damian Mooyman	9fd0c5b0d7	Merge pull request #1214 from scott1702/clear-filter ... Remove 'Filtered Tree' notification when clearing the filter	2015-06-16 11:02:50 +12:00
Daniel Hensby	e570d4a726	Updating travis provisioner ... Travis will now be more resilient to `composer self-update` failures	2015-06-15 10:03:40 +01:00
scott1702	ffb6c38e3d	Remove 'Filtered Tree' notification when clearing the filter	2015-06-15 16:54:41 +12:00
Daniel Hensby	177ef7d99a	Merge branch 'chillu-pulls/localized-urlsegment-creation' into 3	2015-06-13 15:26:20 +01:00
Daniel Hensby	715cd9ab4e	Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation ... Conflicts: tests/model/SiteTreeTest.php	2015-06-13 15:23:22 +01:00
Stan Hutcheon	e2d85b2f88	VirtualPage call init on target controller	2015-06-13 12:38:59 +12:00
Damian Mooyman	e99554fc17	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-09 11:11:39 +12:00
Damian Mooyman	9fcda11969	Merge pull request #1211 from stevie-mayhew/pulls/get-calls ... FIX: explicitly call get functions for site tree checks	2015-06-05 16:38:37 +12:00
Stevie Mayhew	a819bcfc97	FIX: explicitly call get functions for site tree checks	2015-06-05 11:09:23 +12:00
Sam Minnée	bb68036854	Merge pull request #1203 from tractorcow/pulls/3.2/archive-actions ... API Deprecate delete in favour of archive	2015-06-04 19:07:19 +12:00
Damian Mooyman	b169823a00	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 preventing side-by-side preview of archived pages Fix bug in reporting publishing of error pages Restoring a page without an available parent will restore to root	2015-06-03 14:46:16 +12:00
Damian Mooyman	3872b02f65	Merge pull request #1205 from jonom/fix-treedropdown-folders ... FIX: Folder expansion icons	2015-06-03 10:18:11 +12:00
Damian Mooyman	1f9fc33349	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: code/model/SiteTree.php code/model/SiteTreeLinkTracking.php tests/controller/CMSMainTest.php	2015-06-02 19:23:48 +12:00
Jonathon Menz	dbe2ad4f9f	FIX: Folder expansion icons ... This is a companion fix for https://github.com/silverstripe/silverstripe-framework/pull/4202	2015-05-29 08:43:44 -07:00