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
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
Robbie Averill
24ab6a90e1
Merge pull request #2121 from creative-commoners/pulls/4.2/history-viewer
...
NEW Add page GraphQL query HOC for history viewer component
2018-03-29 10:36:42 +13:00
Robbie Averill
cee2e48025
Rename readOnePage GraphQL query to ReadHistoryViewerPage
2018-03-27 13:46:09 +13:00
Daniel Hensby
cf5a0984ad
FIX Correct SilverStripeNavigator correctly in templates
2018-03-22 14:40:14 +00:00
Daniel Hensby
2366b09d50
Merge pull request #2129 from open-sausages/pulls/4/stage-by-get-param
...
Fix versioned regressions
2018-03-22 13:23:57 +00:00
Damian Mooyman
8c6c429994
Update API to remove deprecated useDraftSite()
...
Update to support versioned enhancements
2018-03-22 17:12:12 +13:00
Robbie Averill
8daf907c4b
Reduce wildcard to specific list of fields and use object spread operators in query
2018-03-22 15:46:59 +13:00
Robbie Averill
8d2dd0e208
Add react-apollo and graphql-tag to dependencies and fix linting in history viewer components
2018-03-22 10:51:53 +13:00
Robbie Averill
1a82f0364a
NEW Add page GraphQL query HOC for history viewer component
...
Relies on silverstripe/versioned-admin being installed on SS 4.2 or above.
2018-03-22 10:51:53 +13:00
Daniel Hensby
78e82dabe8
Merge branch '3' into 4
2018-03-18 09:18:20 +00:00
Daniel Hensby
dd0a46f5ba
Merge branch '4.1' into 4
2018-03-18 09:18:19 +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
7cc4ce7895
Merge branch '3.6' into 3
2018-03-18 09:15:47 +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
Daniel Hensby
b62a474ac1
Merge branch '4.1' into 4
2018-03-16 15:14:54 +00:00
Steve Dixon
d096eb7c36
FIX: Remove SearchForm results() function from allowed_actions
2018-03-15 11:53:12 +11:00
Damian Mooyman
354d72165e
Update CMS for versioned enhancements ( #2122 )
2018-03-14 16:34:46 +13:00
Damian Mooyman
9bf05b397f
Update translations
2018-03-14 09:45:54 +13:00
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
