Daniel Hensby
|
a7d3d82dd7
|
Stay on travis precise dist for now
|
2017-07-25 15:56:30 +01:00 |
|
Daniel Hensby
|
0758f66932
|
Merge branch '3' into 4
|
2017-07-25 14:54:33 +01:00 |
|
Damian Mooyman
|
563efca087
|
Merge pull request #1902 from open-sausages/pulls/4.0/search-default-listview
FIX Pages search now defaults to list view
|
2017-07-25 13:34:18 +12:00 |
|
Damian Mooyman
|
1fe13dcdb7
|
Rebuild dist files
|
2017-07-25 12:57:46 +12:00 |
|
Damian Mooyman
|
0a867b4786
|
Adjust behat step usage
|
2017-07-25 12:57:46 +12:00 |
|
Damian Mooyman
|
b0380d8766
|
Un-hard code ViewState argument
|
2017-07-25 12:57:46 +12:00 |
|
Saophalkun Ponlu
|
db5f81d393
|
Fix behat tests
|
2017-07-25 12:57:46 +12:00 |
|
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 |
|
Daniel Hensby
|
799ee08251
|
Merge branch '3.6' into 3
|
2017-07-18 15:44:32 +01:00 |
|
Daniel Hensby
|
8e2695f140
|
Merge branch '3.5' into 3.6
|
2017-07-18 15:44:13 +01:00 |
|
Loz Calver
|
be0c0ef5b5
|
Merge pull request #1899 from dhensby/pulls/3.5/vp-render-fix
FIX Make sure VirtualPage renders correct templates
|
2017-07-18 11:10:37 +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
|
515a7cb569
|
FIX Make sure VirtualPage renders correct templates
|
2017-07-17 20:13:13 +01:00 |
|
Daniel Hensby
|
b499e077b1
|
Merge pull request #1810 from dnadesign/fix_silverstripenavigator_versioned_subclasses
using static function so that subclasses of Versioned will be picked up
|
2017-07-17 16:16:33 +01: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
|
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 |
|