tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,745 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

689 Commits

Author SHA1 Message Date
Damian Mooyman 227ce39414
Merge branch '4.0' into 4 2017-12-18 16:16:20 +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
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
Damian Mooyman 53b0090826
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-16 10:18:08 +13:00
Damian Mooyman 27907304c1
BUG Ensure we publish pages to update permissions during testing 2017-11-02 15:59:41 +13:00
Damian Mooyman 4fb5306008
BUG Safely check for is_site_url before parsing a shortcode 2017-10-30 14:38:31 +13:00
Sam Minnee 494dbd1ef2 Merge branch '4.0' into 4 2017-10-20 18:46:05 +13:00
Damian Mooyman 77b26b36fd
BUG Fix page icons in vendor modules 2017-10-19 15:41:12 +13:00
Aaron Carlino 88dd3cb807 Force SiteTree to check in DB before deleting children 2017-10-17 11:01:44 +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
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
Mike Cochrane 85a30733be Tests: Batch Actions Tests assume enforce_strict_hierarchy is enabled 2017-09-16 14:20:55 +12:00
Damian Mooyman a9c479f26a
API Allow SiteTree::Link to be extended 2017-09-05 08:58:47 +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
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 d469a2dc88 Fix regressions from tinymce upgrade (#1923) 2017-08-15 11:05:56 +12:00
Damian Mooyman 4f6af36369
Manual fixes to automatic namespacing 2017-08-09 17:09:28 +12:00
Damian Mooyman 9f268a18b5 Run add-namespace command 2017-08-09 17:00:58 +12:00
Damian Mooyman 6cb2077878 Move files to new location 2017-08-09 16:58:07 +12:00
Damian Mooyman 2c54e33106
API Virtual pages now respect cascade_deletes on source page 2017-08-09 10:56:08 +12:00
Nic Horstmeier 53a0206b1d BUGFIX check if parent context is SiteTree instance 
fixes #1913
 2017-07-28 14:02:29 -05:00
Daniel Hensby 0758f66932
Merge branch '3' into 4 2017-07-25 14:54:33 +01:00
Damian Mooyman 0a867b4786 Adjust behat step usage 2017-07-25 12:57:46 +12:00
Saophalkun Ponlu db5f81d393 Fix behat tests 2017-07-25 12:57:46 +12:00
Daniel Hensby 8e2695f140
Merge branch '3.5' into 3.6 2017-07-18 15:44:13 +01:00
Saophalkun Ponlu 6fc1491f0b Enhancement Add edit command and its url test for page insert 2017-07-18 13:11:58 +12:00
Robbie Averill e8c77463c5 FIX Use injection for CMSMain in tests 2017-07-18 10:56:13 +12:00
Damian Mooyman 52ada8bb92 Merge pull request #1898 from robbieaverill/pulls/4.0/remove-config-update 
FIX Use merge or set instead of update for config calls
 2017-07-18 09:14:48 +12:00
Daniel Hensby 515a7cb569
FIX Make sure VirtualPage renders correct templates 2017-07-17 20:13:13 +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
Robbie Averill c3cda42b92 FIX Use merge or set instead of update for config calls 2017-07-17 17:49:03 +12:00
Robbie Averill 4bc1bd64fc Add tests for page level edit and view permission settings 2017-07-17 13:31:14 +12:00
Robbie Averill 9bde76bad0 Add behat test for toggling between active tabs in CMS edit pages 2017-07-16 23:42:09 +12:00
Robbie Averill 4c1dbd402b NEW Change "only these people" to "only these groups" in permissions 2017-07-03 21:39:53 +12:00
Damian Mooyman 99f9d4a2d3
Fix assertions 2017-06-30 14:23:37 +12:00
Sam Minnee 522af3f29d FIX: Test updates to comply with https://github.com/silverstripe/silverstripe-framework/pull/7083 2017-06-29 14:39:28 +12:00
Daniel Hensby 9816efc97f
Merge branch '3' 2017-06-28 15:21:22 +01:00
Damian Mooyman af1654eda3 BUG Don’t click hidden button 2017-06-27 17:22:21 +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
Ingo Schommer ad347af76f Fix linter 2017-06-23 11:59:10 +12:00
Damian Mooyman 9936499606
Prevent duplicate page tests failing to race conditions 2017-06-22 14:58:26 +12:00
Damian Mooyman 8cebb2758d Fix behat issues 2017-06-21 21:04:55 +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 7fe808da29 Update session references 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
Daniel Hensby 05bb2fef1b
Merge pull request #1851 from open-sausages/pulls/3.6/revert-lang-update 2017-06-15 12:50:49 +01:00