Commit Graph

2370 Commits

Author SHA1 Message Date
Daniel Hensby
32c74a86e2
Merge branch '3.5.5' into 3.6.2 2017-09-20 16:34:42 +01:00
Daniel Hensby
0aac4ddb7e
FIX Default LoginForm generated from default_authenticator 2017-09-12 15:59:05 +01:00
Daniel Hensby
a308ab327b
Merge branch '3.5' into 3.6 2017-08-24 13:14:22 +01:00
Andrew Aitken-Fincham
b78c163362 sanitize class names for cms icons 2017-08-24 12:12:37 +01:00
Daniel Hensby
8e2695f140
Merge branch '3.5' into 3.6 2017-07-18 15:44:13 +01:00
Daniel Hensby
515a7cb569
FIX Make sure VirtualPage renders correct templates 2017-07-17 20:13:13 +01:00
Daniel Hensby
b499e077b1 Merge pull request #1810 from dnadesign/fix_silverstripenavigator_versioned_subclasses
using static function so that subclasses of Versioned will be picked up
2017-07-17 16:16:33 +01:00
Daniel Hensby
28269e3b28
Merge branch '3.5' into 3.6 2017-07-15 16:16:24 +01:00
Loz Calver
5caef27577 Add archive to list of validation-exempt actions 2017-07-05 11:42:42 +01:00
Daniel Hensby
54e438fb9e
Merge branch '3.5' into 3.6 2017-06-14 12:14:02 +01:00
Mojmir Fendek
b442bad767 Children of the site tree are no longer listed only for the purpose of counting them. count($this->Children()) creates an array list of children which has serious performance consequences if there are lot of children present. On the other hand $this->numChildren() runs a count query which is much faster and eat’s less memory. 2017-06-08 12:19:27 +12:00
Daniel Hensby
08093ea308
Merge pull request #1838 from dhensby/pulls/3.6.0/fix-mobius-hierachy 2017-05-30 22:52:22 +01:00
Daniel Hensby
5116476875
FIX Issue where CMS SiteTree can result in infinite recursion if parent and child relation is swapped 2017-05-30 22:23:55 +01:00
Daniel Hensby
eaee3b6a8b
Merge remote-tracking branch 'security/3.5.4' into 3.6.0 2017-05-29 01:21:22 +01:00
Daniel Hensby
11e2175ec8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:02:55 +01:00
Daniel Hensby
02b5e6ea92
Merge pull request #5 from silverstripe-security/patch/3.4/SS-2017-003
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-28 21:36:33 +00:00
Daniel Hensby
61cf72c08d
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare() 2017-05-25 17:22:04 +01:00
Daniel Hensby
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages 2017-05-24 23:02:41 +01:00
John Milmine
618c7f126d changed to static function so that subclasses of Versioned will be picked up 2017-05-04 15:05:25 +12:00
John Milmine
1ff6f3f1b0 fixing doArchive
for users who can delete, but not unpublish, they should be able to delete draft pages that they’ve created.

Old code used to unpublish even if the page wasn’t published, which meant users who couldn’t publish, also could delete draft pages. They could create draft pages, but not delete them.
2017-04-27 08:48:19 +12:00
Damian Mooyman
000a5f7209
BUG Fix page history / settings forms 2017-04-26 18:13:48 +12:00
Tim Kung
bb3c09c359 - making form actions on edit forms safer
- re-adding removed methods
2017-04-12 11:42:21 +12:00
Tim Kung
41eddfcc8e fixing cms page history controller to use new page id param 2017-04-07 15:58:35 +12:00
Tim Kung
487235f991 adding page id into cmsmain 2017-04-07 14:41:15 +12:00
Daniel Hensby
2ddb616829 FIX Correct case of CopyContentFrom method 2017-04-05 10:49:17 +10:00
Sam Minnee
80e8967308 FIX: Fix VirtualPage::init() content-modification check.
This check had never worked but PHP 5 silently ignored it and PHP 7
raised it as an error.
2017-04-05 10:49:16 +10:00
Daniel Hensby
322c6f578b DOCS Fix PHPDoc 2017-04-05 10:49:16 +10:00
Daniel Hensby
ec15c71342 FIX: Add __isset to VirtualPage for PHP7 support.
Also rely on parent::hasField and parent::hasMethod
2017-04-05 10:48:58 +10: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
Brendan Halley
10d9f9080b Fix to allow ASSETS_DIR to be a subdirectory 2017-01-31 09:46:14 +11: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
Daniel Hensby
5bba7264c6
FIX Dont attempt to iterate over null in SiteTree::allowedChildren 2017-01-10 16:20:22 +00:00
Daniel Hensby
577a024109
Remove redundant label 2017-01-04 15:55: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
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
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
Daniel Hensby
5355831de9
Merge branch '3.2' into 3.3 2016-11-28 13:56:51 +00:00
Loz Calver
b2503ac004 FIX: content authors unable to duplicate top-level pages (fixes #1685) 2016-11-22 15:55:28 +00:00
Nathan
a5b33ab916 Correcting an issue where page controller methods
would end up with the error page response code, causing them to not work. This code only looks to be causing issues from what I can see.

An example is an autocomplete that is populated using a method on page controller. The moment you end up on a 404 error page, the autocomplete will attempt to populate and end up with a 404 response.
2016-11-21 15:43:37 +11:00
Daniel Hensby
ad2b2a044e
Merge branch '3.4' into 3 2016-10-16 22:43:01 +01:00
Daniel Hensby
ae83b7b5ef
FIX History controller now shows right comparison versions 2016-10-07 16:33:03 +01:00
Daniel Hensby
98d95cd707
FIX Sort order for duplicated child pages is now retained 2016-10-03 22:08:05 +01:00