tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
6,475 Commits 29 Branches 403 Tags 28 MiB
ea92339d8d
Commit Graph

812 Commits

Author SHA1 Message Date
Serge Latyntcev
4fdcb8180a Merge branch '4.3' into 4.4 2019-09-23 16:22:29 +12:00
Serge Latyntcev
80bcc70d38 Merge branch '4.2' into 4.3 2019-09-23 16:21:50 +12:00
Robbie Averill
6d7cc4f5c0
Merge pull request #2431 from muskie9/pull/pageTypeDropdown#2430 
BUGFIX Page Type listed in Page Type dropdown when $can_be_root is false
 2019-09-16 18:04:23 -07:00
Robbie Averill
a083fc5d5b Merge branch '4.4' into 4 2019-07-19 11:50:38 +02:00
Dylan Wagstaff
68f6eaa663 FIX display recognisable names for dependent content with no title 
Content blocks and other DataObjects that contain HTMLText fields are
also used in the 'Dependent pages' report for each page in the CMS,
however these objects may have neither a Title field, nor a name to
describe them. Instead of showing an empty field in the Title column for
this table, we can instead show "Untitled " with the localised singular
name appended.
 2019-07-17 15:30:07 +12:00
Sam Minnee
469e7ca01b FIX: Make test comparison less brittle in MigrateSiteTreeLinkingTaskTest 
Comparing every single field is unnecessary and brittle, only the IDs
need to be compared.

Notably this tripped over a potential bug fix in
https://github.com/silverstripe/silverstripe-framework/pull/8591
but the change should be incorporated regardless.
 2019-05-28 12:51:23 +12:00
Nic Horstmeier
1b3a4aea96 BUGFIX Page Type listed in Page Type dropdown when $can_be_root is false 
resolves #2430
 2019-05-16 19:53:59 -05:00
Loz Calver
7592db918f FIX: VirtualPage missing methods from target page (fixes #2408) 2019-04-18 14:01:26 +01:00
Robbie Averill
79e1b06d17
Merge pull request #2373 from sminnee/search-or-choose-page 
MINOR: Change “Choose Page” to “Search or choose Page”
 2019-04-17 12:30:46 +12:00
ttunua
0b56a563c0 FIX: Fixes #2110 added default Title value for saved pages. (#2366) 
* FIX: Fixes #2110 added default Title value for saved pages.

* FIX: Fixes #2110 fixed linting and unit test failure

* BUG Rename default wording for untitled page
 2019-04-15 14:33:15 +12:00
Robbie Averill
d4571d927d Merge branch '4.3' into 4 2019-04-11 11:46:19 +12:00
Serge Latyntcev
de5fc49917 Remove flush from CMSPageHistoryControllerTest 
flushing in tests is futile
 2019-04-01 10:58:53 +13:00
Robbie Averill
abd661bfab SiteTreeTest::testReadArchiveDate() now tests ORM results rather than underlying sql arguments 2019-02-11 14:30:25 +03:00
Robbie Averill
c1c9d7706a Merge branch '4.3' into 4 2019-02-06 22:25:40 +03:00
Robbie Averill
23ae682b35 Merge branch '4.2' into 4.3 2019-02-06 22:24:53 +03:00
Robbie Averill
976bbc1014 Merge branch '4.1' into 4.2 2019-02-06 22:24:32 +03:00
Robbie Averill
668670b5a1 Merge branch '4.0' into 4.1 2019-02-06 22:24:14 +03:00
Ingo Schommer
5c3b95ac89 FIX Multibyte URL routing 
Was double url encoding (once in database value, then again in request)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8723
 2019-02-05 16:45:28 +03:00
Robbie Averill
ff458810ea Automated phpcs linting updates 2019-02-05 16:45:11 +03:00
Guy Marriott
97ee18d463
Merge pull request #2382 from creative-commoners/pulls/4.4/remove-add-to-campaign-button 
FIX Remove coupling from SiteTree to campaign admin module
 2019-02-04 22:20:35 +13:00
Ingo Schommer
c61ba88d82 FIX Multibyte URL routing 
Was double url encoding (once in database value, then again in request)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8723
 2019-02-04 22:02:15 +13:00
Robbie Averill
1a7b23a21f FIX URL segment generation tests for resources dir are now accurate 2019-02-02 13:27:24 +03:00
Robbie Averill
3dbca48d29 Remove assertions for addtocampaign action 2019-02-01 20:20:40 +03:00
Maxime Rainville
ed0680a264 MINOR Add unit test for MetaComponents 2019-02-01 19:48:47 +03:00
Maxime Rainville
53374d617e
Merge pull request #2280 from creative-commoners/pulls/4.2/subsites-namespace 
FIX Use correct subsites namespace in SiteTree and test classes
 2019-02-01 17:27:35 +13:00
Sam Minnee
dd06178167 MINOR: Change “Choose Page” to “Search or choose Page” 
Based on discussions with James Ford, it wasn’t clear that you could
search.

Companion to https://github.com/silverstripe/silverstripe-framework/pull/8766
 2019-01-29 12:15:38 +13:00
Maxime Rainville
bbffe05541 Fixing linting error. 2019-01-12 00:16:04 +13:00
Maxime Rainville
3a1329f61b MINOR Clean up CMSMain::CanOrganiseSitetree 2019-01-11 23:56:40 +13:00
Aaron Carlino
75f41b56d5 Merge branch '4.3' into 4 2019-01-10 14:57:01 +13:00
Aaron Carlino
0e8b87087d Merge branch '4.2' into 4.3 2019-01-10 14:56:15 +13:00
Aaron Carlino
9ccba1b0bb Merge branch '4.1' into 4.2 2019-01-10 14:49:25 +13:00
Aaron Carlino
06b982f8dc MINOR: Fix linting error 2019-01-10 14:10:47 +13:00
Aaron Carlino
6beb682cfa Merge branch '4.3' into 4 2019-01-10 12:06:36 +13:00
Maxime Rainville
345f6fcef8 MINOR Update CMS test to work with configurable resource dir (#2353) 2019-01-09 15:35:59 +13:00
Guy Marriott
5269036e93
Merge pull request #2346 from open-sausages/pulls/4.3/fix-form-clearing 
Add test to make sure you can create a page under another page
 2018-12-12 18:11:22 +13:00
Aaron Carlino
b83d818e0a Merge branch '4.2' into 4.3 2018-12-11 17:07:55 +13:00
Aaron Carlino
acc7f46b02 Merge branch '4.1' into 4.2 2018-12-11 11:42:35 +13:00
Aaron Carlino
a4b78c4041 Merge branch '4.0' into 4.1 2018-12-11 11:42:11 +13:00
Guy Marriott
c1b1572752
Merge pull request #2344 from creative-commoners/pulls/4.3/unsaved-dependent-relations 
FIX Unsaved SiteTree records now return an empty list for DependentPages
 2018-12-03 11:48:54 +13:00
Robbie Averill
7554b61325 Update meta generator tests to use isolated configuration and better assertions 2018-12-02 18:20:44 +00:00
Robbie Averill
602597b900 FIX CMSPageHistoryControllerTest now uses a stub controller to avoid URL conflicts with versioned-admin 2018-12-02 18:07:56 +00:00
Robbie Averill
29a22bcb52
Set history controller priority in tests to ensure it is loaded 2018-12-02 15:57:26 +00:00
bergice
53cd9dcf1c Add test to make sure you can create a page under another page 2018-11-30 13:28:04 +13:00
Robbie Averill
0bb22732c9 FIX Unsaved SiteTree records now return an empty list for DependentPages 2018-11-28 13:44:52 +01:00
Robbie Averill
ce3a1ce913 FIX Use correct subsites namespace in SiteTree and test classes 2018-11-20 13:34:38 +01:00
Sam Minnee
5e3068ba13 MINOR: Add tests for some search-form fixes 
These 2 tests validate that the following bugs have been fixed.

https://github.com/silverstripe/silverstripe-framework/issues/3212
https://github.com/silverstripe/silverstripe-cms/issues/1452
 2018-11-10 12:07:49 +13:00
Robbie Averill
ab739c7fb0 FIX Replace usage of Convert JSON methods with json_encode and json_decode 2018-10-28 21:21:19 +00:00
Maxime Rainville
f08be7217a MINOR Update CMS test to explicitetly register the CMSPageHistoryController (#2300) 2018-10-24 15:16:54 +13:00
Maxime Rainville
9abd721a56 MINOR Update CMS test to explicitetly register the CMSPageHistoryController (#2300) 2018-10-24 15:13:59 +13:00
Robbie Averill
b3013a98c4 Update testSearchField to expect namespaced search fields 2018-10-01 12:50:20 +02:00
Robbie Averill
44b92c90bc FIX Update field names in Behat tests for new search form namespacing 2018-09-27 11:39:42 +02:00
Luke Edwards
41c0b8fb85 Fix 'Insert links into a page' test 2018-09-12 13:14:06 +12:00
Luke Edwards
f3da10119e Disable page search test scenarios involving date due to bug 2018-09-07 12:11:57 +12:00
Luke Edwards
2fbeda1564
ADD New search component for SiteTree (#2224) 2018-09-04 13:13:33 +12:00
Daniel Hensby
83e5689b94
Merge branch '4.2' into 4 2018-07-23 15:58:14 +01:00
Daniel Hensby
b653ebfe7a
Merge branch '4.1' into 4.2 2018-07-23 14:50:50 +01:00
Ingo Schommer
262236c3e2
Merge pull request #2115 from andrewandante/pulls/4/add_controller_name_config_var 
add controller_name config var to SiteTree for easier override
 2018-07-23 14:09:47 +12:00
Robbie Averill
e80c7e712b FIX Restore button now has warning colour and correct icon 2018-07-13 12:11:33 +12:00
Raissa North
6b2a9e4f77 Update class references and array syntax 2018-06-20 13:18:29 +12:00
Raissa North
5f3e95cd64 Update class references and array syntax in VirtualPageTest 2018-06-20 10:17:38 +12:00
Robbie Averill
5da708d223 FIX Fixture the 'app' dir instead of mysite in unit tests 2018-04-11 19:04:45 +12:00
Damian Mooyman
6c616f5f7a API Implement polymorphic sitetree link tracking (#2123) 
* WIP Implement polymorphic sitetree link tracking

* Update unit tests
Merge SiteTreeTrackedPage into SiteTree directly

* Fix bugs and issues

* Fix support for file link tracking

* Add missing use

* Add back deprecated extension

* Remove obsolete belongs_many_many

* Update deprecations

* BUG Ensure non-SiteTree records support link tracking

* Safer changed check

* Shift file tracking test to assets module

* Better check for live stage on versioning

* Deprecate method

* Cleanup virtualpage

* Clear records on delete

* Ensure upgrade task occurs on draft

* fix linting
 2018-04-06 15:53:57 +12:00
Damian Mooyman
8c6c429994 Update API to remove deprecated useDraftSite() 
Update to support versioned enhancements
 2018-03-22 17:12:12 +13:00
Damian Mooyman
354d72165e Update CMS for versioned enhancements (#2122) 2018-03-14 16:34:46 +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
47fdc4c589
Merge branch '4.0' into 4.1 2018-02-21 14:02:17 +00:00
Damian Mooyman
83c4ab8d18
BUG Fix test regressions in CMS page filters 2018-02-21 10:32:00 +13:00
Damian Mooyman
3be0478e1c
BUG Fix behaviour towards versioned but unstagable records 2018-02-20 11:03:23 +13:00
Damian Mooyman
0830d6dcb7
Update reference to TestAssetStore 2018-02-14 16:27:43 +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
Aaron Carlino
ca8b728580 replace save draft / save & publish buttons with save, publish 2018-02-09 12:18:57 +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
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
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