4570 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Stephen Shkardoon	b87f5473d9	MINOR Change how OldPageRedirector gets URLs to fix nested redirects ... Previously, we would be limited by the way allParams will return 3 parameters at most. This way, we get the full URL. Keep in mind, this code still needs a clean up, but at least it's not buggy now.	2015-08-21 00:29:37 +12:00
Sean Harvey	e5a4cdb302	Merge pull request #1261 from dhensby/pulls/remove-nightly ... Removing hhvm-nightly as its not supported on travis	2015-08-18 10:07:16 +12:00
Daniel Hensby	4039805ac2	Removing hhvm-nightly as its not supported on travis	2015-08-17 16:53:42 +01:00
Daniel Hensby	80aca3a511	Merge branch '3.1' into 3.2	2015-08-17 14:20:58 +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
Damian Mooyman	a1b9e99342	Update localisation	2015-08-04 13:02:52 +12:00
Sam Minnée	fd457fe93e	Merge pull request #1256 from tractorcow/pulls/3.2/batch-restore-beta ... API batch restore action (ALTERNATE SOLUTION)	2015-08-03 22:08:13 +12:00
Damian Mooyman	e22b653e06	API batch restore action	2015-08-03 20:57:30 +12:00
Damian Mooyman	f38402bee3	Merge pull request #1254 from scott1702/update-alerts ... Update archive warning to include children pages	2015-08-03 18:14:12 +12:00
Sam Minnée	fa8aa8f92e	Merge pull request #1241 from tractorcow/pulls/3.2/predictable-ids ... API respect custom attributes on OptionsetField and CheckboxSetField	2015-08-03 17:23:24 +12:00
scott1702	3566e4ed87	Update archive warning to include children pages	2015-08-03 16:10:10 +12:00
Damian Mooyman	a6677b1653	API respect custom attributes on OptionsetField and CheckboxSetField ... Must be merged with https://github.com/silverstripe/silverstripe-framework/pull/4390	2015-08-03 16:08:56 +12:00
Damian Mooyman	e45ef93aa7	Merge pull request #1250 from jonom/choose-file-thumbnails-3.2 ... Moved image thumbnail style rules to Framework	2015-08-03 08:40:21 +12:00
Damian Mooyman	f6752c5ce9	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-07-31 11:42:20 +12:00
Jonathon Menz	7041a43684	Moved image thumbnail style rules to Framework ... for consistent styling of image thumbnails in GridFields	2015-07-30 16:15:35 -07:00
Daniel Hensby	aa913dd1d5	Merge pull request #1248 from kinglozzer/pulls/1244-contentcontroller-templates ... FIX: ContentController::getViewer() not returning all found templates (fixes #1244)	2015-07-27 13:00:38 +01:00
Loz Calver	af4150312c	Update .travis.yml to match framework	2015-07-24 15:27:13 +01:00
Daniel Hensby	6050cc5403	Move to new travis containerised infrastructure	2015-07-24 11:50:12 +01:00
Loz Calver	10b2fdc318	FIX: ContentController::getViewer() not returning all found templates (fixes #1244)	2015-07-24 11:50:09 +01:00
Daniel Hensby	2408c16b0a	Move to new travis containerised infrastructure	2015-07-20 15:54:56 +01:00
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