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,120 Commits 29 Branches 403 Tags 28 MiB
68f6eaa663
Commit Graph

6120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
3cc37e40f9 Bump branch alias and Travis version for 4.4.x-dev 2018-10-15 14:05:06 +02:00
Robbie Averill
bbc9918f03 Merge branch '4.3' into 4 2018-10-15 14:04:19 +02:00
Aaron Carlino
d44e761835 Remove obsolete branch-alias 2018-10-15 16:31:38 +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
Luke Edwards
a7a4b1e56a
Merge pull request #2288 from creative-commoners/pulls/4.3/upgrade-bootstrap 
MINOR Upgrade Bootstrap to 4.1.2
 2018-10-10 10:06:38 +13:00
Maxime Rainville
790733fc78
Merge pull request #2289 from creative-commoners/pulls/4.3/can-create-to-duplicate 
FIX CMSMain::duplicate() now checks canCreate() but not canEdit()
 2018-10-09 17:06:51 +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
Robbie Averill
c215e0a198 MINOR Upgrade Bootstrap to 4.1.2 2018-10-08 13:19:27 +02:00
Stephan Bauer
c498aa0337 Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink (fixes #865). 2018-10-06 21:32:58 +02:00
Ingo Schommer
1e497d523f
Merge pull request #2244 from creative-commoners/pulls/5.0/snoisrev-history-viewer 
FIX Sort history viewer versions in descending order
 2018-10-05 11:37:16 +13:00
Robbie Averill
0b9bcf382d
Merge pull request #2283 from open-sausages/pulls/4/remove-member-link-tracking 
Member should not have link tracking enabled by default
 2018-10-03 13:32:11 +02:00
bergice
0ecdba3960 Member should not have link tracking enabled by default 2018-10-03 11:01:58 +13: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
Robbie Averill
b3013a98c4 Update testSearchField to expect namespaced search fields 2018-10-01 12:50:20 +02:00
Guy Marriott
b0c4c5a177
FIX Updating SiteTree search fields to work with new search namespacing 2018-10-01 17:07:51 +13:00
Robbie Averill
5a017c0be8
Merge pull request #2281 from sminnee/disable-archive-message 
NEW: Add CMSMain.enable_archive_warning_message config
 2018-09-28 10:22:50 +02: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
Robbie Averill
44b92c90bc FIX Update field names in Behat tests for new search form namespacing 2018-09-27 11:39:42 +02:00
Robbie Averill
d1951c946f FIX Sort history viewer versions in descending order 2018-09-25 18:18:40 +02: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
Andre Kiste
6e7bc38aad
Merge pull request #2258 from open-sausages/pulls/4/image-inary-edit 
Fix 'Insert links into a page' test
 2018-09-21 16:43:56 +12:00
Luke Edwards
13947244c5
Merge pull request #2264 from open-sausages/pulls/4/proppa-pig 
All proptypes replaced with external lib
 2018-09-19 13:13:35 +12:00
Aaron Carlino
c7ae231650 All proptypes replaced with external lib 2018-09-19 08:47:59 +12:00
Robbie Averill
2fe58f8a06 NEW Use Bootstrap alerts throughout the CMS 2018-09-13 18:54:28 +02:00
Robbie Averill
7189653b1f FIX SiteTree Title field should have rounded corners before Update URL button is shown 2018-09-13 17:12:35 +02: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
Robbie Averill
c75c629eb1 Merge branch '4.2' into 4 2018-09-12 14:12:15 +02:00
Robbie Averill
eea9127e70 Merge branch '4.1' into 4.2 2018-09-12 14:11:56 +02:00
Luke Edwards
41c0b8fb85 Fix 'Insert links into a page' test 2018-09-12 13:14:06 +12:00
Robbie Averill
6bdf9a8ccc
Merge pull request #2253 from open-sausages/pulls/4/date-languish 
Set locale on datefields from current user
 2018-09-10 16:05:18 +02:00
Luke Edwards
6dac09a03e
Merge pull request #2248 from open-sausages/pulls/4.1/hire-our-quay 
MINOR: Add CMS specific hierarchy config
 2018-09-10 14:43:44 +12:00
Robbie Averill
d0cd066ab8
Merge pull request #2255 from open-sausages/pulls/4/a-test-for-another-time 
Disable page search test scenarios involving date due to localisation issue
 2018-09-07 09:21:32 +02:00
Luke Edwards
f3da10119e Disable page search test scenarios involving date due to bug 2018-09-07 12:11:57 +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
Aaron Carlino
463319e52b Add CMS specific hierarchy config 2018-09-03 16:31:15 +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
Robbie Averill
b4dfefd97d
Merge pull request #2238 from pine3ree/patch-2 
use identity operator + code consistency
 2018-08-18 09:28:01 +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
Robbie Averill
13625547d3 Merge branch '4.2' into 4 2018-08-17 21:54:24 +12:00
Robbie Averill
4c8a76f21e
Merge pull request #2226 from creative-commoners/pulls/4.2/uncatch-all 
FIX Separating ModelAsController catch-all route
 2018-08-17 21:35:27 +12:00
Robbie Averill
66ba34889e Merge branch '4.2' into 4 2018-08-16 11:47:49 +12:00