be34b9b61c
Merge branch '3.6' into 3
2017-09-28 17:45:41 +01:00
50a9a5de6b
Merge branch '3.5' into 3.6
2017-09-28 17:45:22 +01:00
f8d0dc4ff7
Merge remote-tracking branch 'security/3.6.2' into 3.6
2017-09-28 17:45:18 +01:00
6a11fbfbf8
Merge remote-tracking branch 'security/3.5.5' into 3.5
2017-09-28 17:44:53 +01:00
f37b78ef61
Merge pull request #1968 from open-sausages/pulls/4.0/toolbar-style-layout
...
FIX toolbar title layout
2017-09-21 16:48:20 +12:00
32c74a86e2
Merge branch '3.5.5' into 3.6.2
2017-09-20 16:34:42 +01:00
d99a80cef9
Merge pull request #6 from silverstripe-security/patch/3.5/authenticator-fix
...
FIX Default LoginForm generated from default_authenticator
2017-09-20 11:37:40 +01:00
fb9ad4453e
Merge pull request #1973 from open-sausages/pulls/4.0/update-classinfo-usages
...
Update usages of ClassInfo
2017-09-20 16:29:37 +12:00
fa0b559a7b
Update usages of ClassInfo
...
Add missing unit tests for SiteTreeFolderExtension
2017-09-20 15:20:17 +12:00
d6a26c3731
Merge pull request #1966 from open-sausages/pulls/4.0/anchor-modal
...
API Implement insert-anchor modal
2017-09-20 14:33:48 +12:00
496b9c8c04
API Implement insert-anchor modal
2017-09-20 13:35:25 +12:00
dbf42c0967
Merge pull request #1965 from open-sausages/pulls/4.0/get-your-react-together-man
...
Update airbnb rules for linting
2017-09-20 11:29:14 +12:00
e5e5a52d66
Change webpack-config dep version
2017-09-20 10:24:02 +12:00
e15373ba0e
Fixed linting errors and tests
2017-09-18 17:02:07 +12:00
72289a1ae7
Merge pull request #1970 from mikenz/patch-7
...
Tests: Batch Actions Tests assume enforce_strict_hierarchy is enabled
2017-09-16 22:56:26 +01:00
85a30733be
Tests: Batch Actions Tests assume enforce_strict_hierarchy is enabled
2017-09-16 14:20:55 +12:00
68128b46c3
FIX toolbar title layou
2017-09-15 16:17:47 +12:00
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
d18568c395
FIX Ensure client config merging includes existing parent "form" attributes
2017-09-15 09:12:53 +12:00
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
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
a83d94abe0
Switch cms to trusty
2017-09-13 10:56:30 +12:00
4f3b4f7626
FIX Fine-tune button styles
2017-09-13 10:44:11 +12:00
0aac4ddb7e
FIX Default LoginForm generated from default_authenticator
2017-09-12 15:59:05 +01:00
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
2b2cdb4c44
BUG Fix yarn build
2017-09-12 15:40:44 +12:00
89429683f4
Update .travis.yml
2017-09-12 15:06:02 +12:00
2dde777132
FIX Add styles for url segment field
2017-09-12 14:37:03 +12:00
53157a60fb
Update translations
2017-09-08 16:52:23 +12:00
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
3669f30e4e
BUG Fix race condition with change detection / loading animation
...
Fixes #1859
2017-09-07 11:54:03 +12:00
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
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
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
eaa0a2a4cb
FIX Update unused button classes for url segment field
2017-09-06 09:30:11 +12:00
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
4b26ed6a83
BUG Prevent treeview loading repeatedly on each page edit form
...
Fixes #1949
2017-09-05 11:52:04 +12:00
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
a9c479f26a
API Allow SiteTree::Link to be extended
2017-09-05 08:58:47 +12:00
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
1273059b4c
Fix campaign form validation errors
2017-09-04 14:47:45 +12:00
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
04f795c665
Tweak add form to use React TreeDropdownField
...
Enhancement Shift groups in SiteTree to use TreeMultiselectField
2017-09-04 13:38:14 +12:00
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
1c321019c4
Fix icons in right click menu
2017-08-31 14:42:37 +12:00
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
9350b4a425
BUG Fix inconsistent breadcrumbs in CMS section
...
Fixes #1867
2017-08-28 13:03:56 +12:00
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
d0fd96d4e6
FIX Remove entry points to tree in search mode
2017-08-28 11:00:41 +12:00
62afa446b2
Merge branch '3' into 4
2017-08-24 13:30:04 +01:00
Daniel Hensby
Chris Joe
Daniel Hensby
Damian Mooyman
Saophalkun Ponlu
Christopher Joe
Mike Cochrane
Robbie Averill
Sacha Judd
Lee Bradley