Commit Graph

5534 Commits

Author SHA1 Message Date
Saophalkun Ponlu
fca3ba73f5 FIX Pages search now defaults to list view 2017-07-25 12:57:46 +12:00
Damian Mooyman
bed501c0fe Merge pull request #1907 from silverstripe/pulls/4.0/content-controller-project
BUGFIX: ContentController still using global $project;
2017-07-24 10:43:15 +12:00
Loz Calver
6dd063a28c Merge pull request #1908 from dhensby/pulls/4/yml-fix
FIX Yaml syntax
2017-07-21 16:32:29 +01:00
Daniel Hensby
d49a5f5af3
FIX Yaml syntax 2017-07-21 11:48:45 +01:00
Aaron Carlino
fbb63e68e1 Remove whitespace 2017-07-21 10:10:53 +12:00
Aaron Carlino
cc6b44223e BUGFIX: ContentController still using global $project; 2017-07-21 09:56:41 +12:00
Daniel Hensby
e38a0c49dd Merge pull request #1863 from robbieaverill/pulls/4.0/allow-redirectorpage-actions
FIX Allow RedirectorPage to have non-redirected actions, move redirection to index
2017-07-19 18:09:57 +01:00
Damian Mooyman
c8d22442af Merge pull request #1901 from robbieaverill/pulls/4.0/fix-active-tab-state-logic
FIX Use better inheritance based logic for deciding which active tab to display in edit page
2017-07-18 16:55:01 +12:00
Chris Joe
a0ebdd5390 Merge pull request #1893 from open-sausages/pulls/4.0/link-inline-toolbar
Add edit command and its url test for page insert
2017-07-18 13:24:30 +12:00
Robbie Averill
fb6e6162ca FIX Use better inheritance based logic for deciding which active tab to display in edit page 2017-07-18 13:19:04 +12:00
Saophalkun Ponlu
6fc1491f0b Enhancement Add edit command and its url test for page insert 2017-07-18 13:11:58 +12:00
Damian Mooyman
dd10aadddb Merge pull request #1900 from robbieaverill/pulls/4.0/fix-cmsmain-injection-in-tests
FIX Use injection for CMSMain in tests
2017-07-18 11:16:29 +12:00
Robbie Averill
e8c77463c5 FIX Use injection for CMSMain in tests 2017-07-18 10:56:13 +12:00
Damian Mooyman
52ada8bb92 Merge pull request #1898 from robbieaverill/pulls/4.0/remove-config-update
FIX Use merge or set instead of update for config calls
2017-07-18 09:14:48 +12:00
Daniel Hensby
6422866f40 Merge pull request #1894 from robbieaverill/pulls/4.0/fix-settings-tab-states
FIX Ensure tab states are reflected when switching on page edit screen
2017-07-17 13:21:33 +01:00
Daniel Hensby
91ced1cf1d Merge pull request #1880 from robbieaverill/pulls/4.0/change-people-to-groups
NEW Change "only these people" to "only these groups" in permissions
2017-07-17 13:17:04 +01:00
Robbie Averill
c3cda42b92 FIX Use merge or set instead of update for config calls 2017-07-17 17:49:03 +12:00
Robbie Averill
4bc1bd64fc Add tests for page level edit and view permission settings 2017-07-17 13:31:14 +12:00
Robbie Averill
9bde76bad0 Add behat test for toggling between active tabs in CMS edit pages 2017-07-16 23:42:09 +12:00
Robbie Averill
dd4d5740b8 FIX Ensure tab states are reflected when switching on page edit screen 2017-07-16 22:46:11 +12:00
Daniel Hensby
732bdd2734
Merge branch '3' into 4 2017-07-15 16:21:51 +01:00
Daniel Hensby
f15476856e
Merge branch '3.6' into 3 2017-07-15 16:17:13 +01:00
Daniel Hensby
28269e3b28
Merge branch '3.5' into 3.6 2017-07-15 16:16:24 +01:00
Robbie Averill
1cf8a67f21 NEW Use injector for creating SSViewer 2017-07-13 21:20:00 +12:00
Chris Joe
4700e5e159 Merge pull request #1890 from open-sausages/pulls/4.0/fix-modules
BUG Incorrect module delimited
2017-07-13 13:13:53 +12:00
Damian Mooyman
3cf9910fe4
BUG Incorrect module delimited 2017-07-13 12:13:40 +12:00
Damian Mooyman
c3d77e5cd8 Merge pull request #1888 from open-sausages/pulls/4.0/project-no-more-project
API Update module sorting
2017-07-13 10:16:50 +12:00
Damian Mooyman
a69600fa7b
API Update module sorting 2017-07-13 09:56:03 +12:00
Chris Joe
1649e62eac Merge pull request #1788 from open-sausages/pulls/4.0/402_change_icon
Add missing class to toolbar
2017-07-12 09:23:23 +12:00
Paul Clarke
53f3f927cc add missing class to toolbar 2017-07-06 13:32:27 +12:00
Christopher Joe
b1c35c70b2 Update composer alias 2017-07-06 09:22:13 +12:00
Daniel Hensby
5ec0f2555c Merge pull request #1882 from mfendeksilverstripe/master
Limits added to collateDescendants
2017-07-05 14:50:52 +01:00
Mojmir Fendek
42cb0820a2
Limits added to collateDescendants() to ensure reasonable performance with thousands of pages. 2017-07-05 12:33:42 +01:00
Daniel Hensby
f511c262fd Merge pull request #1884 from kinglozzer/archive-validation
Add archive to list of validation-exempt actions
2017-07-05 12:21:32 +01:00
Loz Calver
5caef27577 Add archive to list of validation-exempt actions 2017-07-05 11:42:42 +01: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