4272 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	4039805ac2	Removing hhvm-nightly as its not supported on travis	2015-08-17 16:53:42 +01:00
Loz Calver	718503edb1	Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children ... * antons--773-nested-virtual-pages-allowed_children: Issue #773 - $allowed_children not allowing nested virtual pages	2015-08-06 10:51:56 +01:00
Anton Smith	c6684559f6	Issue #773 - $allowed_children not allowing nested virtual pages ... Additional check to see if a 'VirtualPage' has a page attached to it	2015-08-06 10:47:23 +01:00
Daniel Hensby	2408c16b0a	Move to new travis containerised infrastructure	2015-07-20 15:54:56 +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
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
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
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	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
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
scott1702	60c68098eb	Update default home content	2015-06-17 13:04:29 +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
Damian Mooyman	3872b02f65	Merge pull request #1205 from jonom/fix-treedropdown-folders ... FIX: Folder expansion icons	2015-06-03 10:18:11 +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
Damian Mooyman	0557c0d47b	Update translations	2015-05-14 13:52:21 +12:00
Ingo Schommer	bb177249ba	Merge pull request #1170 from tractorcow/pulls/3.1/cms-test ... BUG Fix CMSMainTest attempting to render page on Security permission error	2015-04-29 00:12:47 +12:00
Ingo Schommer	221281dade	Merge pull request #1181 from dhensby/pulls/injector-searc-form ... FIX Use SearchForm::create to instantiate SearchForm	2015-04-29 00:11:52 +12:00
Ingo Schommer	a5ef364e67	Merge pull request #1140 from InfinityIo/sitetree-docblock-improvements ... PHPDoc improvements for SiteTree and SiteTreeLinkTracking	2015-04-26 18:43:43 +12:00
Nik Rolls	5163690bdc	PHPDoc improvements for SiteTree and SiteTreeLinkTracking ... - Removed @param/@method references to fields from extensions - Added @mixin references to extensions - Fixed incorrect PHPDoc @params and @returns - Fixed wrapping width on many docblocks - Added and/or improved method documentation when missing or confusing - Fixed typos as found	2015-04-20 20:59:52 +12:00
Michael Strong	5ab15da8fe	Concat links in "broken links" report (fixes #1117) ... Fixes operation with any modules that add GET parameters to CMS links, such as the Translatable module. Pull request by @micmania1, see https://github.com/silverstripe/silverstripe-cms/pull/1118. Modified by @chillu based on peer review feedback.	2015-04-19 22:39:57 +12:00
Ingo Schommer	819954b8b4	Merge pull request #1186 from colintucker/1150-save-delete-buttons-files ... Issue #1150: Removed Save and Delete buttons from regular edit form.	2015-04-19 22:00:06 +12:00
Colin Tucker	02fcf6429b	Issue #1150: Removed Save and Delete buttons from regular edit form.	2015-04-17 09:19:15 +10:00
Daniel Hensby	a71f5f99fa	FIX Use SearchForm::create to instantiate SearchForm	2015-03-31 17:03:17 +01:00
Damian Mooyman	7f1f615634	Merge remote-tracking branch 'origin/3.1.11' into 3.1	2015-03-19 17:51:25 +13:00
Hamish Friedlander	8e2ed31453	Merge pull request #1176 from tractorcow/pulls/3.1.11/fix-page-create ... BUG Fix SiteTree / SiteConfig permissions	2015-03-19 16:36:39 +13:00
Damian Mooyman	a84361e4e8	Ensure SiteConfig::canView	2015-03-19 16:16:54 +13:00
Damian Mooyman	3df41e1176	BUG Fix SiteTree / SiteConfig permissions	2015-03-19 15:29:38 +13:00
Damian Mooyman	c0a44db56b	Merge pull request #1154 from uniun/missing-translations-entity ... FIX. Missing translation entity	2015-03-10 22:50:26 +13:00
Damian Mooyman	c238e1e15b	Update translations	2015-03-09 17:11:50 +13:00
Damian Mooyman	cabd8bbab9	Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting ... FIX: VirtualPages use correct casting for 'virtual' database fields	2015-03-06 11:29:18 +13:00
Damian Mooyman	6c92a86d2e	BUG Fix CMSMainTest attempting to render page on Security permission error	2015-02-24 17:27:48 +13:00
Damian Mooyman	c7814cffc9	Update translations	2015-02-16 11:54:06 +13:00
Damian Mooyman	0a8cb64a5c	Merge pull request #1165 from dhensby/pulls/fixes ... Pulls/fixes	2015-02-13 11:54:26 +13:00
Daniel Hensby	fe8cbc89d4	Remove double escaping of report data	2015-02-08 02:11:17 +00:00
Daniel Hensby	a530085016	FIX External redirects shouldnt show in preview pane	2015-02-08 00:30:38 +00:00
Damian Mooyman	cfcbfea88e	Merge pull request #1159 from micmania1/patch-3 ... BUG Correctly sanitise Title	2015-01-22 22:23:26 +13:00
Michael Strong	7733c4335e	BUG Correctly sanitise Title	2015-01-22 17:54:05 +13:00
Elvinas L.	9da7e90bf4	FIX. Missing translation entity ... Missing translation entity on Update URL button.	2015-01-13 12:36:09 +02:00
Damian Mooyman	ee4639ed74	Update translations	2015-01-12 17:52:29 +13:00
Damian Mooyman	19f337b544	Merge pull request #1110 from stephenmcm/SearchFormPatch ... BUG: Fixes #1107 SearchForm not calling getTemplate() in forTemplate()	2014-12-03 15:32:33 +13:00