Commit Graph

5898 Commits

Author SHA1 Message Date
Robbie Averill
7b8c2c1449 Merge branch '4.1' into 4.2 2018-08-16 11:47:19 +12:00
Maxime Rainville
8ec551e57b BUGFIX: Broken "show as list" (#2232)
* Various refactoring to support viewing list view in context menu and suppressed tree node

* Bugfixes per Maxime review

* Fix URL param collision

* Fix show in list on detail view

* Remove AJAX for show in list. Use hard refresh to keep URL state
2018-08-14 16:08:36 +12:00
Luke Edwards
98ca0c3026
Merge pull request #2223 from creative-commoners/pulls/4.2/afterrr
FIX CMS routes are now run after #coreroutes without re-including itself
2018-08-07 14:15:44 +12:00
Robbie Averill
df7396e884 FIX CMS routes are now run after #coreroutes without re-including itself 2018-08-07 11:51:49 +12:00
root
c611c981e4 Update translations 2018-07-30 14:12:45 +00:00
Daniel Hensby
aacb405b41
Merge tag '4.2.0' into 4.2
Release 4.2.0
2018-07-30 11:10:04 +01:00
root
d970d57ed9 Update translations 2018-07-24 19:07:48 +00:00
Robbie Averill
0495ff20f5
Update Postgres version in Travis builds for 4.2.x 2018-07-23 19:26:34 +01:00
Daniel Hensby
b653ebfe7a
Merge branch '4.1' into 4.2 2018-07-23 14:50:50 +01:00
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
Robbie Averill
21d18951f0
Update Postgres version in Travis builds for 4.2.x 2018-06-25 14:42:02 +12:00
Robbie Averill
5b8242c596
Merge pull request #2198 from creative-commoners/pulls/4.2/update-illegal-extensions
Update illegal extensions
2018-06-20 13:38:01 +12:00
Raissa North
6b2a9e4f77 Update class references and array syntax 2018-06-20 13:18:29 +12:00
Robbie Averill
e515423c26
Merge pull request #2197 from creative-commoners/pulls/4.2/update-class-references-and-array-syntax
Update class references and array syntax in VirtualPageTest
2018-06-20 10:37:41 +12:00
Raissa North
5f3e95cd64 Update class references and array syntax in VirtualPageTest 2018-06-20 10:17:38 +12:00
Damian Mooyman
6acaa0cd27 Update translations 2018-06-19 16:50:07 +12:00
Damian Mooyman
85c5edd523 Update translations 2018-06-15 15:39:15 +12:00
Damian Mooyman
130c28bc86 Remove obsolete branch-alias 2018-06-15 15:29:57 +12:00
Ingo Schommer
471ecd1148
Merge pull request #2190 from open-sausages/pulls/4/update-recipe-branch
Update recipe branching
2018-06-14 16:45:36 +12:00
Damian Mooyman
609b4208bf
Update recipe branching 2018-06-14 13:50:26 +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
Maxime Rainville
d2f4ded3ef 🐛 Adjust deleteinstallfiles to use PUBLIC_PATH. 2018-05-31 10:12:08 +12:00
Robbie Averill
0f27e9696b Merge branch '4.1' into 4
# Conflicts:
  #	.travis.yml
2018-05-28 18:22:07 +12:00
Robbie Averill
7479907333 Merge remote-tracking branch 'origin/4.0' into 4.1 2018-05-28 18:20:46 +12:00
Chris Joe
dc1af4d264
Merge pull request #2170 from open-sausages/pulls/4/sole-provider
BUGFIX: Add Provider to isolated Apollo components.
2018-05-21 21:48:54 +12:00
Aaron Carlino
6bda44b4c5 Add Provider to isolated Apollo components. 2018-05-21 20:52:48 +12:00
Robbie Averill
e3237f9638 NEW Add revert mutation and refactor injector transformations (#2158)
* NEW Add revert mutation and refactor injector transformations

Removing the existing HOC component and just using Injector transformations to apply the GraphQL query and mutation

* Refetch versions after performing the revert mutation

* WIP Provide additional context
2018-05-17 15:36: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
Daniel Hensby
66e5b15663
Merge pull request #2145 from open-sausages/pulls/4/fix-version-revert-button
BUG Fix rollback button from not working
2018-04-19 10:48:43 +01:00
Damian Mooyman
0d40b54537
BUG FIx rollback button from not working 2018-04-17 12:26:45 +12:00
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
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
Damian Mooyman
09a3c9a05b
Merge pull request #2143 from creative-commoners/pulls/4.2/bootstrapp
FIX Fixture the 'app' dir instead of mysite in unit tests
2018-04-12 11:35:00 +12:00
Robbie Averill
5da708d223 FIX Fixture the 'app' dir instead of mysite in unit tests 2018-04-11 19:04:45 +12:00
Robbie Averill
c4f8af543c NEW Add AbsoluteLink to history viewer page GraphQL query (#2142) 2018-04-11 15:40:12 +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
6c616f5f7a API Implement polymorphic sitetree link tracking (#2123)
* WIP Implement polymorphic sitetree link tracking

* Update unit tests
Merge SiteTreeTrackedPage into SiteTree directly

* Fix bugs and issues

* Fix support for file link tracking

* Add missing use

* Add back deprecated extension

* Remove obsolete belongs_many_many

* Update deprecations

* BUG Ensure non-SiteTree records support link tracking

* Safer changed check

* Shift file tracking test to assets module

* Better check for live stage on versioning

* Deprecate method

* Cleanup virtualpage

* Clear records on delete

* Ensure upgrade task occurs on draft

* fix linting
2018-04-06 15:53:57 +12:00
Damian Mooyman
48f53a522a
Merge remote-tracking branch 'origin/4.1' into 4 2018-04-05 08:38:24 +12:00