Commit Graph

758 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
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
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