Robbie Averill
f763417506
Ensure Behat runs on correct Chrome version in Travis
2018-05-07 17:08:48 +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
Robbie Averill
593640975c
Merge pull request #2144 from open-sausages/pulls/4.0/selenium-upgrade
...
Update selenium to chromedriver
2018-04-12 17:21:31 +12:00
Damian Mooyman
796d69c72e
Update selenium to chromedriver
2018-04-12 16:06:49 +12:00
Robbie Averill
69b2f90c6d
Merge pull request #2141 from open-sausages/pulls/4.0/template-page-name
...
ENHANCEMENT Use i18n template for page tree title
2018-04-11 10:21:32 +12:00
Damian Mooyman
87d69ba753
ENHANCEMENT Use i18n template for page tree title
2018-04-10 10:30:49 +12:00
Daniel Hensby
0fcff60fb4
Merge pull request #2140 from korthjp17/enhancement/siteTreePageTypeHover
...
adjustment to show Page Type title on SiteTree mouseover
2018-04-09 22:26:35 +01:00
Jason Korth
e554e82afa
adjustment to show Page Type title on SiteTree mouseover
2018-04-09 21:52:07 +01: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
Robbie Averill
3d2d607be1
Merge pull request #2132 from dhensby/pulls/4.0/ssnaviagtor-casting
...
FIX Correct SilverStripeNavigator correctly in templates
2018-04-04 11:37:39 +12:00
Daniel Hensby
cf5a0984ad
FIX Correct SilverStripeNavigator correctly in templates
2018-03-22 14:40:14 +00:00
Daniel Hensby
7dea009ad8
Merge branch '4.0' into 4.1
2018-03-18 09:17:51 +00:00
Daniel Hensby
00fea26be9
Merge branch '3.6' into 4.0
2018-03-18 09:17:20 +00:00
Daniel Hensby
878443d478
Merge branch '3.5' into 3.6
2018-03-18 09:15:16 +00:00
Steve Dixon
d17d93f784
FIX: Remove SearchForm results() function from allowed_actions
2018-03-18 09:14:38 +00:00
Daniel Hensby
2052a42066
Merge pull request #2126 from rotassator/3.6
...
FIX: Remove SearchForm results() function from allowed_actions
2018-03-18 08:58:09 +00:00
Steve Dixon
d096eb7c36
FIX: Remove SearchForm results() function from allowed_actions
2018-03-15 11:53:12 +11:00
Damian Mooyman
9bf05b397f
Update translations
2018-03-14 09:45:54 +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
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
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
Damian Mooyman
319a46087d
Update translations
2018-02-15 11:13:15 +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
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
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
443501730b
Update alias for 1 branch to 1.2
2018-02-07 17:29:24 +13:00
Damian Mooyman
1d67f75dc8
Update translations
2018-02-07 16:07:28 +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
