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,378 Commits 29 Branches 403 Tags 28 MiB
f3a76ccf2d
Commit Graph

2875 Commits

Author SHA1 Message Date
Serge Latyntcev
06c481bb8d Merge branch '4.3' into 4.4 2019-09-24 14:55:57 +12:00
Serge Latyntsev
c7e44f85aa
Merge pull request #7 from silverstripe-security/pulls/4.3/joseph-installin 
[CVE-2019-12204]: install.php warning does not account for public dir
 2019-09-24 11:25:49 +12:00
Serge Latyntcev
ac123ee700 Merge branch '4.4' into 4 2019-09-23 16:34:24 +12:00
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
Dileep Ratnayake
075c98ed8e
Change self:: to static:: for better extensibility 2019-09-11 11:09:14 +12:00
Adrian Humphreys
0872a23aa8
Keep a more shared understanding of Archived 2019-09-09 07:50:10 +12:00
bergice
644376272c Add warnings when trying to remove the homepage 
Warnings are triggered when:
* Changing the URL Segment
* Unpublishing
* Unpublishing & Archiving
* Moving the homepage to another parent in the tree view

Also add `SiteTree->isHomePage()`
 2019-08-29 17:38:56 +12:00
Robbie Averill
abf026c500
Merge pull request #2471 from creative-commoners/pulls/4.4/no-caching-on-previews-or-drafts 
FIX Disable caching on page previews (CMSPreviews or stage=Stage)
 2019-08-22 14:09:11 +12:00
Garion Herman
8e3072922f FIX Disable caching on page previews (CMSPreviews or stage=Stage) 2019-08-22 13:52:54 +12:00
Aaron Carlino
f98a59deb5 [CVE-2019-12204]: install.php warning does not account for public dir 2019-08-20 21:45:29 +12:00
James Cocker
1316245b37 Updated “URL Segment” & “Main Content” to sentence case 2019-08-14 17:38:36 +01:00
Robbie Averill
59b9a0d664
Merge pull request #2411 from kinglozzer/virtualpage-definemethods 
FIX: VirtualPage missing methods from target page (fixes #2408)
 2019-08-05 13:16:08 +12:00
hirenpatel
9bcb395387 Changing to protected to match the rest of the changes 2019-08-02 15:08:05 +01: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
Aaron Carlino
8a44071ec6 Merge branch '4.4' into 4 2019-06-10 16:26:55 +12:00
Aaron Carlino
3bf78e05df Merge branch '4.3' into 4.4 2019-06-10 16:26:32 +12:00
Aaron Carlino
b7707f319c Merge branch '4.2' into 4.3 2019-06-10 16:26:08 +12:00
Robbie Averill
325d227fe0 FIX Virtual page notice now uses Bootstrap 4 alerts 2019-05-31 14:50:46 +12:00
Robbie Averill
cd70aecf8d
Merge pull request #2421 from creative-commoners/pulls/4.4/adding-removing-overlapping-icons 
FIX Only add page font icon classes if there's no icon image defined
 2019-05-31 13:56:14 +12:00
Garion Herman
c569cec4ea NEW Add updateHintsCacheKey extension point to fix invalid caching 
If a module augments the allowed pagetypes based on external conditions,
the Hints Cache Key will not cover these conditions and may cause
incorrect output. An example of this is Subsites, which allows each
Subsite to have a different set of allowed pagetypes.
 2019-05-31 10:21:07 +12:00
Maxime Rainville
46b77f3592 MINOR Do not assume SiteTree's table will always be call SiteTree. 2019-05-17 13:40:15 +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
Guy Marriott
892a91ae3e
FIX Only add page font icon classes if there's no icon image defined 2019-05-08 16:13:33 +12:00
Robbie Averill
7cfa771681 FIX Use Bootstrap 4 alert for page type restriction message when adding a page 
Bootstrap 4 alerts are the default in SilverStripe 4.4, this one is custom so was missed during the update
 2019-05-03 15:35:08 +12:00
Loz Calver
7592db918f FIX: VirtualPage missing methods from target page (fixes #2408) 2019-04-18 14:01:26 +01: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
Ingo Schommer
ab01ac99e3 API Deprecated CMSMain->publishall() 
The current implementation doesn't scale,
and due to the proliferation of versioned objects
no longer fully works (e.g. doesn't publish all files).

Fixes https://github.com/silverstripe/silverstripe-cms/issues/2406
 2019-04-10 10:44:14 +12:00
Guy Marriott
432266dcd2
Merge pull request #2391 from sachajudd/pulls/4.4/add-new-page 
FIX Deprecate creatableChildren and add new function to support font-icon classes for allowedChildren
 2019-04-08 14:08:14 +12:00
Guy Marriott
d2236f0954
Update code/Model/SiteTree.php 
Co-Authored-By: sachajudd <sjudd@silverstripe.com>
 2019-04-08 11:45:52 +12:00
Guy Marriott
10ff962ece
Update code/Model/SiteTree.php 
Co-Authored-By: sachajudd <sjudd@silverstripe.com>
 2019-04-08 11:45:44 +12:00
Guy Marriott
4685523b9b
Update code/Model/SiteTree.php 
Co-Authored-By: sachajudd <sjudd@silverstripe.com>
 2019-04-08 11:10:07 +12:00
Al Twohill
dcfb502e5c Addresses #2401 
Note, I've got no idea behind the logic of should_be_on_root - the change is a best guess based on the fact that `Translatable` doesn't exist in SS4 yet
 2019-03-28 20:40:33 +13:00
Sacha Judd
a0aaf050d4 FIX Deprecate creatableChildren and add new function to support font-icon classes for allowedChildren 2019-02-25 17:00:47 +13:00
Robbie Averill
12512e84b1 NEW BrokenLinksReport now uses injector for fields, uses short array syntax and single quotes 2019-02-22 16:11:15 +07: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
f8a8b38a0a Consistent check of allow_multibyte 
It uses an injected instance everywhere else.
See https://github.com/silverstripe/silverstripe-cms/pull/2365#discussion_r247383809
 2019-02-05 16:45:28 +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
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
12274fb6ec Consistent check of allow_multibyte 
It uses an injected instance everywhere else.
See https://github.com/silverstripe/silverstripe-cms/pull/2365#discussion_r247383809
 2019-02-04 22:04:48 +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
Maxime Rainville
ed0680a264 MINOR Add unit test for MetaComponents 2019-02-01 19:48:47 +03:00
Robbie Averill
f9aeeb1d6c FIX Remove coupling from SiteTree to campaign admin module 
Add to Campaign button is now in an extension in the campaign-admin module
 2019-02-01 19:36:13 +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
Jonathon Menz
e20be9293f NEW Meta tag components 
Meta tags can now be individually accessed and modified by key, prior to being rendered and flattened in to a single string.
 2019-02-01 14:49:01 +13:00
Robbie Averill
2533e729fc Merge branch '4.3' into 4 2019-01-29 14:03:59 +02:00
Robbie Averill
287f17b848 Merge branch '4.2' into 4.3 2019-01-29 14:03:47 +02:00
Damian Mooyman
9ced23473f
BUG Don't convert datalist to arraylist when filtering pages 
Fixes #2354
 2019-01-18 10:35:34 +13:00
Robbie Averill
ba897af221
Merge pull request #2364 from sachajudd/pulls/4.4/font-icon-support 
NEW Add font-icon support for site tree
 2019-01-14 09:06:40 +01:00
Sacha Judd
1f1f44969a NEW Add font-icon support for site tree 2019-01-14 13:16:30 +13:00
Robbie Averill
08502fb4dc
MINOR Typo fix 
Co-Authored-By: maxime-rainville <maxime@rainville.me>
 2019-01-12 00:12:35 +13:00
Maxime Rainville
3a1329f61b MINOR Clean up CMSMain::CanOrganiseSitetree 2019-01-11 23:56:40 +13:00
Aaron Carlino
6beb682cfa Merge branch '4.3' into 4 2019-01-10 12:06:36 +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
Robbie Averill
84db517bfe Merge branch 'pr-2105' into 4.0 2018-12-02 18:21:40 +00: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
60aadf8f28 Merge branch '4.3' into 4 2018-11-26 15:09:38 +01:00
Maxime Rainville
44b600814a
Merge pull request #2287 from sb-relaxt-at/4.2 
Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink
 2018-11-23 10:05:05 +13:00
Robbie Averill
ce3a1ce913 FIX Use correct subsites namespace in SiteTree and test classes 2018-11-20 13:34:38 +01:00
Guy Marriott
203ecdb210
Merge pull request #2333 from micmania1/bugfix/revert-to-publish-shows-draft 
BUGFIX reverting to publish still shows draft changes
 2018-11-20 09:22:48 +13:00
Robbie Averill
35c3a8c68d FIX 'Search' text in default search form should be a placeholder 2018-11-16 17:18:12 +02:00
micmania1
4896004b50 BUGFIX reverting to publish still shows draft changees 2018-11-16 14:12:01 +13:00
Robbie Averill
03869b1627 Remove undefined variable, should use the baseTable() from the $parentClass 2018-11-15 13:30:33 +02:00
Maxime Rainville
b138eb06ff Revert BackLinkTracking to return Parent Object of the SiteTreeLink rather than SiteTreeLink itself 2018-11-15 15:57:17 +13:00
Maxime Rainville
0bff8728b1 MINOR Speed up DependentPages by shifting existence check to table join 2018-11-14 18:01:29 +13:00
Guy Marriott
814922747a
Merge pull request #2274 from creative-commoners/pulls/4.3/factory-extensibility 
NEW Add update extension hooks for LinkFormFactory subclasses
 2018-11-11 23:09:24 +13:00
Robbie Averill
12907271ff NEW Add update extension hooks for LinkFormFactory subclasses 2018-11-10 14:58:51 +02: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
2773e9c075 API Deprecate CMSPageHistoryController (#2298) 2018-10-24 11:52:39 +13:00
Aaron Carlino
d8f19bd8c2 Merge branch '4.2' into '4' 2018-10-15 13:40:43 +13:00
Aaron Carlino
2f16da936d Merge branch '4.1' into 4.2 2018-10-15 13:32:33 +13:00
Robbie Averill
d1c3a96653
Merge pull request #2290 from open-sausages/pulls/4/lazy-load-gridfield 
MINOR Enable the lazy loading for DependentPages GridField
 2018-10-11 14:00:27 +02:00
Maxime Rainville
974ea3b29d MINOR Remove AbsoluteURL column from DependentPage (#2290) 2018-10-11 14:42:16 +13:00
Maxime Rainville
7f0d4c8634 MINOR Enable the lazy loading for DependentPages GridField 2018-10-09 14:16:43 +13:00
Robbie Averill
6e649b570d FIX CMSMain::duplicate() now checks canCreate() but not canEdit() 2018-10-08 13:55:59 +02:00
Stephan Bauer
c498aa0337 Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink (fixes #865). 2018-10-06 21:32:58 +02:00
Robbie Averill
3b3ce70378
Merge pull request #2279 from creative-commoners/pulls/4.3/searching-for-sugarman 
FIX Update field names in Behat tests for new search form namespacing
 2018-10-02 15:12:33 +02:00
Robbie Averill
f28f70c8af Linting issue 2018-10-02 10:55:34 +02:00
Guy Marriott
b0c4c5a177
FIX Updating SiteTree search fields to work with new search namespacing 2018-10-01 17:07:51 +13:00
Sam Minnee
bd37b90a3a NEW: Add CMSMain.enable_archive_warning_message config 
This lets you disable this expensive message generation on larger sites
where that is a problem. Speeding it up is obviously a preferred
solution (or removing this feature until that is possible), but this
config option is a simpler solution to the problem in the short term.
 2018-09-28 15:02:40 +12:00
Sam Minnée
5bfc37ff4b FIX: Use Hierarchy::prepopulateTreeDataCache() in CMS (#2266) 
* FIX: Use Hierarchy::prepopulate_numchildren_cache in tree-generation

Only relevant if https://github.com/silverstripe/silverstripe-framework/pull/8380 is avialable,
however coded defensively so it can be merged before that PR if needs 
be.

See https://github.com/silverstripe/silverstripe-framework/issues/8379

* FIX: Use Hierarchy::prepopulateTreeDataCache() in CMS.

Requires https://github.com/silverstripe/silverstripe-framework/pull/8395

* Cache tree_class instead of assuming it will always be SiteTree.
 2018-09-25 15:14:16 +12:00
Maxime Rainville
5c102decbd FIX Improve performance of CMSMain::getArchiveWarningMessage (#2231) 
* FIX Improve performance of CMSMain::getArchiveWarningMessage

* Remove private method

* Linting
 2018-09-13 15:52:54 +12:00
Luke Edwards
aa3760ed66
Merge pull request #2247 from open-sausages/pulls/4.2/2227-show-link-tracking 
API: Add `show_link_tracking` config to `SiteTreeLinkTracking` extension
 2018-09-13 14:23:54 +12:00
bergice
115ed92e0a API: Add show_sitetree_link_tracking config to SiteTreeLinkTracking extension to control visibility of the Link Tracking tab 2018-09-13 11:01:33 +12:00
Aaron Carlino
0f00de78ad Set locale on datefields from current user 2018-09-06 09:41:52 +12:00
Luke Edwards
2fbeda1564
ADD New search component for SiteTree (#2224) 2018-09-04 13:13:33 +12:00
Robbie Averill
eae155a228
Merge pull request #2239 from pine3ree/patch-3 
simplify code using !empty
 2018-08-18 09:28:15 +12:00
maks
599e198e89
simplify code using !empty 
Hello @robbieaverill, please check my assumption...it's been a long time since I have last used SS (v3.2 was my last, if i remember correctly)
in the following lines 438:
```php
        if (isset($this->templates[$action]) && $this->templates[$action]
            || (isset($this->templates['index']) && $this->templates['index'])
            || $this->template
        ) {
            return parent::getViewer($action);
        }
```
it looks like the 1st two (same-line) condition should be wrapped inside `()` while checking for a non-index action template .... if not just kill this PR at once. :-)
if the answer is yes then we can just use `!empty(...)` which is the same as 'isset(...) + truthy check'

kind regards, 
maks
 2018-08-17 14:51:36 +02:00
maks
75bc2da406
use identity operator + code consistency 
- use identity operator === to check string
- use single quotes for consistency 
- simplify code using the ternary operator
 2018-08-17 14:38:24 +02: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
d1112f25b9
Merge pull request #2214 from wilr/patches/anchor-extension 
NEW add SiteTree::updateAnchorsOnPage() for defining content anchors
 2018-07-16 10:07:03 +12:00