Daniel Hensby
|
636bf45b5f
|
Merge branch '3.6' into 3
|
2017-08-24 13:14:47 +01:00 |
|
Daniel Hensby
|
a308ab327b
|
Merge branch '3.5' into 3.6
|
2017-08-24 13:14:22 +01:00 |
|
Daniel Hensby
|
5512711471
|
Merge pull request #1936 from andrewandante/BUGFIX/backport_namespaced_page_icon
sanitize class names for cms icons
|
2017-08-24 12:47:14 +01:00 |
|
Chris Joe
|
c704b6d36a
|
Merge pull request #1935 from andrewandante/BUGFIX/namespaced_page_icon
sanitize namespaced classes for page icon css
|
2017-08-24 23:42:41 +12:00 |
|
Andrew Aitken-Fincham
|
b78c163362
|
sanitize class names for cms icons
|
2017-08-24 12:12:37 +01:00 |
|
Andrew Aitken-Fincham
|
46abf8ffd5
|
sanitize namespaced classes for page icon css
|
2017-08-24 12:00:33 +01:00 |
|
Chris Joe
|
f15a400462
|
Merge pull request #1716 from hoKRa1/1625-fixed-load-indicator
fixes load indicator position (fixes #1625)
|
2017-08-24 17:03:43 +12:00 |
|
Damian Mooyman
|
3e055178ec
|
Merge pull request #1931 from open-sausages/pulls/4.0/page-not-found-in-search-mode
FIX page not found issue when search in edit page
|
2017-08-24 15:48:13 +12:00 |
|
Reid Hokai
|
b0512abfb6
|
fixes load indicator position (fixes #1625)
|
2017-08-24 14:24:54 +12:00 |
|
Damian Mooyman
|
cc56e5a648
|
Merge pull request #1881 from robbieaverill/pulls/3.7/version-provider
NEW Add version provider configuration
|
2017-08-24 14:04:37 +12:00 |
|
Saophalkun Ponlu
|
d03edb208e
|
FIX Search in page edit should now redirect to (full) table view
|
2017-08-24 13:50:05 +12:00 |
|
Damian Mooyman
|
6efb35fbcf
|
BUG Fix “Show unpublished versions” (#1930)
Update CMSPageHistoryController.js to fit coding conventions
Fixes #1648
|
2017-08-24 13:31:40 +12:00 |
|
Loz Calver
|
9a9b4e205c
|
Merge pull request #1929 from robbieaverill/pulls/4.0/replace-stat-usage
Replace use of Configurable stat() with config()->get(), will be deprecated in future
|
2017-08-23 10:26:45 +01:00 |
|
Ingo Schommer
|
82a82b15e2
|
Merge pull request #1927 from open-sausages/pulls/4.0/restore-deferred-tree
Restore deferred cms tree loading
|
2017-08-23 13:35:26 +12:00 |
|
Robbie Averill
|
f2e22ef18a
|
Replace use of Configurable stat() with config()->get(), will be deprecated in future
|
2017-08-23 09:46:46 +12:00 |
|
Damian Mooyman
|
e078e6623d
|
Restore deferred cms tree loading
|
2017-08-21 13:59:26 +12:00 |
|
Saophalkun Ponlu
|
2bbb21a450
|
Add priority to internal link action (#1924)
|
2017-08-18 15:38:34 +12:00 |
|
Chris Joe
|
412ead69ed
|
Merge pull request #1922 from open-sausages/pulls/4.0/bootstrap-upgrade
Upgrade bootstrap classnames
|
2017-08-17 15:46:14 +12:00 |
|
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 |
|