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

178 Commits

Author SHA1 Message Date
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
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
micmania1
4896004b50 BUGFIX reverting to publish still shows draft changees 2018-11-16 14:12:01 +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
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
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
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
Maxime Rainville
d2f4ded3ef 🐛 Adjust deleteinstallfiles to use PUBLIC_PATH. 2018-05-31 10:12:08 +12:00
Robbie Averill
0f27e9696b Merge branch '4.1' into 4 
# Conflicts:
  #	.travis.yml
 2018-05-28 18:22:07 +12:00
Robbie Averill
7479907333 Merge remote-tracking branch 'origin/4.0' into 4.1 2018-05-28 18:20:46 +12:00
Daniel Hensby
a393de8d8d
Updating code style 2018-05-02 11:54:59 +01:00
Daniel Hensby
ed17eb2bd8
Revert "FIX Correct SilverStripeNavigator correctly in templates" 
This reverts commit cf5a0984ad.
 2018-05-01 13:00:11 +01:00
Daniel Hensby
80a8e9033e
Move navigator casting to static 2018-05-01 12:59:53 +01:00
Damian Mooyman
8c11f83ed4
Merge remote-tracking branch 'origin/4.1' into 4 
# Conflicts:
#	.travis.yml
 2018-04-13 10:25:28 +12:00
Damian Mooyman
61429c17a6
Merge remote-tracking branch 'origin/4.0' into 4.1 
# Conflicts:
#	.travis.yml
 2018-04-13 10:03:47 +12:00
Damian Mooyman
87d69ba753
ENHANCEMENT Use i18n template for page tree title 2018-04-10 10:30:49 +12:00
Jason Korth
e554e82afa
adjustment to show Page Type title on SiteTree mouseover 2018-04-09 21:52:07 +01:00
Damian Mooyman
48f53a522a
Merge remote-tracking branch 'origin/4.1' into 4 2018-04-05 08:38:24 +12:00
Damian Mooyman
c6af8856c8
Merge remote-tracking branch 'origin/4.0' into 4.1 
# Conflicts:
#	code/Controllers/ContentController.php
 2018-04-05 08:37:48 +12:00
Daniel Hensby
cf5a0984ad
FIX Correct SilverStripeNavigator correctly in templates 2018-03-22 14:40:14 +00:00
Damian Mooyman
354d72165e Update CMS for versioned enhancements (#2122) 2018-03-14 16:34:46 +13:00
Daniel Hensby
d02c15150b
Merge branch '4.1' into 4 2018-02-21 14:02:52 +00:00
Daniel Hensby
47fdc4c589
Merge branch '4.0' into 4.1 2018-02-21 14:02:17 +00:00
Damian Mooyman
289d6a87a2
MINOR Simplify i18n keys 2018-02-21 10:32:13 +13:00
Robbie Averill
9ebea37b33 NEW Add extension point to CMSMain::Breadcrumbs 2018-02-20 14:28:25 +13:00
Damian Mooyman
3be0478e1c
BUG Fix behaviour towards versioned but unstagable records 2018-02-20 11:03:23 +13:00
Daniel Hensby
9d77d32dea
Merge pull request #2099 from creative-commoners/pulls/4.0/dont-alias-this 
MINOR Stop aliasing $this in history controller callbacks
 2018-02-15 10:01:52 +00:00
Robbie Averill
e3a7a1ffed MINOR Stop aliasing $this in history controller callbacks 2018-02-15 13:38:29 +13:00