Commit Graph

143 Commits

Author SHA1 Message Date
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
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
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
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
Damian Mooyman
23a23043bc Fix successfullyinstalled() (#2069)
Cleanup ContentController.php
2018-01-12 14:39:27 +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
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
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
Robbie Averill
4d0632892b FIX Add warning state to revert action in CMS page history 2017-10-27 17:32:00 +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
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
Damian Mooyman
c8f95182cb
Fix icon urls 2017-10-10 17:03:22 +13:00
Damian Mooyman
49fd3391fe BUG Prevent icons CSS being included twice 2017-10-05 10:04:57 +13:00
Chris Joe
fb9ad4453e Merge pull request #1973 from open-sausages/pulls/4.0/update-classinfo-usages
Update usages of ClassInfo
2017-09-20 16:29:37 +12:00
Damian Mooyman
fa0b559a7b
Update usages of ClassInfo
Add missing unit tests for SiteTreeFolderExtension
2017-09-20 15:20:17 +12:00
Damian Mooyman
496b9c8c04 API Implement insert-anchor modal 2017-09-20 13:35:25 +12:00
Robbie Averill
d18568c395 FIX Ensure client config merging includes existing parent "form" attributes 2017-09-15 09:12:53 +12:00
Saophalkun Ponlu
4f3b4f7626 FIX Fine-tune button styles 2017-09-13 10:44:11 +12:00
Damian Mooyman
4b26ed6a83
BUG Prevent treeview loading repeatedly on each page edit form
Fixes #1949
2017-09-05 11:52:04 +12:00
Damian Mooyman
1273059b4c Fix campaign form validation errors 2017-09-04 14:47:45 +12:00
Damian Mooyman
9350b4a425
BUG Fix inconsistent breadcrumbs in CMS section
Fixes #1867
2017-08-28 13:03:56 +12:00
Saophalkun Ponlu
d0fd96d4e6 FIX Remove entry points to tree in search mode 2017-08-28 11:00:41 +12:00
Andrew Aitken-Fincham
46abf8ffd5 sanitize namespaced classes for page icon css 2017-08-24 12:00:33 +01:00
Saophalkun Ponlu
d03edb208e
FIX Search in page edit should now redirect to (full) table view 2017-08-24 13:50:05 +12:00
Loz Calver
9a9b4e205c Merge pull request #1929 from robbieaverill/pulls/4.0/replace-stat-usage
Replace use of Configurable stat() with config()->get(), will be deprecated in future
2017-08-23 10:26:45 +01:00
Robbie Averill
f2e22ef18a Replace use of Configurable stat() with config()->get(), will be deprecated in future 2017-08-23 09:46:46 +12:00