Daniel Hensby
0647dee8f0
Fix travis
2018-02-21 16:54:27 +00:00
Daniel Hensby
ad0563d855
Merge branch '3' into 4
2018-02-21 14:07:11 +00: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
Tim Burt
92c0424d73
Update URL in $meta_generator property of SiteTree to https
2018-02-21 09:10:50 +00:00
Daniel Hensby
7e619da62a
Merge pull request #2102 from open-sausages/pulls/4.0/fix-unstaged-versioned
...
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 21:57:08 +00:00
Damian Mooyman
289d6a87a2
MINOR Simplify i18n keys
2018-02-21 10:32:13 +13:00
Damian Mooyman
83c4ab8d18
BUG Fix test regressions in CMS page filters
2018-02-21 10:32:00 +13:00
Damian Mooyman
8929eae604
Merge pull request #2100 from creative-commoners/pulls/4.1/extensible-cmsmain-breadcrumbs
...
NEW Add extension point to CMSMain::Breadcrumbs
2018-02-20 17:46:54 +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
319a46087d
Update translations
2018-02-15 11:13:15 +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
Damian Mooyman
165b6e1400
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# client/dist/js/bundle.js
2018-02-15 09:21:41 +13:00
Chris Joe
b8fd7e2468
Merge pull request #2098 from open-sausages/pulls/4.1/upgrade-test-usage
...
Update reference to TestAssetStore
2018-02-14 20:46:31 +13:00
Damian Mooyman
0830d6dcb7
Update reference to TestAssetStore
2018-02-14 16:27:43 +13:00
Damian Mooyman
21cc61c9a6
Merge pull request #2094 from open-sausages/pulls/4/dont-forget-to-recycle-reuse-and-reduce
...
Feature remove File extension for backlink tracking
2018-02-14 14:46:39 +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
Damian Mooyman
ee5084815f
Merge pull request #2092 from creative-commoners/pulls/4.0/remove-entwine-printable
...
FIX remove now superfluous print action destroyer
2018-02-09 12:50:58 +13:00
Aaron Carlino
ca8b728580
replace save draft / save & publish buttons with save, publish
2018-02-09 12:18:57 +13:00
Dylan Wagstaff
d86e5dfc88
FIX remove now superfluous print action destroyer
...
There exists functionality in the CMS to print various pages via the
`printable` action on `SilverStripe\Admin\LeftAndMain` - however this
appears to be no longer activated by default. The accompanying legacy
(entwine) javascript dynamically accesses this action by chaning the
HTML form `action` attribute whenever a `FormAction` named `print` is
clicked on an EditForm. Unfortunately this is almost all of them - which
blocks the correct functionality of
`SilverStripe\Forms\GridField\GridFieldPrintButton`
which provides it's own action handling via proper SilverStripe routing.
Since print buttons are no longer a part of the various parts of the CMS
any longer, it appears easiest to simply remove this legacy javascript.
2018-02-09 11:26:32 +13:00
Damian Mooyman
77cb41a926
Merge pull request #2089 from open-sausages/pulls/4.0/remove-the-soft-disable
...
Fix warning appearing when button is disabled for rollback
2018-02-08 11:09:32 +13:00
Loz Calver
46a445d7fc
Merge pull request #2090 from creative-commoners/pulls/4.1/bs4-history-notice
...
NEW Convert page history notice to use Bootstrap 4 info alert
2018-02-07 09:21:00 +00:00
Damian Mooyman
4719670e31
Update .travis.yml
2018-02-07 17:31:07 +13:00
Damian Mooyman
443501730b
Update alias for 1 branch to 1.2
2018-02-07 17:29:24 +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
1d67f75dc8
Update translations
2018-02-07 16:07:28 +13:00
Christopher Joe
b5f68ebed2
Fix warning appearing when button is disabled for rollback
2018-02-07 15:53:57 +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
Damian Mooyman
4450d150e8
Merge remote-tracking branch 'origin/4.0' into 4
2018-02-05 18:03:03 +13:00
Damian Mooyman
e84e0236f1
Update translations
2018-02-05 16:58: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
Damian Mooyman
a3edbd6d34
Merge pull request #2046 from dhensby/pulls/3/php7.2
...
Add PHP7.2 support
2018-02-02 09:25:46 +13:00
Daniel Hensby
23d84e6285
Make travis test against 3.x-dev
2018-02-01 17:24:00 +00: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
Daniel Hensby
b9f2f1d4b3
Add PHP7.2 support
2018-01-30 16:51:32 +00:00
Daniel Hensby
1db01ecce6
Merge pull request #2077 from open-sausages/pulls/4/better-url-reservation
...
ENHANCEMENT Ensure all base folders are excluded
2018-01-25 12:24:36 +00: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
540883f9de
Merge remote-tracking branch 'origin/4.0' into 4
2018-01-25 13:33:47 +13:00
Damian Mooyman
0ba7606828
Update translations
2018-01-25 12:15:35 +13:00
Damian Mooyman
cdc0aa8a5b
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# client/dist/js/bundle.js
2018-01-22 15:16:14 +13:00
Robbie Averill
2694de7d9b
Merge pull request #2074 from sachajudd/pulls/4.0/url-button-styles
...
FIX Add bootstrap styles to url segment field
2018-01-18 16:20:07 +13:00
Sacha Judd
f282df89ea
FIX Add bootstrap styles to url segment field
2018-01-18 12:28:01 +13:00
Daniel Hensby
b9755f0e82
Merge pull request #2044 from mikenz/asset-admin-missing-cms-usage
...
File Form missing CMS Usage information
2018-01-16 08:35:26 +00:00
