Commit Graph

5601 Commits

Author SHA1 Message Date
Robbie Averill
b347ab866d NEW Add version provider configuration 2017-07-04 23:32:54 +12:00
Robbie Averill
4c1dbd402b NEW Change "only these people" to "only these groups" in permissions 2017-07-03 21:39:53 +12:00
Damian Mooyman
184ec65b7f Update translations 2017-07-03 17:17:41 +12:00
Damian Mooyman
b0144bf8ce Remove obsolete branch-alias 2017-07-03 16:53:53 +12:00
Chris Joe
0c6a929a68 Merge pull request #1879 from open-sausages/pulls/4.0/upgrader-tweaks
Update code for upgrader
2017-07-03 16:17:49 +12:00
Damian Mooyman
19b3aa29e7
Exclude legacy.yml for upgrade 2017-07-03 14:54:45 +12:00
Damian Mooyman
8bb325f3ca
Fix upgrade paths 2017-07-03 14:29:00 +12:00
Damian Mooyman
e5cd8c0d4b Merge pull request #1874 from sminnee/get-one-miss-null
FIX: Test updates to comply with DataObject::get_one cahnge
2017-06-30 14:50:29 +12:00
Damian Mooyman
99f9d4a2d3
Fix assertions 2017-06-30 14:23:37 +12:00
Sam Minnee
522af3f29d FIX: Test updates to comply with https://github.com/silverstripe/silverstripe-framework/pull/7083 2017-06-29 14:39:28 +12:00
Daniel Hensby
9816efc97f
Merge branch '3' 2017-06-28 15:21:22 +01:00
Ingo Schommer
b89aa98402 Merge pull request #1871 from sminnee/resource-loading
NEW: Remove use of MODULE_DIR constants
2017-06-28 21:24:52 +12:00
Sam Minnee
ef6db273a1 API: Remove CMS_PATH and CMS_DIR 2017-06-28 16:34:05 +12:00
Sam Minnee
ce730319ec NEW: Remove use of MODULE_DIR constants
This relies on
https://github.com/silverstripe/silverstripe-framework/pull/7065
2017-06-28 16:34:05 +12:00
Damian Mooyman
29bb49105f Merge pull request #1840 from open-sausages/pulls/4.0/view-add-perms-clarification
List "view/edit all" groups in group permission field
2017-06-28 12:22:34 +12:00
Damian Mooyman
2251138bed Merge pull request #1862 from robbieaverill/pulls/4.0/fix-missing-memberauthenticator
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-28 12:10:28 +12:00
Daniel Hensby
44e9484aa4
Merge branch '3.6' into 3 2017-06-27 13:13:04 +01:00
Daniel Hensby
aff9b7fb32
Merge tag '3.6.1' into 3.6
Release 3.6.1
2017-06-27 12:57:51 +01:00
Daniel Hensby
72024a5270 Merge pull request #1858 from open-sausages/pulls/4.0/1780-cms-view-toggle
Visual updates to page view toggle
2017-06-27 11:49:56 +01:00
Saophalkun Ponlu
4fb6e70bb8
Visual updates to page view toggle 2017-06-27 11:39:35 +01:00
Loz Calver
755289b8cd Merge pull request #1869 from open-sausages/pulls/4.0/fix-behat
BUG Don’t click hidden button
2017-06-27 09:28:06 +01:00
Damian Mooyman
af1654eda3 BUG Don’t click hidden button 2017-06-27 17:22:21 +12:00
Damian Mooyman
c4a4b9ea6d Merge pull request #1849 from jonom/errorpage-separation
Removed ErrorPage
2017-06-27 14:29:47 +12:00
Chris Joe
b34519e7e8 Fix insert link modal to work with new injector API (#1860) 2017-06-27 11:06:39 +12:00
Jonathon Menz
77ec2b90c6 API Removed ErrorPage
Removed ErrorPage class and references so it can be split off in to a separate module. Please install https://github.com/silverstripe/silverstripe-errorpage when upgrading to SS4 to preserve ErrorPage functionality. Closes https://github.com/silverstripe/silverstripe-framework/issues/4149
2017-06-26 10:01:54 -07:00
Chris Joe
1afd2c4c51 Merge pull request #1853 from open-sausages/pull/4.0/101-custom-more-options
More options dropdown label change to icon
2017-06-26 13:04:43 +12:00
Saophalkun Ponlu
d752365047 More options dropdown label change to icon 2017-06-26 11:58:57 +12:00
Ingo Schommer
ad347af76f Fix linter 2017-06-23 11:59:10 +12:00
Robbie Averill
c2ad41ef1b FIX Allow RedirectorPage to have non-redirected actions, move redirection to index 2017-06-23 11:23:31 +12:00
Robbie Averill
8d23cfc2aa FIX Ensure LoginForm on ContentController can load the member authenticator correctly 2017-06-23 11:22:01 +12:00
Ingo Schommer
ecbd778547 Merge pull request #1854 from open-sausages/pulls/4.0/app-object
[WIP] App object refactor
2017-06-22 22:59:44 +12:00
Damian Mooyman
9936499606
Prevent duplicate page tests failing to race conditions 2017-06-22 14:58:26 +12:00
Damian Mooyman
8cebb2758d Fix behat issues 2017-06-21 21:04:55 +12:00
Damian Mooyman
c2c75aa9e3
Fix and upgrade all tests
Fix link tracking
2017-06-21 16:29:40 +12:00
Damian Mooyman
95e304a4ca Upgrade usage of global methods 2017-06-20 17:12:18 +12:00
Damian Mooyman
7fe808da29 Update session references 2017-06-20 17:12:18 +12:00
Damian Mooyman
21e204cc59 App object refactor 2017-06-20 17:12:18 +12:00
Chris Joe
d14e000e66 Merge pull request #1793 from open-sausages/pulls/4.0/requirements-html-cleanup
Update HTMLValue and FormField::create_tag usages
2017-06-16 15:13:51 +12:00
Damian Mooyman
93a185e44a Update HTMLValue and FormField::create_tag usages 2017-06-16 11:44:36 +12:00
Daniel Hensby
8a426a40de Merge pull request #1852 from AntonyThorpe/addForm_setStrictFormMethodCheck
Bugfix: SS4 Right click, add page fails
2017-06-15 14:07:08 +01:00
Daniel Hensby
05bb2fef1b
Merge pull request #1851 from open-sausages/pulls/3.6/revert-lang-update 2017-06-15 12:50:49 +01:00
Ingo Schommer
a5a8982af6 Revert "Update translations"
This reverts commit 475b733579.

It pulled updates from transifex *after* we switched translations
to 4.x only mode - which resulted in a lot of translation keys being
moved around. For example, asset-related translations went from
framework to the asset-admin module. The removal of these translations
in 3.x caused translations to go partially missing, since these new
modules are 4.x only.

See https://github.com/silverstripe/silverstripe-framework/issues/7002
2017-06-15 14:50:56 +12:00
Antony Thorpe
fdbe38d444 Bugfix: SS4 Right click, add page fails
`addForm` receives both POSTs and GETs.  Set the form's `strictFormMethodCheck` to false to avoid `405 Method Not Allowed` error response.  Issue #1846.
2017-06-15 13:53:38 +12:00
Daniel Hensby
6b9e48aad1
Merge branch '3.6' into 3 2017-06-14 12:14:53 +01:00
Daniel Hensby
54e438fb9e
Merge branch '3.5' into 3.6 2017-06-14 12:14:02 +01:00
Damian Mooyman
d88a7ba54f Merge pull request #1847 from open-sausages/pulls/4.0/retain-your-compose
Fix composer requirements
2017-06-10 08:55:16 +12:00
Christopher Joe
10196e4f75 Fix composer requirements 2017-06-09 23:44:28 +12:00
Chris Joe
1af5957433 Merge pull request #1842 from Firesphere/authenticator-refactor
[WIP] Make CMS Compatible with Authentication Refactor work
2017-06-09 22:14:55 +12:00
Simon Erkelens
b2fd014216 Make CMS Compatible with Authentication Refactor work
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12:00
Damian Mooyman
1c195230bd Merge pull request #1845 from mfendeksilverstripe/3.5
Count children time / memory issues fix
2017-06-08 14:59:57 +12:00