Commit Graph

2910 Commits

Author SHA1 Message Date
Damian Mooyman
48f53a522a
Merge remote-tracking branch 'origin/4.1' into 4 2018-04-05 08:38:24 +12:00
Damian Mooyman
c6af8856c8
Merge remote-tracking branch 'origin/4.0' into 4.1
# Conflicts:
#	code/Controllers/ContentController.php
2018-04-05 08:37:48 +12:00
Daniel Hensby
cf5a0984ad
FIX Correct SilverStripeNavigator correctly in templates 2018-03-22 14:40:14 +00:00
Daniel Hensby
dd0a46f5ba
Merge branch '4.1' into 4 2018-03-18 09:18:19 +00:00
Daniel Hensby
7dea009ad8
Merge branch '4.0' into 4.1 2018-03-18 09:17:51 +00:00
Daniel Hensby
00fea26be9
Merge branch '3.6' into 4.0 2018-03-18 09:17:20 +00:00
Steve Dixon
d096eb7c36 FIX: Remove SearchForm results() function from allowed_actions 2018-03-15 11:53:12 +11:00
Damian Mooyman
354d72165e Update CMS for versioned enhancements (#2122) 2018-03-14 16:34:46 +13:00
Damian Mooyman
90723a2f07
Merge remote-tracking branch 'origin/4.1' into 4 2018-03-13 14:35:13 +13:00
Damian Mooyman
7fc50ef2ed Merge remote-tracking branch 'origin/4.0' into 4.1 2018-03-13 14:34:14 +13:00
Damian Mooyman
2b9faf46fe
BUG Fix InSection failing on non-page controllers
Fixes #2119
2018-03-12 10:31:40 +13:00
Damian Mooyman
dde1349368
BUG Fix invalid css classname in virtualpage 2018-03-05 14:58:32 +13:00
Andrew Aitken-Fincham
1ac1ea73f3 add controller_name config var to SiteTree for easier override 2018-03-01 15:52:39 +00:00
Daniel Hensby
0fd7e63057
Merge branch '4.1' into 4 2018-02-27 11:00:03 +00:00
Rick Hambrook
012bfec5bf FIX Bug field help text translations no longer need to be HTML encoded 2018-02-27 11:12:50 +13:00
Rick Hambrook
289522ba0c
FIX Bug field help text translations no longer need to be HTML encoded 2018-02-22 21:41:11 +13:00
Daniel Hensby
d02c15150b
Merge branch '4.1' into 4 2018-02-21 14:02:52 +00:00
Daniel Hensby
47fdc4c589
Merge branch '4.0' into 4.1 2018-02-21 14:02:17 +00:00
Tim Burt
92c0424d73
Update URL in $meta_generator property of SiteTree to https 2018-02-21 09:10:50 +00:00
Damian Mooyman
289d6a87a2
MINOR Simplify i18n keys 2018-02-21 10:32:13 +13:00
Robbie Averill
9ebea37b33 NEW Add extension point to CMSMain::Breadcrumbs 2018-02-20 14:28:25 +13:00
Damian Mooyman
3be0478e1c
BUG Fix behaviour towards versioned but unstagable records 2018-02-20 11:03:23 +13:00
Daniel Hensby
9d77d32dea
Merge pull request #2099 from creative-commoners/pulls/4.0/dont-alias-this
MINOR Stop aliasing $this in history controller callbacks
2018-02-15 10:01:52 +00:00
Robbie Averill
e3a7a1ffed MINOR Stop aliasing $this in history controller callbacks 2018-02-15 13:38:29 +13:00
Damian Mooyman
b291306c03
Merge remote-tracking branch 'origin/4.1' into 4
# Conflicts:
#	client/dist/js/bundle.js
2018-02-15 09:24:08 +13:00
Christopher Joe
e05c47a550 Remove passing in record 2018-02-14 14:00:04 +13:00
Chris Joe
a3873a6422
Merge pull request #2093 from open-sausages/pulls/4.1/mind-if-i-button
Replace save draft / save & publish buttons with save, publish
2018-02-12 10:47:14 +13:00
Christopher Joe
01514490fe Feature remove File extension for backlink tracking in favour of UsedOnTable form field 2018-02-09 15:33:32 +13:00
Aaron Carlino
ca8b728580 replace save draft / save & publish buttons with save, publish 2018-02-09 12:18:57 +13:00
Robbie Averill
b084fe8177 NEW Convert page history notice to use Bootstrap 4 info alert 2018-02-07 16:47:24 +13:00
Chris Joe
98d1456384
Merge pull request #2088 from open-sausages/pulls/4.0/daft-draft
Add missing button styles to restore draft action
2018-02-07 15:51:48 +13:00
Luke Edwards
168b899917 BUG Add missing button styles to restore draft action 2018-02-07 14:06:21 +13:00
Loz Calver
fb30448033
Merge pull request #2085 from creative-commoners/pulls/4.1/warning-classes
NEW Use Bootstrap alerts instead of legacy message classes for install.php warning
2018-02-02 09:08:49 +00:00
Robbie Averill
f582954aea NEW Use Bootstrap alerts instead of legacy message classes for install.php warning 2018-02-02 13:02:47 +13:00
Chris Joe
07e70148da BUG Add some exist check for tabsets which may not be there (#2079) 2018-01-31 10:45:31 +13:00
Damian Mooyman
e99bd6f49e
ENHANCEMENT Ensure all base folders are excluded
ENHANCEMENT Controller names are now allowed as urlsegments
Fixes #2059
2018-01-25 15:33:10 +13:00
Damian Mooyman
cb2745c737
Refactor and cleanup SiteTreeFileFormFactoryExtension 2018-01-16 16:53:11 +13:00
Mike Cochrane
8b19afe235 File Form missing CMS Usage information 2018-01-16 15:48:15 +13:00
Daniel Hensby
5a77ec8cea
Merge branch '4.0' into 4 2018-01-15 16:19:22 +00:00
Damian Mooyman
23a23043bc Fix successfullyinstalled() (#2069)
Cleanup ContentController.php
2018-01-12 14:39:27 +13:00
Robbie Averill
157aef8eb7 FIX Implement correct subsites namespace in File extension 2018-01-08 15:40:48 +13:00
Damian Mooyman
c4b2782ce0
Automatic linting fixes 2017-12-19 10:31:25 +13:00
Damian Mooyman
227ce39414
Merge branch '4.0' into 4 2017-12-18 16:16:20 +13:00
Damian Mooyman
210213a455
Fix search behaviour 2017-12-13 18:16:34 +13:00
Damian Mooyman
073cb77500 Trim some unnecessary API 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
8a04e9c46b Fix wrong/confusing url segment 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
b391db4977 Fix search view 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
042dbbb13d Remember pages view type 2017-12-13 17:10:39 +13:00
Damian Mooyman
c2d54a571d Fix up code style, fix tests
Add in missing service definitions
2017-12-13 16:36:01 +13:00
Aaron Carlino
8ee5d9f5ce ENHANCEMENT Cache canCreate 2017-12-13 16:26:36 +13:00
Lee Bradley
7eb04121a6 Change new HTMLEditorField to HTMLEditorField::Create (#2050)
This allows for the field to be overridden using
  the injector e.g.

```yml

SilverStripe\Core\Injector\Injector:
  SilverStripe\Forms\HTMLEditor\HTMLEditorField:
    class: SilverStripers\markdown\forms\MarkdownEditorField
```
2017-12-07 15:36:51 +13:00
Loz Calver
7efe667a48 FIX: VirtualPage not using target page's template (fixes #2039) (#2041)
* FIX: VirtualPage refreshFromCopied creates duplicate URLSegments on first write

* FIX: VirtualPage not using target page's template (fixes #2039)
2017-12-06 11:59:30 +13:00
Lee Bradley
1fedc5fc10 API Make CMSMain::getSiteTreeFor() default to null nodeCount (#2029) 2017-11-28 10:09:27 +13:00
Daniel Hensby
c007eab72c
Merge branch '4.0' into 4 2017-11-26 16:01:48 +00:00
Lee Bradley
d3fa8946be
Issue-2034: Fix for Page icons using data urls
Fixes #2034

Code was getting the icon twice, both in SiteTree &
  LeftAndMainPageIconsExtenstion.
Now just uses `SiteTree::getPageIconURL()`
Tweaked to use `sprintf` instead of double quotes
2017-11-23 15:42:31 +00:00
Damian Mooyman
8de154d92c
BUG Restore missing '(Choose Page)' text in link insert modal 2017-11-16 14:43:32 +13:00
Damian Mooyman
53b0090826
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-16 10:18:08 +13:00
Chris Joe
365eabb85a
Merge pull request #2010 from open-sausages/pulls/4.0/deprecated-each
BUG Remove usage of deprecated each()
2017-11-08 16:32:25 +13:00
Damian Mooyman
a9cc93749d
Merge pull request #2011 from open-sausages/pulls/4.0/dont-give-me-a-falsified-report
BUG Fix ambiguous query for content report
2017-11-02 12:03:13 +13:00
Damian Mooyman
6c2d5311d3
Docblock 2017-11-02 11:29:49 +13:00
Chris Joe
0b8c5d7bb0
Merge pull request #2007 from open-sausages/pulls/4.0/site_url_check
BUG Safely check for is_site_url before parsing a shortcode
2017-11-02 10:02:12 +13:00
Damian Mooyman
0946332915
Remove table prefix 2017-11-01 17:19:04 +13:00
Christopher Joe
c331dedae9 BUG Fix ambiguous query for content report 2017-11-01 17:02:00 +13:00
Damian Mooyman
1bdfd05648
BUG Remove usage of deprecated each() 2017-11-01 14:51:14 +13:00
Damian Mooyman
4fb5306008
BUG Safely check for is_site_url before parsing a shortcode 2017-10-30 14:38:31 +13:00
Robbie Averill
4d0632892b FIX Add warning state to revert action in CMS page history 2017-10-27 17:32:00 +13:00
Damian Mooyman
74495b498f
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-25 17:01:34 +13:00
Damian Mooyman
7b71b2868e Merge pull request #1999 from open-sausages/pulls/4.0/you-cannot-see-what-you-cannot-see
FIX revert to this button after archiving
2017-10-24 09:46:08 +13:00
Daniel Hensby
9e903f801f
Merge branch '3.5' into 3.6 2017-10-20 11:03:25 +01:00
Sam Minnee
494dbd1ef2 Merge branch '4.0' into 4 2017-10-20 18:46:05 +13:00
Christopher Joe
a73d5b4177 FIX revert to this button after archiving 2017-10-20 10:01:56 +13:00
Christopher Joe
689c198fbe FIX revert to this button after archiving 2017-10-20 09:26:35 +13:00
Damian Mooyman
77b26b36fd
BUG Fix page icons in vendor modules 2017-10-19 15:41:12 +13:00
Jake B
1013c2b006 DOC: Update comment to inform the correct location of the PageIconCSS generation code 2017-10-18 15:23:39 +11:00
Aaron Carlino
88dd3cb807 Force SiteTree to check in DB before deleting children 2017-10-17 11:01:44 +13:00
Aaron Carlino
9ae6fbffe1 SiteTree check if in DB before delete children 2017-10-17 10:59:27 +13:00
Simon Erkelens
9eacf0eee6 Disable the ability to use reserved URL's
Fixes https://github.com/silverstripe/silverstripe-framework/issues/7139

Move check for disallowed rules to validURLSegment

Fix test
2017-10-14 12:08:31 +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
Damian Mooyman
c8f95182cb
Fix icon urls 2017-10-10 17:03:22 +13:00
Damian Mooyman
49fd3391fe BUG Prevent icons CSS being included twice 2017-10-05 10:04:57 +13: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
32c74a86e2
Merge branch '3.5.5' into 3.6.2 2017-09-20 16:34:42 +01:00
Chris Joe
fb9ad4453e Merge pull request #1973 from open-sausages/pulls/4.0/update-classinfo-usages
Update usages of ClassInfo
2017-09-20 16:29:37 +12:00
Damian Mooyman
fa0b559a7b
Update usages of ClassInfo
Add missing unit tests for SiteTreeFolderExtension
2017-09-20 15:20:17 +12:00
Damian Mooyman
496b9c8c04 API Implement insert-anchor modal 2017-09-20 13:35:25 +12:00
Robbie Averill
d18568c395 FIX Ensure client config merging includes existing parent "form" attributes 2017-09-15 09:12:53 +12:00
Saophalkun Ponlu
4f3b4f7626 FIX Fine-tune button styles 2017-09-13 10:44:11 +12:00
Daniel Hensby
0aac4ddb7e
FIX Default LoginForm generated from default_authenticator 2017-09-12 15:59:05 +01:00
Damian Mooyman
3669f30e4e BUG Fix race condition with change detection / loading animation
Fixes #1859
2017-09-07 11:54:03 +12:00
Lee Bradley
0570df95a8 Optimization for SiteTree::allowedChildren()
Adds an `Object::extend('updateAllowedChildren')` whilst also
  caching the default response

Using `get_class($this)` as cache key as this is what is used
  in `Configurable::stat($name)` to retrieve the candidates
2017-09-06 12:58:17 +12:00
Lee Bradley
bd86251043 Adds cacheing for SiteTree::allowedChildren()
This reduces the time for the page load in admin as it doesn't
  have to call `singleton()` as many times
2017-09-06 12:58:09 +12:00
Damian Mooyman
4b26ed6a83
BUG Prevent treeview loading repeatedly on each page edit form
Fixes #1949
2017-09-05 11:52:04 +12:00
Damian Mooyman
a9c479f26a
API Allow SiteTree::Link to be extended 2017-09-05 08:58:47 +12:00
Damian Mooyman
1273059b4c Fix campaign form validation errors 2017-09-04 14:47:45 +12:00
Christopher Joe
04f795c665
Tweak add form to use React TreeDropdownField
Enhancement Shift groups in SiteTree to use TreeMultiselectField
2017-09-04 13:38:14 +12:00
Damian Mooyman
9350b4a425
BUG Fix inconsistent breadcrumbs in CMS section
Fixes #1867
2017-08-28 13:03:56 +12:00
Saophalkun Ponlu
d0fd96d4e6 FIX Remove entry points to tree in search mode 2017-08-28 11:00:41 +12: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
Andrew Aitken-Fincham
46abf8ffd5 sanitize namespaced classes for page icon css 2017-08-24 12:00:33 +01:00
Saophalkun Ponlu
d03edb208e
FIX Search in page edit should now redirect to (full) table view 2017-08-24 13:50:05 +12:00
Loz Calver
9a9b4e205c Merge pull request #1929 from robbieaverill/pulls/4.0/replace-stat-usage
Replace use of Configurable stat() with config()->get(), will be deprecated in future
2017-08-23 10:26:45 +01:00
Robbie Averill
f2e22ef18a Replace use of Configurable stat() with config()->get(), will be deprecated in future 2017-08-23 09:46:46 +12:00
Damian Mooyman
e078e6623d
Restore deferred cms tree loading 2017-08-21 13:59:26 +12:00
Damian Mooyman
68d6307c6d Upgrade to bootstrap@4.0.0-beta.1 2017-08-16 10:52:36 +12:00
Damian Mooyman
2c54e33106
API Virtual pages now respect cascade_deletes on source page 2017-08-09 10:56:08 +12:00
Saophalkun Ponlu
417caf2972 ENHANCEMENT Allow insert links with display link text 2017-08-03 13:32:14 +12:00
Robbie Averill
fc0362087e
FIX Remove legacy sprintf style translations in favour of placeholders 2017-08-02 13:42:52 +12:00
Robbie Averill
f8ea7f27cf Remove sprintf translations in CMSMain in favour of named parameters 2017-08-02 13:40:08 +12:00
Nic Horstmeier
53a0206b1d BUGFIX check if parent context is SiteTree instance
fixes #1913
2017-07-28 14:02:29 -05:00
Damian Mooyman
3364f5c52b
API Use setTitleField to use MenuTitle for selecting internal links 2017-07-26 18:15:15 +12:00
Daniel Hensby
0758f66932
Merge branch '3' into 4 2017-07-25 14:54:33 +01:00
Damian Mooyman
b0380d8766 Un-hard code ViewState argument 2017-07-25 12:57:46 +12:00
Saophalkun Ponlu
fca3ba73f5 FIX Pages search now defaults to list view 2017-07-25 12:57:46 +12:00
Aaron Carlino
fbb63e68e1 Remove whitespace 2017-07-21 10:10:53 +12:00
Aaron Carlino
cc6b44223e BUGFIX: ContentController still using global $project; 2017-07-21 09:56:41 +12:00
Daniel Hensby
e38a0c49dd Merge pull request #1863 from robbieaverill/pulls/4.0/allow-redirectorpage-actions
FIX Allow RedirectorPage to have non-redirected actions, move redirection to index
2017-07-19 18:09:57 +01:00
Daniel Hensby
8e2695f140
Merge branch '3.5' into 3.6 2017-07-18 15:44:13 +01:00
Robbie Averill
fb6e6162ca FIX Use better inheritance based logic for deciding which active tab to display in edit page 2017-07-18 13:19:04 +12: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
6422866f40 Merge pull request #1894 from robbieaverill/pulls/4.0/fix-settings-tab-states
FIX Ensure tab states are reflected when switching on page edit screen
2017-07-17 13:21:33 +01:00
Daniel Hensby
91ced1cf1d Merge pull request #1880 from robbieaverill/pulls/4.0/change-people-to-groups
NEW Change "only these people" to "only these groups" in permissions
2017-07-17 13:17:04 +01:00
Robbie Averill
dd4d5740b8 FIX Ensure tab states are reflected when switching on page edit screen 2017-07-16 22:46:11 +12:00
Daniel Hensby
732bdd2734
Merge branch '3' into 4 2017-07-15 16:21:51 +01:00
Daniel Hensby
28269e3b28
Merge branch '3.5' into 3.6 2017-07-15 16:16:24 +01:00
Robbie Averill
1cf8a67f21 NEW Use injector for creating SSViewer 2017-07-13 21:20:00 +12:00
Mojmir Fendek
42cb0820a2
Limits added to collateDescendants() to ensure reasonable performance with thousands of pages. 2017-07-05 12:33:42 +01:00
Loz Calver
5caef27577 Add archive to list of validation-exempt actions 2017-07-05 11:42:42 +01:00
Robbie Averill
4c1dbd402b NEW Change "only these people" to "only these groups" in permissions 2017-07-03 21:39:53 +12:00
Daniel Hensby
9816efc97f
Merge branch '3' 2017-06-28 15:21:22 +01:00
Sam Minnee
ce730319ec NEW: Remove use of MODULE_DIR constants
This relies on
https://github.com/silverstripe/silverstripe-framework/pull/7065
2017-06-28 16:34:05 +12:00
Damian Mooyman
29bb49105f Merge pull request #1840 from open-sausages/pulls/4.0/view-add-perms-clarification
List "view/edit all" groups in group permission field
2017-06-28 12:22:34 +12:00
Damian Mooyman
2251138bed Merge pull request #1862 from robbieaverill/pulls/4.0/fix-missing-memberauthenticator
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-28 12:10:28 +12:00
Jonathon Menz
77ec2b90c6 API Removed ErrorPage
Removed ErrorPage class and references so it can be split off in to a separate module. Please install https://github.com/silverstripe/silverstripe-errorpage when upgrading to SS4 to preserve ErrorPage functionality. Closes https://github.com/silverstripe/silverstripe-framework/issues/4149
2017-06-26 10:01:54 -07:00
Saophalkun Ponlu
d752365047 More options dropdown label change to icon 2017-06-26 11:58:57 +12:00
Robbie Averill
c2ad41ef1b FIX Allow RedirectorPage to have non-redirected actions, move redirection to index 2017-06-23 11:23:31 +12:00
Robbie Averill
8d23cfc2aa FIX Ensure LoginForm on ContentController can load the member authenticator correctly 2017-06-23 11:22:01 +12:00
Damian Mooyman
c2c75aa9e3
Fix and upgrade all tests
Fix link tracking
2017-06-21 16:29:40 +12:00
Damian Mooyman
95e304a4ca Upgrade usage of global methods 2017-06-20 17:12:18 +12:00
Damian Mooyman
21e204cc59 App object refactor 2017-06-20 17:12:18 +12:00
Damian Mooyman
93a185e44a Update HTMLValue and FormField::create_tag usages 2017-06-16 11:44:36 +12:00
Antony Thorpe
fdbe38d444 Bugfix: SS4 Right click, add page fails
`addForm` receives both POSTs and GETs.  Set the form's `strictFormMethodCheck` to false to avoid `405 Method Not Allowed` error response.  Issue #1846.
2017-06-15 13:53:38 +12:00
Daniel Hensby
54e438fb9e
Merge branch '3.5' into 3.6 2017-06-14 12:14:02 +01:00
Simon Erkelens
b2fd014216 Make CMS Compatible with Authentication Refactor work
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12: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
Ingo Schommer
4bacd35fc4 List "view/edit all" groups in group permission field
See https://github.com/silverstripe/silverstripe-cms/issues/794
2017-06-02 11:40:51 +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
Damian Mooyman
f82f0844c1
API Add insert internal link modal 2017-05-30 11:00:32 +12: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
Franco Springveldt
c034ead6df FIX beforeUpdateCMSFields added to ErrorPage and VirtualPage
References #1756
2017-05-26 13:21:51 +12: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
Robbie Averill
b394718b42 Remove create_function implementations, replace with closures 2017-05-22 17:36:19 +12:00
Damian Mooyman
9a31b19ed2 ENHANCEMENT RedirectorPage extensions can now modify fields
Fixes #579
2017-05-16 23:33:45 +12:00
Damian Mooyman
49e559b08c
API Rename services to match FQN of interface / classes 2017-05-16 15:49:09 +12:00
Damian Mooyman
23e1aa8c45 API Refactor inherited permissions (#1811) 2017-05-12 12:47:46 +12:00
Damian Mooyman
1efb325b4d Merge pull request #1813 from open-sausages/pulls/4.0/remove-deprecated-methods
Remove APIs with target deprecation of 4.0
2017-05-09 11:36:49 +12:00
Ingo Schommer
4923a2597b Replaced usage of ResetFormAction (#1812)
See https://github.com/silverstripe/silverstripe-framework/pull/6883
2017-05-09 11:11:08 +12:00
Ingo Schommer
484a4ec4f6 API Removed deprecated RootURLController:set_default_homepage_link 2017-05-08 21:17:36 +12:00
Ingo Schommer
de41e14518 API Removed deprecated ModelAsController::find_old_page() 2017-05-08 21:14:38 +12:00
Aaron Carlino
359179025d Reorganise i18n keys 2017-05-08 17:57:24 +12: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
Uncle Cheese
29805ee446 New namespaced i18n keys 2017-04-27 11:43:04 +12:00
Uncle Cheese
6fb1012eb8 Ran upgrader for lang files 2017-04-27 11:43:04 +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
Ingo Schommer
cf2b0417cb Fix coding conventions 2017-04-22 11:44:49 +12:00
Tim Kung
bb3c09c359 - making form actions on edit forms safer
- re-adding removed methods
2017-04-12 11:42:21 +12:00
Damian Mooyman
d75a3cb0e9 API Update site tree hierarchy to use a MarkingSet and template 2017-04-12 08:57:09 +12:00
Ingo Schommer
9cad8ba01b Fixed linting 2017-04-12 08:21:02 +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
Damian Mooyman
b1b0c6af63
BUG Ensure all CMS forms include full ID / VersionID in path
Fixes #1510
Refactor tree operations into CMSMain
Cleanup CMSMain and subclasses
2017-04-06 13:40:46 +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
Saophalkun Ponlu
b8db45055c Enhancement Refactor archive message to a separate method 2017-04-05 12:45:41 +12:00
Saophalkun Ponlu
5b90141c03 ENHANCEMENT Update archive warning message 2017-04-04 11:26:46 +12:00
Damian Mooyman
393d392de1 Merge pull request #1775 from open-sausages/pulls/4.0/6626-remove-jquery-datepicker
HTML5 Date and Time Fields
2017-04-04 10:57:16 +12:00
Ingo Schommer
d07115e665 Use new DateField->setHTML5()
See https://github.com/silverstripe/silverstripe-framework/issues/6626
2017-04-03 12:01:12 +12:00
Damian Mooyman
98e77a48a9
API Rename SiteTree::description() to SiteTree::classDescription() to prevent clash
Fixes #1733
2017-03-29 11:55:44 +13:00
Damian Mooyman
91933b6c66 Update class namespace 2017-03-28 14:01:02 +13:00
Damian Mooyman
5ce98aced2 API Upgrade to rely on silverstripe/versioned module 2017-03-28 10:35:14 +13:00
Ingo Schommer
34d08cf458 Merge branch 'master' into pulls/4.0/admin-module 2017-03-15 12:01:28 +13:00
Chris Joe
319ce1861e Merge pull request #1758 from open-sausages/pulls/4.0/form-refactor
Update SearchForm
2017-03-13 15:22:53 +13:00
Damian Mooyman
c7d9947976
Update SearchFormTest 2017-03-13 11:45:29 +13:00
Damian Mooyman
5092e0fc65
Add dependency on admin module 2017-03-10 16:33:32 +13:00
Damian Mooyman
f65a164818
Update SearchForm
Fix RedirectorPageTest
2017-03-10 15:04:02 +13:00
Mike Cochrane
cb955f08f7 Fix non_virtual_fields being ignored
Fix non_virtual_fields and initially_copied_fields being ignored in classes that extent VirtualPage
2017-03-09 17:45:37 +13:00
Damian Mooyman
8537d6ddb1
Simplify code to use dataFields() 2017-02-28 16:34:46 +13:00
Christopher Joe
2fafff084f Fix history comparison fields will now show diff properly, rather than escaped html diff 2017-02-28 16:26:11 +13:00
Damian Mooyman
8766a4c91b
Cleanup unit test classes 2017-02-28 15:46:19 +13:00
Damian Mooyman
dfe25c27f0
BUG Fix allowedChildren() and link tracking 2017-02-28 15:46:07 +13:00
Damian Mooyman
4885736b0e API Upgrade CMS to use new Config API 2017-02-28 11:30:22 +11:00
Ingo Schommer
6bae804744 API Use symfony/cache
See https://github.com/silverstripe/silverstripe-framework/issues/6252
2017-02-26 14:57:52 +13:00
Damian Mooyman
945eba8efb Update CMS for new i18n API 2017-02-09 16:11:11 +13:00
Daniel Hensby
8a76a2ea8f
Merge branch '3' 2017-02-08 10:27:35 +00: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
Damian Mooyman
c7214b4dcd Auto-convert to psr2 2017-01-31 13:59:35 +13:00
Brendan Halley
10d9f9080b Fix to allow ASSETS_DIR to be a subdirectory 2017-01-31 09:46:14 +11:00
Damian Mooyman
fa2b87172c
Upgrade cms for new i18n backend 2017-01-26 11:39:20 +13:00
Damian Mooyman
732b1f0a57
BUG Fix reference to Install_deleteinstallfiles
Fixes #1719
2017-01-25 18:03:18 +13:00
Colin Tucker
00c81d8672 Changed init() visibility to protected 2017-01-22 09:35:14 +11:00
Daniel Hensby
3f53da050c
Merge branch '3' 2017-01-17 12:33:26 +00: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
Matthew Hailwood
df0ce184bf Clean up code
Just making it a little clearer what's going on by changing the variable names and removing some redundant code.
2017-01-16 13:20:44 +13:00
Daniel Hensby
05b5e545e0 Merge pull request #1703 from robbieaverill/feature/psr2-compliant-controller-names
API Allow controller discovery without underscore (PSR-2 compliance)
2017-01-11 15:28:11 +00:00
Paul Clarke
333b4b3e79 add icon to page in menu 2017-01-11 17:36:30 +13:00
Will Rossiter
b3896a0ba6 Swap out icons on change. 2017-01-11 17:36:30 +13:00
Paul Clarke
9f4acfe3bf Main save/publish actions to change icons when state changed 2017-01-11 17:36:30 +13:00
Will Rossiter
2d17f2f33b Tidy up publish and save buttons. 2017-01-11 17:36:30 +13:00
Will Rossiter
5bb430ef43 Remove references to ss-ui 2017-01-11 17:36:30 +13:00
Robbie Averill
cf3a74ec57 FIX Remove deprecation tests, bump deprecation version to 5.0 2017-01-11 10:02:51 +13:00
Robbie Averill
0927e54780 API Allow controller discovery without underscore (PSR-2 compliance) 2017-01-11 10:02:51 +13:00
Daniel Hensby
5bba7264c6
FIX Dont attempt to iterate over null in SiteTree::allowedChildren 2017-01-10 16:20:22 +00:00
Colin Tucker
9959ef63f2 Fix double-escaped ampersands in CMSMain_TreeView and CMSMain::LinkPageAdd 2017-01-10 15:41:26 +11:00
Daniel Hensby
577a024109
Remove redundant label 2017-01-04 15:55:32 +00:00
Mike Cochrane
2108d8ef08 Use SiteTree instead of Page class in more places. Allows developers to extend SiteTree directly. 2017-01-03 20:38:45 +13:00
Daniel Hensby
7a296a541b
Merge branch '3' 2016-12-28 17:00: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
Damian Mooyman
bf58c5aef4 API Update to use new form submission handling (#1691) 2016-12-09 16:00:46 +13:00
Ingo Schommer
4fea439139 Merge branch 'master' into patch-3 2016-12-08 21:28:21 +13: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
hirenpatel
0dd81fcbe8 Removed dud Requirements breaking the RedirectorPage
Also removed the dependency
2016-11-30 12:51:04 +00: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
Mike Cochrane
c5fb7127ac FIX Page History 'Comparing versions' banner missing
The 'Comparing versions' banner was inserted before the "Title" field. If there is no "Title" field the banner is missing. If the "Title" field isn't the first field then the banner is in the incorrect place.
2016-11-04 17:55:24 +13:00
Daniel Hensby
5bd7662cb4
Merge branch '3' 2016-11-03 15:32:47 +00:00
Damian Mooyman
4bf4fca416 BUG Prevent archived pages from having add to campaign action
Fixes #1626
2016-10-31 15:24:07 +13:00
Paul Clarke
c0623a4962 Remove break as text should be fluid for responsive layout 2016-10-28 15:44:31 +13:00
Damian Mooyman
e5550dd680 BUG Fix search not respecting view mode 2016-10-27 17:05:36 +13:00
Damian Mooyman
8c87ea6b79 API Update listview / treeview to use pjax instead of deferred loading
Fixes #1645
2016-10-27 17:05:36 +13:00
Damian Mooyman
424008cff4 BUG Fix installer for 4.0 (#1644) 2016-10-26 14:44:25 +13:00
Sam Minnée
75b185092e FIX: Remove reference to Object class. (#1634)
The Object class is due to be removed and so this removes dependence on it.
2016-10-25 10:01:21 +01:00
Damian Mooyman
d54ae8bb26 API Consolidate "Delete from draft" and "Archive" actions into a consistent behaviour (#1653)
API Update to support new versioned dataobject behaviour
2016-10-25 13:22:31 +13:00