Commit Graph

2679 Commits

Author SHA1 Message Date
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
Damian Mooyman
b291306c03
Merge remote-tracking branch 'origin/4.1' into 4
# Conflicts:
#	client/dist/js/bundle.js
2018-02-15 09:24:08 +13:00
Christopher Joe
e05c47a550 Remove passing in record 2018-02-14 14:00:04 +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
Christopher Joe
01514490fe Feature remove File extension for backlink tracking in favour of UsedOnTable form field 2018-02-09 15:33:32 +13:00
Aaron Carlino
ca8b728580 replace save draft / save & publish buttons with save, publish 2018-02-09 12:18:57 +13:00
Robbie Averill
b084fe8177 NEW Convert page history notice to use Bootstrap 4 info alert 2018-02-07 16:47:24 +13:00
Chris Joe
98d1456384
Merge pull request #2088 from open-sausages/pulls/4.0/daft-draft
Add missing button styles to restore draft action
2018-02-07 15:51:48 +13:00
Luke Edwards
168b899917 BUG Add missing button styles to restore draft action 2018-02-07 14:06:21 +13:00
Loz Calver
fb30448033
Merge pull request #2085 from creative-commoners/pulls/4.1/warning-classes
NEW Use Bootstrap alerts instead of legacy message classes for install.php warning
2018-02-02 09:08:49 +00:00
Robbie Averill
f582954aea NEW Use Bootstrap alerts instead of legacy message classes for install.php warning 2018-02-02 13:02:47 +13:00
Chris Joe
07e70148da BUG Add some exist check for tabsets which may not be there (#2079) 2018-01-31 10:45:31 +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
cb2745c737
Refactor and cleanup SiteTreeFileFormFactoryExtension 2018-01-16 16:53:11 +13:00
Mike Cochrane
8b19afe235 File Form missing CMS Usage information 2018-01-16 15:48:15 +13:00
Daniel Hensby
5a77ec8cea
Merge branch '4.0' into 4 2018-01-15 16:19:22 +00:00
Damian Mooyman
23a23043bc Fix successfullyinstalled() (#2069)
Cleanup ContentController.php
2018-01-12 14:39:27 +13:00
Robbie Averill
157aef8eb7 FIX Implement correct subsites namespace in File extension 2018-01-08 15:40:48 +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
210213a455
Fix search behaviour 2017-12-13 18:16:34 +13:00
Damian Mooyman
073cb77500 Trim some unnecessary API 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
8a04e9c46b Fix wrong/confusing url segment 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
b391db4977 Fix search view 2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
042dbbb13d Remember pages view type 2017-12-13 17:10:39 +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
Lee Bradley
7eb04121a6 Change new HTMLEditorField to HTMLEditorField::Create (#2050)
This allows for the field to be overridden using
  the injector e.g.

```yml

SilverStripe\Core\Injector\Injector:
  SilverStripe\Forms\HTMLEditor\HTMLEditorField:
    class: SilverStripers\markdown\forms\MarkdownEditorField
```
2017-12-07 15:36:51 +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
Lee Bradley
1fedc5fc10 API Make CMSMain::getSiteTreeFor() default to null nodeCount (#2029) 2017-11-28 10:09:27 +13:00
Daniel Hensby
c007eab72c
Merge branch '4.0' into 4 2017-11-26 16:01:48 +00:00
Lee Bradley
d3fa8946be
Issue-2034: Fix for Page icons using data urls
Fixes #2034

Code was getting the icon twice, both in SiteTree &
  LeftAndMainPageIconsExtenstion.
Now just uses `SiteTree::getPageIconURL()`
Tweaked to use `sprintf` instead of double quotes
2017-11-23 15:42:31 +00:00
Damian Mooyman
8de154d92c
BUG Restore missing '(Choose Page)' text in link insert modal 2017-11-16 14:43:32 +13:00
Damian Mooyman
53b0090826
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-16 10:18:08 +13:00
Chris Joe
365eabb85a
Merge pull request #2010 from open-sausages/pulls/4.0/deprecated-each
BUG Remove usage of deprecated each()
2017-11-08 16:32:25 +13:00
Damian Mooyman
a9cc93749d
Merge pull request #2011 from open-sausages/pulls/4.0/dont-give-me-a-falsified-report
BUG Fix ambiguous query for content report
2017-11-02 12:03:13 +13:00
Damian Mooyman
6c2d5311d3
Docblock 2017-11-02 11:29:49 +13:00
Chris Joe
0b8c5d7bb0
Merge pull request #2007 from open-sausages/pulls/4.0/site_url_check
BUG Safely check for is_site_url before parsing a shortcode
2017-11-02 10:02:12 +13:00
Damian Mooyman
0946332915
Remove table prefix 2017-11-01 17:19:04 +13:00
Christopher Joe
c331dedae9 BUG Fix ambiguous query for content report 2017-11-01 17:02:00 +13:00
Damian Mooyman
1bdfd05648
BUG Remove usage of deprecated each() 2017-11-01 14:51:14 +13:00
Damian Mooyman
4fb5306008
BUG Safely check for is_site_url before parsing a shortcode 2017-10-30 14:38:31 +13:00
Robbie Averill
4d0632892b FIX Add warning state to revert action in CMS page history 2017-10-27 17:32:00 +13:00
Damian Mooyman
74495b498f
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-25 17:01:34 +13:00
Damian Mooyman
7b71b2868e Merge pull request #1999 from open-sausages/pulls/4.0/you-cannot-see-what-you-cannot-see
FIX revert to this button after archiving
2017-10-24 09:46:08 +13:00
Sam Minnee
494dbd1ef2 Merge branch '4.0' into 4 2017-10-20 18:46:05 +13:00
Christopher Joe
689c198fbe FIX revert to this button after archiving 2017-10-20 09:26:35 +13:00
Damian Mooyman
77b26b36fd
BUG Fix page icons in vendor modules 2017-10-19 15:41:12 +13:00
Jake B
1013c2b006 DOC: Update comment to inform the correct location of the PageIconCSS generation code 2017-10-18 15:23:39 +11:00