Damian Mooyman
90723a2f07
Merge remote-tracking branch 'origin/4.1' into 4
2018-03-13 14:35:13 +13:00
Damian Mooyman
7fc50ef2ed
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:34:14 +13:00
Chris Joe
a02410b983
Merge pull request #2120 from open-sausages/pulls/4.0/fix-in-section
...
BUG Fix InSection failing on non-page controllers
2018-03-12 13:17:55 +13:00
Damian Mooyman
2b9faf46fe
BUG Fix InSection failing on non-page controllers
...
Fixes #2119
2018-03-12 10:31:40 +13:00
Loz Calver
3eae840679
Merge pull request #2116 from open-sausages/pulls/4.0/fix-page-icons
...
BUG Fix invalid css classname in virtualpage
2018-03-05 08:57:34 +00:00
Damian Mooyman
dde1349368
BUG Fix invalid css classname in virtualpage
2018-03-05 14:58:32 +13:00
Damian Mooyman
8c35e3391c
ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites ( #2114 )
2018-03-05 13:42:55 +13:00
Andrew Aitken-Fincham
1ac1ea73f3
add controller_name config var to SiteTree for easier override
2018-03-01 15:52:39 +00:00
Luke Edwards
5735beeb90
ENHANCEMENT Upgrade to Bootstrap 4.0.0-stable and change to reactstrap 5.0.0-beta ( #2101 )
2018-02-28 14:03:01 +13:00
Daniel Hensby
0fd7e63057
Merge branch '4.1' into 4
2018-02-27 11:00:03 +00:00
Daniel Hensby
6a7aed28fd
Merge branch '4.0' into 4.1
2018-02-27 10:59:28 +00:00
Rick Hambrook
012bfec5bf
FIX Bug field help text translations no longer need to be HTML encoded
2018-02-27 11:12:50 +13:00
Damian Mooyman
f059302724
Merge pull request #2106 from Hambrook/4.1
...
FIX Bug field help text translations no longer need to be HTML encoded
2018-02-27 11:10:38 +13:00
Rick Hambrook
289522ba0c
FIX Bug field help text translations no longer need to be HTML encoded
2018-02-22 21:41:11 +13:00
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
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
