Commit Graph

5617 Commits

Author SHA1 Message Date
Damian Mooyman
1a42b60c90 Merge pull request #1959 from creative-commoners/pulls/4.0/fix-client-config-merging
FIX Ensure client config merging includes existing parent "form" attributes
2017-09-15 16:01:56 +12:00
Robbie Averill
d18568c395 FIX Ensure client config merging includes existing parent "form" attributes 2017-09-15 09:12:53 +12:00
Daniel Hensby
a04d87debe Merge pull request #1963 from open-sausages/pulls/4.0/trusty
Switch cms to trusty (4.x branch)
2017-09-13 12:31:17 +01:00
Damian Mooyman
f756a98989 Merge pull request #1960 from open-sausages/pulls/4.0/fine-tune-buttons
FIX Fine-tune button styles
2017-09-13 10:58:50 +12:00
Damian Mooyman
a83d94abe0
Switch cms to trusty 2017-09-13 10:56:30 +12:00
Saophalkun Ponlu
4f3b4f7626 FIX Fine-tune button styles 2017-09-13 10:44:11 +12:00
Damian Mooyman
06fda1a9bf Merge pull request #1955 from creative-commoners/pulls/4.0/url-button
FIX Add styles for url segment field
2017-09-12 16:42:47 +12:00
Damian Mooyman
2b2cdb4c44
BUG Fix yarn build 2017-09-12 15:40:44 +12:00
Damian Mooyman
89429683f4
Update .travis.yml 2017-09-12 15:06:02 +12:00
Sacha Judd
2dde777132 FIX Add styles for url segment field 2017-09-12 14:37:03 +12:00
Damian Mooyman
53157a60fb Update translations 2017-09-08 16:52:23 +12:00
Chris Joe
6b14cbb1b6 Merge pull request #1954 from open-sausages/pulls/4.0/fix-change-detection
BUG Fix race condition with change detection / loading animation
2017-09-07 12:05:25 +12:00
Damian Mooyman
3669f30e4e BUG Fix race condition with change detection / loading animation
Fixes #1859
2017-09-07 11:54:03 +12:00
Damian Mooyman
62ea34c0cb Merge pull request #1948 from creative-commoners/pulls/4.0/segment-field-buttons
FIX Update unused button classes for url segment field
2017-09-06 14:05:48 +12:00
Lee Bradley
0570df95a8 Optimization for SiteTree::allowedChildren()
Adds an `Object::extend('updateAllowedChildren')` whilst also
  caching the default response

Using `get_class($this)` as cache key as this is what is used
  in `Configurable::stat($name)` to retrieve the candidates
2017-09-06 12:58:17 +12:00
Lee Bradley
bd86251043 Adds cacheing for SiteTree::allowedChildren()
This reduces the time for the page load in admin as it doesn't
  have to call `singleton()` as many times
2017-09-06 12:58:09 +12:00
Sacha Judd
eaa0a2a4cb FIX Update unused button classes for url segment field 2017-09-06 09:30:11 +12:00
Chris Joe
eed7359526 Merge pull request #1950 from open-sausages/pulls/4.0/fix-cms-tree-reloading
BUG Prevent treeview loading repeatedly on each page edit form
2017-09-05 13:11:06 +12:00
Damian Mooyman
4b26ed6a83
BUG Prevent treeview loading repeatedly on each page edit form
Fixes #1949
2017-09-05 11:52:04 +12:00
Chris Joe
24a8cfb795 Merge pull request #1952 from open-sausages/pulls/4.0/extend-link
API Allow SiteTree::Link to be extended
2017-09-05 09:16:00 +12:00
Damian Mooyman
a9c479f26a
API Allow SiteTree::Link to be extended 2017-09-05 08:58:47 +12:00
Chris Joe
71852fc536 Merge pull request #1943 from open-sausages/pulls/4.0/create-campaign-form
Fix campaign form validation errors
2017-09-04 15:16:16 +12:00
Damian Mooyman
1273059b4c Fix campaign form validation errors 2017-09-04 14:47:45 +12:00
Damian Mooyman
c9477ee141 Merge pull request #1942 from open-sausages/pulls/4.0/entwined-in-a-tree-of-mess
Tweak add form to use React TreeDropdownField
2017-09-04 14:46:15 +12:00
Christopher Joe
04f795c665
Tweak add form to use React TreeDropdownField
Enhancement Shift groups in SiteTree to use TreeMultiselectField
2017-09-04 13:38:14 +12:00
Damian Mooyman
6b9249f4ce Merge pull request #1944 from open-sausages/pulls/4.0/i-know-right--click
Fix icons in right click menu
2017-08-31 16:08:14 +12:00
Christopher Joe
1c321019c4 Fix icons in right click menu 2017-08-31 14:42:37 +12:00
Chris Joe
af0176d0f4 Merge pull request #1934 from open-sausages/pulls/4.0/better-pages-breadcrumbs
BUG Fix inconsistent breadcrumbs in CMS section
2017-08-28 15:49:03 +12:00
Damian Mooyman
9350b4a425
BUG Fix inconsistent breadcrumbs in CMS section
Fixes #1867
2017-08-28 13:03:56 +12:00
Chris Joe
380de0eb17 Merge pull request #1933 from open-sausages/pulls/4.0/page-not-found-in-search-mode
FIX Remove entry points to tree in search mode
2017-08-28 11:48:58 +12:00
Saophalkun Ponlu
d0fd96d4e6 FIX Remove entry points to tree in search mode 2017-08-28 11:00:41 +12:00
Daniel Hensby
62afa446b2
Merge branch '3' into 4 2017-08-24 13:30:04 +01:00
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