Commit Graph

2356 Commits

Author SHA1 Message Date
Steve Dixon d17d93f784
FIX: Remove SearchForm results() function from allowed_actions 2018-03-18 09:14:38 +00:00
Christopher Joe a73d5b4177 FIX revert to this button after archiving 2017-10-20 10:01:56 +13:00
Aaron Carlino 9ae6fbffe1 SiteTree check if in DB before delete children 2017-10-17 10:59:27 +13:00
Jason fd39faeefd
BUG UploadField overwriteWarning isn't working in AssetAdmin
When UploadField overwriteWarning is enabled, no overwrite warning message for uploading file in non-root folder. This fix will let CMSFileAddController know the current folder when 'fileexists' AJAX request is called.
2017-10-13 11:00:17 +01:00
Loz Calver 24e190ea82 Fix: TreeDropdownField showing broken page icons (fixes silverstripe/silverstripe-framework#7420) 2017-10-04 17:02:48 +01:00
Daniel Hensby 0aac4ddb7e
FIX Default LoginForm generated from default_authenticator 2017-09-12 15:59:05 +01:00
Andrew Aitken-Fincham b78c163362 sanitize class names for cms icons 2017-08-24 12:12:37 +01:00
Daniel Hensby 515a7cb569
FIX Make sure VirtualPage renders correct templates 2017-07-17 20:13:13 +01:00
Loz Calver 5caef27577 Add archive to list of validation-exempt actions 2017-07-05 11:42:42 +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 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
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
Daniel Hensby 6d9b4415f1
Merge branch '3.4' into 3 2016-08-23 10:58:50 +01:00
Daniel Hensby c754882e0a
Merge branch '3.3' into 3.4 2016-08-23 10:58:24 +01:00
Daniel Hensby ba5e51c422
Merge branch '3.2' into 3.3 2016-08-23 10:55:13 +01:00
Daniel Hensby 59be597004
FIX #1052 2016-08-22 19:41:10 +01:00
Daniel Hensby 4aca9ac145
Merge pull request #1052 from @dmeeking 2016-08-22 17:46:43 +01:00
Dan Meeking 26f5fc2853
Issue #1051: fix so that OldPageRedirector::find_old_page uses ORM call 2016-08-22 17:44:43 +01:00
Damian Mooyman e414fdb325 Merge 3.4 into 3 2016-08-15 19:05:12 +12:00
Damian Mooyman c2f21d0008 Merge 3.4.1 into 3.4 2016-08-15 18:37:50 +12:00
Damian Mooyman ef856185ab BUG Fix regression in FormField casting 2016-08-15 15:55:06 +12:00
Damian Mooyman a6a9cd729f BUG Fix regression in FormField casting 2016-08-15 15:34:29 +12:00
Damian Mooyman 5ad8157655 BUG Fix regression in FormField casting 2016-08-15 15:32:22 +12:00
Damian Mooyman 63fc4dbcae BUG Fix extra border in page settings
Fixes #1547
2016-08-09 17:19:45 +12:00
Damian Mooyman 7c13f7f75f Merge 3.4 into 3
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
2016-08-05 19:14:57 +12:00
Damian Mooyman afc9bb0dc6 Merge 3.3 into 3.4
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml
2016-08-05 16:46:35 +12:00