Daniel Hensby
|
df5042dc0f
|
Merge branch '4.0' into 4.1
|
2018-07-23 14:48:49 +01:00 |
|
Loz Calver
|
9dce915d78
|
Merge pull request #2212 from creative-commoners/pulls/4.1/revert-button-class
FIX Restore button now has warning colour and correct icon
|
2018-07-13 09:28:21 +01:00 |
|
Robbie Averill
|
e80c7e712b
|
FIX Restore button now has warning colour and correct icon
|
2018-07-13 12:11:33 +12:00 |
|
Damian Mooyman
|
6acaa0cd27
|
Update translations
|
2018-06-19 16:50:07 +12:00 |
|
Damian Mooyman
|
932eb2b22d
|
BUG Fix CMS components failing to register on other CMS sections (#2182)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/7996
|
2018-06-13 13:11:06 +12:00 |
|
Robbie Averill
|
7479907333
|
Merge remote-tracking branch 'origin/4.0' into 4.1
|
2018-05-28 18:20:46 +12:00 |
|
Daniel Hensby
|
01b211e28a
|
Merge pull request #2162 from creative-commoners/pulls/4.1/fix-behat
Make Behat green again, again
|
2018-05-10 12:59:00 +01:00 |
|
Robbie Averill
|
f763417506
|
Ensure Behat runs on correct Chrome version in Travis
|
2018-05-07 17:08:48 +12:00 |
|
Robbie Averill
|
8c8e8f21bd
|
Merge pull request #2159 from dhensby/pulls/4.0/ssnaviagtor-casting-config
Pulls/4.0/ssnaviagtor casting config
|
2018-05-03 09:30:45 +12:00 |
|
Daniel Hensby
|
a393de8d8d
|
Updating code style
|
2018-05-02 11:54:59 +01:00 |
|
Daniel Hensby
|
ed17eb2bd8
|
Revert "FIX Correct SilverStripeNavigator correctly in templates"
This reverts commit cf5a0984ad.
|
2018-05-01 13:00:11 +01:00 |
|
Daniel Hensby
|
80a8e9033e
|
Move navigator casting to static
|
2018-05-01 12:59:53 +01: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 |
|