Commit Graph

5566 Commits

Author SHA1 Message Date
Damian Mooyman
68d6307c6d Upgrade to bootstrap@4.0.0-beta.1 2017-08-16 10:52:36 +12:00
Damian Mooyman
d469a2dc88 Fix regressions from tinymce upgrade (#1923) 2017-08-15 11:05:56 +12:00
Chris Joe
40b0fda915 Merge pull request #1920 from open-sausages/pulls/4.0/namespace-cms
Namespace and fix CMS tests
2017-08-10 10:47:38 +12:00
Damian Mooyman
4f6af36369
Manual fixes to automatic namespacing 2017-08-09 17:09:28 +12:00
Damian Mooyman
9f268a18b5 Run add-namespace command 2017-08-09 17:00:58 +12:00
Damian Mooyman
6cb2077878 Move files to new location 2017-08-09 16:58:07 +12:00
Chris Joe
9e86a2bcd4 Merge pull request #1919 from open-sausages/pulls/4.0/virtualpage-cascade-delete
API Virtual pages now respect cascade_deletes on source page
2017-08-09 16:35:24 +12:00
Damian Mooyman
2c54e33106
API Virtual pages now respect cascade_deletes on source page 2017-08-09 10:56:08 +12:00
Damian Mooyman
d3451b9843 Update translations 2017-08-07 14:34:14 +12:00
Saophalkun Ponlu
417caf2972 ENHANCEMENT Allow insert links with display link text 2017-08-03 13:32:14 +12:00
Robbie Averill
fc0362087e
FIX Remove legacy sprintf style translations in favour of placeholders 2017-08-02 13:42:52 +12:00
Robbie Averill
f8ea7f27cf Remove sprintf translations in CMSMain in favour of named parameters 2017-08-02 13:40:08 +12:00
Chris Joe
00d6cb7af6 Merge pull request #1914 from muskie9/bugfix/parentContext
BUGFIX check if parent context is SiteTree instance
2017-08-01 11:11:55 +12:00
Nic Horstmeier
53a0206b1d BUGFIX check if parent context is SiteTree instance
fixes #1913
2017-07-28 14:02:29 -05:00
Chris Joe
a92261cc9b Merge pull request #1910 from open-sausages/pulls/4.0/menu-title-tree
API Use setTitleField to use MenuTitle for selecting internal links
2017-07-27 15:00:24 +12:00
Damian Mooyman
3364f5c52b
API Use setTitleField to use MenuTitle for selecting internal links 2017-07-26 18:15:15 +12:00
Daniel Hensby
99b2d9842a
Merge branch '3' into 4 2017-07-25 15:58:34 +01:00
Daniel Hensby
156debbac4
Merge branch '3.6' into 3 2017-07-25 15:57:48 +01:00
Daniel Hensby
af9663f671
Merge branch '3.5' into 3.6 2017-07-25 15:57:04 +01:00
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