Daniel Hensby
32c74a86e2
Merge branch '3.5.5' into 3.6.2
2017-09-20 16:34:42 +01:00
Chris Joe
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
Damian Mooyman
fa0b559a7b
Update usages of ClassInfo
...
Add missing unit tests for SiteTreeFolderExtension
2017-09-20 15:20:17 +12:00
Damian Mooyman
496b9c8c04
API Implement insert-anchor modal
2017-09-20 13:35:25 +12:00
Robbie Averill
d18568c395
FIX Ensure client config merging includes existing parent "form" attributes
2017-09-15 09:12:53 +12:00
Saophalkun Ponlu
4f3b4f7626
FIX Fine-tune button styles
2017-09-13 10:44:11 +12:00
Daniel Hensby
0aac4ddb7e
FIX Default LoginForm generated from default_authenticator
2017-09-12 15:59:05 +01:00
Damian Mooyman
3669f30e4e
BUG Fix race condition with change detection / loading animation
...
Fixes #1859
2017-09-07 11:54:03 +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
Damian Mooyman
4b26ed6a83
BUG Prevent treeview loading repeatedly on each page edit form
...
Fixes #1949
2017-09-05 11:52:04 +12:00
Damian Mooyman
a9c479f26a
API Allow SiteTree::Link to be extended
2017-09-05 08:58:47 +12:00
Damian Mooyman
1273059b4c
Fix campaign form validation errors
2017-09-04 14:47:45 +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
9350b4a425
BUG Fix inconsistent breadcrumbs in CMS section
...
Fixes #1867
2017-08-28 13:03:56 +12:00
Saophalkun Ponlu
d0fd96d4e6
FIX Remove entry points to tree in search mode
2017-08-28 11:00:41 +12:00
Daniel Hensby
a308ab327b
Merge branch '3.5' into 3.6
2017-08-24 13:14:22 +01: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
Saophalkun Ponlu
d03edb208e
FIX Search in page edit should now redirect to (full) table view
2017-08-24 13:50:05 +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
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
Damian Mooyman
68d6307c6d
Upgrade to bootstrap@4.0.0-beta.1
2017-08-16 10:52:36 +12:00
Damian Mooyman
2c54e33106
API Virtual pages now respect cascade_deletes on source page
2017-08-09 10:56:08 +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
Nic Horstmeier
53a0206b1d
BUGFIX check if parent context is SiteTree instance
...
fixes #1913
2017-07-28 14:02:29 -05:00
Damian Mooyman
3364f5c52b
API Use setTitleField to use MenuTitle for selecting internal links
2017-07-26 18:15:15 +12:00
Daniel Hensby
0758f66932
Merge branch '3' into 4
2017-07-25 14:54:33 +01:00
Damian Mooyman
b0380d8766
Un-hard code ViewState argument
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
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
8e2695f140
Merge branch '3.5' into 3.6
2017-07-18 15:44:13 +01: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
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
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
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
Mojmir Fendek
42cb0820a2
Limits added to collateDescendants() to ensure reasonable performance with thousands of pages.
2017-07-05 12:33:42 +01:00
Loz Calver
5caef27577
Add archive to list of validation-exempt actions
2017-07-05 11:42:42 +01:00
Robbie Averill
4c1dbd402b
NEW Change "only these people" to "only these groups" in permissions
2017-07-03 21:39:53 +12:00
Daniel Hensby
9816efc97f
Merge branch '3'
2017-06-28 15:21:22 +01:00
Sam Minnee
ce730319ec
NEW: Remove use of MODULE_DIR constants
...
This relies on
https://github.com/silverstripe/silverstripe-framework/pull/7065
2017-06-28 16:34:05 +12:00
Damian Mooyman
29bb49105f
Merge pull request #1840 from open-sausages/pulls/4.0/view-add-perms-clarification
...
List "view/edit all" groups in group permission field
2017-06-28 12:22:34 +12:00
Damian Mooyman
2251138bed
Merge pull request #1862 from robbieaverill/pulls/4.0/fix-missing-memberauthenticator
...
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-28 12:10:28 +12:00
Jonathon Menz
77ec2b90c6
API Removed ErrorPage
...
Removed ErrorPage class and references so it can be split off in to a separate module. Please install https://github.com/silverstripe/silverstripe-errorpage when upgrading to SS4 to preserve ErrorPage functionality. Closes https://github.com/silverstripe/silverstripe-framework/issues/4149
2017-06-26 10:01:54 -07:00
Saophalkun Ponlu
d752365047
More options dropdown label change to icon
2017-06-26 11:58:57 +12:00
Robbie Averill
c2ad41ef1b
FIX Allow RedirectorPage to have non-redirected actions, move redirection to index
2017-06-23 11:23:31 +12:00
Robbie Averill
8d23cfc2aa
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-23 11:22:01 +12:00
Damian Mooyman
c2c75aa9e3
Fix and upgrade all tests
...
Fix link tracking
2017-06-21 16:29:40 +12:00
Damian Mooyman
95e304a4ca
Upgrade usage of global methods
2017-06-20 17:12:18 +12:00
Damian Mooyman
21e204cc59
App object refactor
2017-06-20 17:12:18 +12:00
Damian Mooyman
93a185e44a
Update HTMLValue and FormField::create_tag usages
2017-06-16 11:44:36 +12:00
Antony Thorpe
fdbe38d444
Bugfix: SS4 Right click, add page fails
...
`addForm` receives both POSTs and GETs. Set the form's `strictFormMethodCheck` to false to avoid `405 Method Not Allowed` error response. Issue #1846 .
2017-06-15 13:53:38 +12:00
Daniel Hensby
54e438fb9e
Merge branch '3.5' into 3.6
2017-06-14 12:14:02 +01:00
Simon Erkelens
b2fd014216
Make CMS Compatible with Authentication Refactor work
...
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12:00
Mojmir Fendek
b442bad767
Children of the site tree are no longer listed only for the purpose of counting them. count($this->Children()) creates an array list of children which has serious performance consequences if there are lot of children present. On the other hand $this->numChildren() runs a count query which is much faster and eat’s less memory.
2017-06-08 12:19:27 +12:00
Ingo Schommer
4bacd35fc4
List "view/edit all" groups in group permission field
...
See https://github.com/silverstripe/silverstripe-cms/issues/794
2017-06-02 11:40:51 +12:00
Daniel Hensby
08093ea308
Merge pull request #1838 from dhensby/pulls/3.6.0/fix-mobius-hierachy
2017-05-30 22:52:22 +01:00
Daniel Hensby
5116476875
FIX Issue where CMS SiteTree can result in infinite recursion if parent and child relation is swapped
2017-05-30 22:23:55 +01:00
Damian Mooyman
f82f0844c1
API Add insert internal link modal
2017-05-30 11:00:32 +12:00
Daniel Hensby
eaee3b6a8b
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:21:22 +01:00
Daniel Hensby
11e2175ec8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:02:55 +01:00
Daniel Hensby
02b5e6ea92
Merge pull request #5 from silverstripe-security/patch/3.4/SS-2017-003
...
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-28 21:36:33 +00:00
Franco Springveldt
c034ead6df
FIX beforeUpdateCMSFields added to ErrorPage and VirtualPage
...
References #1756
2017-05-26 13:21:51 +12:00
Daniel Hensby
61cf72c08d
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()
2017-05-25 17:22:04 +01:00
Daniel Hensby
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-24 23:02:41 +01:00
Robbie Averill
b394718b42
Remove create_function implementations, replace with closures
2017-05-22 17:36:19 +12:00
Damian Mooyman
9a31b19ed2
ENHANCEMENT RedirectorPage extensions can now modify fields
...
Fixes #579
2017-05-16 23:33:45 +12:00
Damian Mooyman
49e559b08c
API Rename services to match FQN of interface / classes
2017-05-16 15:49:09 +12:00
Damian Mooyman
23e1aa8c45
API Refactor inherited permissions ( #1811 )
2017-05-12 12:47:46 +12:00
Damian Mooyman
1efb325b4d
Merge pull request #1813 from open-sausages/pulls/4.0/remove-deprecated-methods
...
Remove APIs with target deprecation of 4.0
2017-05-09 11:36:49 +12:00
Ingo Schommer
4923a2597b
Replaced usage of ResetFormAction ( #1812 )
...
See https://github.com/silverstripe/silverstripe-framework/pull/6883
2017-05-09 11:11:08 +12:00
Ingo Schommer
484a4ec4f6
API Removed deprecated RootURLController:set_default_homepage_link
2017-05-08 21:17:36 +12:00
Ingo Schommer
de41e14518
API Removed deprecated ModelAsController::find_old_page()
2017-05-08 21:14:38 +12:00
Aaron Carlino
359179025d
Reorganise i18n keys
2017-05-08 17:57:24 +12:00
John Milmine
618c7f126d
changed to static function so that subclasses of Versioned will be picked up
2017-05-04 15:05:25 +12:00
Uncle Cheese
29805ee446
New namespaced i18n keys
2017-04-27 11:43:04 +12:00
Uncle Cheese
6fb1012eb8
Ran upgrader for lang files
2017-04-27 11:43:04 +12:00
John Milmine
1ff6f3f1b0
fixing doArchive
...
for users who can delete, but not unpublish, they should be able to delete draft pages that they’ve created.
Old code used to unpublish even if the page wasn’t published, which meant users who couldn’t publish, also could delete draft pages. They could create draft pages, but not delete them.
2017-04-27 08:48:19 +12:00
Damian Mooyman
000a5f7209
BUG Fix page history / settings forms
2017-04-26 18:13:48 +12:00
Ingo Schommer
cf2b0417cb
Fix coding conventions
2017-04-22 11:44:49 +12:00
Tim Kung
bb3c09c359
- making form actions on edit forms safer
...
- re-adding removed methods
2017-04-12 11:42:21 +12:00
Damian Mooyman
d75a3cb0e9
API Update site tree hierarchy to use a MarkingSet and template
2017-04-12 08:57:09 +12:00
Ingo Schommer
9cad8ba01b
Fixed linting
2017-04-12 08:21:02 +12:00
Tim Kung
41eddfcc8e
fixing cms page history controller to use new page id param
2017-04-07 15:58:35 +12:00
Tim Kung
487235f991
adding page id into cmsmain
2017-04-07 14:41:15 +12:00
Damian Mooyman
b1b0c6af63
BUG Ensure all CMS forms include full ID / VersionID in path
...
Fixes #1510
Refactor tree operations into CMSMain
Cleanup CMSMain and subclasses
2017-04-06 13:40:46 +12:00
Daniel Hensby
2ddb616829
FIX Correct case of CopyContentFrom method
2017-04-05 10:49:17 +10:00
Sam Minnee
80e8967308
FIX: Fix VirtualPage::init() content-modification check.
...
This check had never worked but PHP 5 silently ignored it and PHP 7
raised it as an error.
2017-04-05 10:49:16 +10:00
Daniel Hensby
322c6f578b
DOCS Fix PHPDoc
2017-04-05 10:49:16 +10:00
Daniel Hensby
ec15c71342
FIX: Add __isset to VirtualPage for PHP7 support.
...
Also rely on parent::hasField and parent::hasMethod
2017-04-05 10:48:58 +10:00
Saophalkun Ponlu
b8db45055c
Enhancement Refactor archive message to a separate method
2017-04-05 12:45:41 +12:00
Saophalkun Ponlu
5b90141c03
ENHANCEMENT Update archive warning message
2017-04-04 11:26:46 +12:00
Damian Mooyman
393d392de1
Merge pull request #1775 from open-sausages/pulls/4.0/6626-remove-jquery-datepicker
...
HTML5 Date and Time Fields
2017-04-04 10:57:16 +12:00
Ingo Schommer
d07115e665
Use new DateField->setHTML5()
...
See https://github.com/silverstripe/silverstripe-framework/issues/6626
2017-04-03 12:01:12 +12:00
Damian Mooyman
98e77a48a9
API Rename SiteTree::description() to SiteTree::classDescription() to prevent clash
...
Fixes #1733
2017-03-29 11:55:44 +13:00
Damian Mooyman
91933b6c66
Update class namespace
2017-03-28 14:01:02 +13:00
Damian Mooyman
5ce98aced2
API Upgrade to rely on silverstripe/versioned module
2017-03-28 10:35:14 +13:00
Ingo Schommer
34d08cf458
Merge branch 'master' into pulls/4.0/admin-module
2017-03-15 12:01:28 +13:00
Chris Joe
319ce1861e
Merge pull request #1758 from open-sausages/pulls/4.0/form-refactor
...
Update SearchForm
2017-03-13 15:22:53 +13:00
Damian Mooyman
c7d9947976
Update SearchFormTest
2017-03-13 11:45:29 +13:00
Damian Mooyman
5092e0fc65
Add dependency on admin module
2017-03-10 16:33:32 +13:00
Damian Mooyman
f65a164818
Update SearchForm
...
Fix RedirectorPageTest
2017-03-10 15:04:02 +13:00
Mike Cochrane
cb955f08f7
Fix non_virtual_fields being ignored
...
Fix non_virtual_fields and initially_copied_fields being ignored in classes that extent VirtualPage
2017-03-09 17:45:37 +13:00
Damian Mooyman
8537d6ddb1
Simplify code to use dataFields()
2017-02-28 16:34:46 +13:00
Christopher Joe
2fafff084f
Fix history comparison fields will now show diff properly, rather than escaped html diff
2017-02-28 16:26:11 +13:00
Damian Mooyman
8766a4c91b
Cleanup unit test classes
2017-02-28 15:46:19 +13:00
Damian Mooyman
dfe25c27f0
BUG Fix allowedChildren() and link tracking
2017-02-28 15:46:07 +13:00
Damian Mooyman
4885736b0e
API Upgrade CMS to use new Config API
2017-02-28 11:30:22 +11:00
Ingo Schommer
6bae804744
API Use symfony/cache
...
See https://github.com/silverstripe/silverstripe-framework/issues/6252
2017-02-26 14:57:52 +13:00
Damian Mooyman
945eba8efb
Update CMS for new i18n API
2017-02-09 16:11:11 +13:00
Daniel Hensby
8a76a2ea8f
Merge branch '3'
2017-02-08 10:27:35 +00:00
Daniel Hensby
68b49921f9
Merge branch '3.5' into 3
2017-02-07 17:41:18 +00:00
Daniel Hensby
27f8acf373
Merge pull request #1705 from dhensby/pulls/3/cleanup
...
Remove redundant label
2017-02-03 11:20:37 +00:00
Daniel Hensby
aa2d0fb247
Merge branch '3.4' into 3.5
2017-01-31 20:09:00 +00:00
Damian Mooyman
ac6083c9a2
Merge pull request #1731 from trewq/asset-upload-directory-fix
...
Fix error when uploading file and ASSETS_DIR is a subdirectory
2017-01-31 15:47:16 +13:00
Damian Mooyman
c7214b4dcd
Auto-convert to psr2
2017-01-31 13:59:35 +13:00
Brendan Halley
10d9f9080b
Fix to allow ASSETS_DIR to be a subdirectory
2017-01-31 09:46:14 +11:00
Damian Mooyman
fa2b87172c
Upgrade cms for new i18n backend
2017-01-26 11:39:20 +13:00
Damian Mooyman
732b1f0a57
BUG Fix reference to Install_deleteinstallfiles
...
Fixes #1719
2017-01-25 18:03:18 +13:00
Colin Tucker
00c81d8672
Changed init() visibility to protected
2017-01-22 09:35:14 +11:00
Daniel Hensby
3f53da050c
Merge branch '3'
2017-01-17 12:33:26 +00:00
Daniel Hensby
6f05242e3b
Merge branch '3.5' into 3
2017-01-17 12:33:03 +00:00
Daniel Hensby
cb3008956f
Merge branch '3.4' into 3.5
2017-01-17 12:31:18 +00:00
Matthew Hailwood
df0ce184bf
Clean up code
...
Just making it a little clearer what's going on by changing the variable names and removing some redundant code.
2017-01-16 13:20:44 +13:00
Daniel Hensby
05b5e545e0
Merge pull request #1703 from robbieaverill/feature/psr2-compliant-controller-names
...
API Allow controller discovery without underscore (PSR-2 compliance)
2017-01-11 15:28:11 +00:00
Paul Clarke
333b4b3e79
add icon to page in menu
2017-01-11 17:36:30 +13:00
Will Rossiter
b3896a0ba6
Swap out icons on change.
2017-01-11 17:36:30 +13:00
Paul Clarke
9f4acfe3bf
Main save/publish actions to change icons when state changed
2017-01-11 17:36:30 +13:00
Will Rossiter
2d17f2f33b
Tidy up publish and save buttons.
2017-01-11 17:36:30 +13:00
Will Rossiter
5bb430ef43
Remove references to ss-ui
2017-01-11 17:36:30 +13:00
Robbie Averill
cf3a74ec57
FIX Remove deprecation tests, bump deprecation version to 5.0
2017-01-11 10:02:51 +13:00
Robbie Averill
0927e54780
API Allow controller discovery without underscore (PSR-2 compliance)
2017-01-11 10:02:51 +13:00
Daniel Hensby
5bba7264c6
FIX Dont attempt to iterate over null in SiteTree::allowedChildren
2017-01-10 16:20:22 +00:00
Colin Tucker
9959ef63f2
Fix double-escaped ampersands in CMSMain_TreeView and CMSMain::LinkPageAdd
2017-01-10 15:41:26 +11:00
Daniel Hensby
577a024109
Remove redundant label
2017-01-04 15:55:32 +00:00
Mike Cochrane
2108d8ef08
Use SiteTree instead of Page class in more places. Allows developers to extend SiteTree directly.
2017-01-03 20:38:45 +13:00
Daniel Hensby
7a296a541b
Merge branch '3'
2016-12-28 17:00:32 +00:00
Daniel Hensby
0b952e277e
Merge branch '3.5' into 3
2016-12-19 11:56:55 +00:00
Daniel Hensby
f833bb53c3
Merge branch '3.4' into 3.5
2016-12-16 16:46:28 +00:00
Damian Mooyman
bf58c5aef4
API Update to use new form submission handling ( #1691 )
2016-12-09 16:00:46 +13:00
Ingo Schommer
4fea439139
Merge branch 'master' into patch-3
2016-12-08 21:28:21 +13:00
Daniel Hensby
e90715d6c6
Merge branch '3.4' into 3.5
2016-12-07 13:43:34 +00:00
Damian Mooyman
224b2a4cba
BUG Fix localisation issues in CMS
2016-12-07 12:15:54 +13:00
hirenpatel
0dd81fcbe8
Removed dud Requirements breaking the RedirectorPage
...
Also removed the dependency
2016-11-30 12:51:04 +00:00
Daniel Hensby
4a1cf3d4fb
Merge branch '3.5' into 3
2016-11-28 14:02:13 +00:00
Daniel Hensby
ca76b9488f
Merge branch '3.4' into 3.5
2016-11-28 14:01:01 +00:00
Daniel Hensby
21d9b7cdf1
Merge branch '3.3' into 3.4
2016-11-28 13:57:38 +00:00
Daniel Hensby
5355831de9
Merge branch '3.2' into 3.3
2016-11-28 13:56:51 +00:00
Loz Calver
b2503ac004
FIX: content authors unable to duplicate top-level pages ( fixes #1685 )
2016-11-22 15:55:28 +00:00
Nathan
a5b33ab916
Correcting an issue where page controller methods
...
would end up with the error page response code, causing them to not work. This code only looks to be causing issues from what I can see.
An example is an autocomplete that is populated using a method on page controller. The moment you end up on a 404 error page, the autocomplete will attempt to populate and end up with a 404 response.
2016-11-21 15:43:37 +11:00
Mike Cochrane
c5fb7127ac
FIX Page History 'Comparing versions' banner missing
...
The 'Comparing versions' banner was inserted before the "Title" field. If there is no "Title" field the banner is missing. If the "Title" field isn't the first field then the banner is in the incorrect place.
2016-11-04 17:55:24 +13:00
Daniel Hensby
5bd7662cb4
Merge branch '3'
2016-11-03 15:32:47 +00:00
Damian Mooyman
4bf4fca416
BUG Prevent archived pages from having add to campaign action
...
Fixes #1626
2016-10-31 15:24:07 +13:00
Paul Clarke
c0623a4962
Remove break as text should be fluid for responsive layout
2016-10-28 15:44:31 +13:00
Damian Mooyman
e5550dd680
BUG Fix search not respecting view mode
2016-10-27 17:05:36 +13:00
Damian Mooyman
8c87ea6b79
API Update listview / treeview to use pjax instead of deferred loading
...
Fixes #1645
2016-10-27 17:05:36 +13:00
Damian Mooyman
424008cff4
BUG Fix installer for 4.0 ( #1644 )
2016-10-26 14:44:25 +13:00
Sam Minnée
75b185092e
FIX: Remove reference to Object class. ( #1634 )
...
The Object class is due to be removed and so this removes dependence on it.
2016-10-25 10:01:21 +01:00
Damian Mooyman
d54ae8bb26
API Consolidate "Delete from draft" and "Archive" actions into a consistent behaviour ( #1653 )
...
API Update to support new versioned dataobject behaviour
2016-10-25 13:22:31 +13:00
Daniel Hensby
ad2b2a044e
Merge branch '3.4' into 3
2016-10-16 22:43:01 +01:00
Christopher Joe
5df580578a
Fix double nested alert message
2016-10-16 14:19:58 +01:00
Christopher Joe
712849c732
Fix page form layout
2016-10-11 13:51:44 +13:00
Paul Clarke
b8b35de82d
Replace Layout classes with Flexbox classes
2016-10-11 13:51:44 +13:00
Daniel Hensby
ae83b7b5ef
FIX History controller now shows right comparison versions
2016-10-07 16:33:03 +01:00
Damian Mooyman
d1dbe91247
API Update for DataObjectSchema changes
2016-10-06 18:10:54 +13:00
Damian Mooyman
1ce243ccc1
API Cleaned up versioned status checks
2016-10-06 10:31:25 +13:00
Daniel Hensby
98d95cd707
FIX Sort order for duplicated child pages is now retained
2016-10-03 22:08:05 +01:00
Sam Minnee
0a561f1656
MINOR: class name references
...
- Replace get_class($this) with static::class
- Replace __CLASS__ with self::class
2016-09-28 11:55:15 +13:00
Sam Minnee
11888a006a
FIX: Remove references to Object::$class
...
To reduce dependence on a ‘god ancestor’ class we should use get_class()
instead.
2016-09-27 18:02:25 +13:00
Daniel Hensby
012867f485
Simplifying SiteTree::getControllerName ( #1629 )
2016-09-23 16:32:29 +12:00
Damian Mooyman
ffe85db33f
BUG Fix incorrect search form
2016-09-23 14:48:55 +12:00
Loz Calver
62816e1ff8
Refactor VirtualPage, remove VirtualPage_Controller
2016-09-22 14:37:54 +01:00
Loz Calver
3d827543a8
NEW: Allow pages to specify the controller they use
2016-09-22 14:37:51 +01:00
Damian Mooyman
760caaab44
API use new bootstrap button row template
2016-09-22 13:20:31 +12:00
Ingo Schommer
5c31bf357b
Remove framework bundle include
...
This is now handled through one combined bundle
which is included through LeftAndMain.php (in framework module)
Rename bundle-legacy.js to bundle.js: It'll contain more than legacy stuff eventually
Remove leftover dist artefacts: These weren't part of the webpack build any more
Building SilverStripeNavigator separately (and rename bundle)
2016-09-21 15:00:26 +12:00
Damian Mooyman
18939157f0
BUG Fix pages level up link
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5400
2016-09-20 13:03:56 +12:00
Damian Mooyman
4f19113c5c
API Use new DBField::getSchemaValue()
2016-09-20 12:08:20 +12:00
Christopher Joe
4b3f4ba01c
move BackLinkHTMLList to template
2016-09-19 10:43:39 +12:00
Ingo Schommer
fee7e0211e
Use CDN jQuery for RemoveOrphanedPagesTask
...
We shouldn't rely on static file paths from framework,
since they tend to change around.
2016-09-15 15:16:12 +12:00
Ingo Schommer
cd3ae42c1d
Fixed jquery.js path
2016-09-15 15:15:24 +12:00
Damian Mooyman
2dae4e2adc
Rename SS_ prefixed class names
2016-09-09 11:26:24 +12:00
Damian Mooyman
a12d52a161
BUG Fix some namespace class errors
2016-09-08 19:33:32 +12:00
Ingo Schommer
ac954095ab
Merge pull request #1602 from open-sausages/pulls/4.0/namespace-everything
...
Upgrade code for framework namespaces
2016-09-08 17:44:45 +12:00
Daniel Hensby
91444b8016
Merge branch '3'
2016-09-07 11:28:05 +01:00
Damian Mooyman
a87a857a6e
Upgrade code for framework namespaces
...
Remove @package / @subpackage
Fix inifinite loop in VirtualPage_Controller
2016-09-07 16:29:26 +12:00
Damian Mooyman
9c48b93983
BUG Ensure changes in class write to an instance of the new class, not the old one
...
Fixes #1210
Requires https://github.com/silverstripe/silverstripe-framework/pull/5950
2016-09-05 18:46:00 +12:00
maks feltrin
a0886f16bf
typo?
...
$controller is already a reference
2016-09-02 16:40:14 +02:00
Ingo Schommer
b599095a50
API Remove AssetAdmin (moved to asset-admin module)
2016-08-31 23:15:12 +12:00
Ingo Schommer
40904686a4
Removed AddToCampaignHandler->setShowTitle()
...
It was used to support different display variations in admin/assets and admin/pages,
while those display variations should've been removed in the first place (and have been now).
2016-08-28 13:49:25 +12:00
Ingo Schommer
93d7197aad
Support for React-driven "add to campaign"
2016-08-25 21:30:53 +12:00
Daniel Hensby
6d9b4415f1
Merge branch '3.4' into 3
2016-08-23 10:58:50 +01:00
Daniel Hensby
c754882e0a
Merge branch '3.3' into 3.4
2016-08-23 10:58:24 +01:00
Daniel Hensby
ba5e51c422
Merge branch '3.2' into 3.3
2016-08-23 10:55:13 +01:00
Christopher Joe
c411c500a5
Fix for pages admin add to campaign modal
2016-08-23 12:39:01 +12:00
Daniel Hensby
59be597004
FIX #1052
2016-08-22 19:41:10 +01:00
Daniel Hensby
4aca9ac145
Merge pull request #1052 from @dmeeking
2016-08-22 17:46:43 +01:00
Dan Meeking
26f5fc2853
Issue #1051 : fix so that OldPageRedirector::find_old_page uses ORM call
2016-08-22 17:44:43 +01:00
Christopher Joe
c46490ea3a
ErrorPage no longer generates HTML response for ajax requests
2016-08-22 15:36:01 +12:00
Damian Mooyman
dab2a7ac9d
Split code into class-per-file
...
Add psr-4 directive in composer.json
2016-08-16 13:22:58 +12:00
Damian Mooyman
041d12129a
Fix regressions from namespacing
...
Update template locations
Add permission codes to cms sections
Code, phpdoc, and typehint cleanup
Split batch actions into files
2016-08-16 11:56:34 +12:00
Damian Mooyman
2352127fe0
Apply SilverStripe\Admin namespace
2016-08-16 11:13:32 +12:00
Damian Mooyman
e414fdb325
Merge 3.4 into 3
2016-08-15 19:05:12 +12:00
Damian Mooyman
c2f21d0008
Merge 3.4.1 into 3.4
2016-08-15 18:37:50 +12:00
Damian Mooyman
ef856185ab
BUG Fix regression in FormField casting
2016-08-15 15:55:06 +12:00
Damian Mooyman
a6a9cd729f
BUG Fix regression in FormField casting
2016-08-15 15:34:29 +12:00
Damian Mooyman
5ad8157655
BUG Fix regression in FormField casting
2016-08-15 15:32:22 +12:00
Damian Mooyman
4dfa4f4473
Resolve issues with namespacing
2016-08-10 16:09:23 +12:00
Damian Mooyman
5bf364bedb
Apply SilverStripe\CMS namespace
2016-08-10 16:09:23 +12:00
Damian Mooyman
cb946508cf
Move CMS classes and templates to namespaced locations
2016-08-10 16:09:23 +12:00
Hamish Friedlander
25a8fb87da
Merge pull request #1571 from open-sausages/pulls/4.0/virtualpage-controller
...
API Better behaviour for virtualised controller
2016-08-10 07:09:54 +07:00
Damian Mooyman
63fc4dbcae
BUG Fix extra border in page settings
...
Fixes #1547
2016-08-09 17:19:45 +12:00
Damian Mooyman
7c13f7f75f
Merge 3.4 into 3
...
# Conflicts:
# code/controllers/CMSPageHistoryController.php
2016-08-05 19:14:57 +12:00
Damian Mooyman
afc9bb0dc6
Merge 3.3 into 3.4
...
# Conflicts:
# code/controllers/CMSPageHistoryController.php
# code/controllers/SilverStripeNavigator.php
# lang/bg.yml
# lang/cs.yml
# lang/it.yml
# lang/sk.yml
2016-08-05 16:46:35 +12:00
Damian Mooyman
19b811555c
API Move NestedController from cms to framework
2016-08-05 10:56:06 +12:00
Damian Mooyman
70179c8b87
API Better behaviour for virtualised controller
2016-08-04 14:19:33 +12:00
Paul Clarke
43ceeebb82
Gridfield updates for new styling. Mainly class update
2016-08-03 12:10:54 +12:00
Damian Mooyman
7c151321b4
BUG Fix issue with old asset-admin repeating "level up" button
...
BUG Fix incorrectly built dist files
2016-08-01 17:38:22 +12:00
Jonathon Menz
c965133da0
FIX Direct edit file by URL
...
Trying to navigate directly to the edit view of a file by URL would fail if a folder other than the file’s parent was held in session data. Removed reliance on current ID in session and added folder detection for edit view.
2016-07-29 16:53:31 -07:00
Damian Mooyman
d7fa00267e
Fix field casting
2016-07-28 12:06:05 +12:00
Paul Clarke
1c2228f508
Template reorder and adjust step styles
2016-07-28 10:24:06 +12:00
Damian Mooyman
47e06bd2be
Adjust layout of page search form
2016-07-26 10:42:23 +12:00
Daniel Hensby
75d72285c7
Merge pull request #1556 from open-sausages/pulls/4.0/remove-obsolete-actions
...
API Remove obsolete API
2016-07-25 15:33:21 +01:00
Daniel Hensby
1ae58bbc82
Merge branch '3'
2016-07-25 14:51:39 +01:00
Damian Mooyman
3306deb69b
BUG Fix link concatenation in SilverStripeNavigator ( #1560 )
...
Fixes #1557
Fixes https://github.com/tractorcow/silverstripe-fluent/issues/219
2016-07-25 14:34:45 +01:00
Daniel Hensby
4f99ced5df
Merge branch '3.3' into 3.4
2016-07-25 14:12:31 +01:00
Damian Mooyman
ff07a2e264
API Convert CMS forms to bootstrap
...
API Update to cms-forms theme
This commit is required by and depends on https://github.com/silverstripe/silverstripe-framework/pull/5826 in framework.
2016-07-25 17:25:22 +12:00
Damian Mooyman
886d65ad37
API Remove obsolete Folder_UsusedAssetsField
2016-07-25 10:16:18 +12:00
Damian Mooyman
4d007cd13c
API remove obsolete CMSMain::buildbrokenlinks()
2016-07-25 10:15:45 +12:00
Damian Mooyman
b135c2566c
API remove obsolete UpgradeSiteTreePermissionSchemaTask
2016-07-25 10:15:28 +12:00
Robbie Averill
82e54314bf
FIX do not show HiddenClass pages in allowed children ( #1555 )
...
* FIX do not show HiddenClass pages in allowed children
* Resolves #1553
* * Update SiteTreeTest to include HiddenClass checks
* Refactor testAllowedChildren to use a data provider
2016-07-22 09:45:14 +01:00
Daniel Hensby
a8cf17b008
Merge pull request #1551 from phptek/issue/1054
...
FIX: Fixes #1054 By preventing errors in the CMS _only_.
2016-07-21 12:18:33 +01:00
Russell Michell
10e06dce50
FIX: Fixes #1054 By preventing errors in the CMS _only_.
...
MINOR Boyscouting: Addition of missing braces, default return and missing types in @return annotation.
2016-07-21 20:07:30 +12:00
Daniel Hensby
6b4617d476
Merge pull request #1549 from dhensby/pulls/4/admin-url-fix
...
FIX Allow changing admin URLs
2016-07-19 14:48:19 +01:00
Daniel Hensby
0a7437db40
FIX Allow changing admin URLs
2016-07-18 12:44:20 +01:00
Damian Mooyman
abda4dc2d8
BUG Restore SiteTree::canPublish method to resolve incorrect fallback to SiteTreeExtension
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5625
2016-07-18 10:59:07 +12:00
Daniel Hensby
7e5f0087b8
Merge branch '3'
2016-07-14 12:25:54 +01:00
Daniel Hensby
c7b1a4ded8
Merge branch '3.3' into 3.4
2016-07-14 12:24:04 +01:00
Damian Mooyman
f8b1c27e3c
BUG Fix regressions from https://github.com/silverstripe/silverstripe-framework/pull/5653
2016-07-14 11:51:14 +12:00
Daniel Hensby
e5aad336ce
Merge pull request #1525 from tractorcow/pulls/4.0/dupe-api
...
API Cleanup inconsistent SiteTree::duplicate API
2016-07-14 00:41:40 +01:00
Daniel Hensby
dc8d4ffe0b
API Refactor usages of HTMLText -> HTMLFragment
...
API Revert hack in VirtualPage
API Respect default_cast
2016-07-13 18:48:46 +12:00
Damian Mooyman
8123c433f0
BUG Fix getAbsoluteLiveLink() concatenation
...
Fixes #1183
2016-07-12 15:57:52 +12:00
Daniel Hensby
3a395e6d56
Merge branch '3'
2016-07-12 01:13:07 +01:00
Daniel Hensby
a2657b519a
Merge branch '3.3' into 3.4
2016-07-12 01:08:54 +01:00
Daniel Hensby
118a09afff
Merge branch '3.2' into 3.3
2016-07-12 01:07:12 +01:00
micmania1
5f2d8cae0d
Merge pull request #1522 from micmania1/fix-sitetree-rading-stage
2016-07-05 16:13:23 +01:00
Damian Mooyman
25e4cad164
API Apply SilverStripe\Security namespace
2016-07-05 15:08:05 +12:00
Ingo Schommer
d208a6f511
Merge pull request #1534 from open-sausages/pulls/4.0/namespace-orm
...
API Update for new SilverStripe\ORM namespace
2016-07-01 15:09:00 +12:00
Damian Mooyman
bf511939f4
Merge pull request #1514 from stevie-mayhew/pulls/redirector-description
...
DOCS: updated description for redirector page
2016-06-28 18:13:28 +12:00
Damian Mooyman
e378332ff3
API Update for new SilverStripe\ORM namespace
2016-06-24 11:00:21 +12:00
Damian Mooyman
880ce895f5
Support custom table_name and DataObjectSchema
2016-06-14 15:37:41 +12:00
Daniel Hensby
a3d7d986a7
Merge branch '3'
2016-06-13 14:38:08 +01:00
Daniel Hensby
ea81389a18
Merge branch '3.3' into 3.4
2016-06-13 14:35:40 +01:00
Daniel Hensby
19047d1577
Merge branch '3.2' into 3.3
2016-06-13 14:34:12 +01:00
Damian Mooyman
c50bc91772
API Cleanup inconsistent SiteTree::duplicate API
2016-06-13 15:47:47 +12:00
Daniel Hensby
eba89b9520
FIX OldPageRedirector no longer loops infinitely if 404 thrown on existing page
2016-05-31 15:46:17 +01:00
Stevie Mayhew
e7bcbe3f79
DOCS: updated description for redirector page
2016-05-30 14:51:51 +12:00
Sam Minnée
359b969346
Merge pull request #1505 from open-sausages/features/bootify/actions-toolbars
...
Swap out .Actions class for bootstrap .btn-toolbar
2016-05-27 13:39:23 +12:00
Daniel Hensby
0a7610f245
Merge pull request #1508 from tractorcow/pulls/4.0/fix-rollback-page
...
BUG Fix rollback page crash
2016-05-24 21:30:42 +01:00
Paul Clarke
11192b0207
Swap out .Actions class for bootstrap .btn-toolbar
2016-05-24 12:28:38 +12:00
Damian Mooyman
04e617d65d
API Allow extensions to influence canCreate, canEdit, canView, canDelete, and canAddChildren even for admins.
...
Resolves issues where modules expect to apply business logic to models that admins must adhere to.
2016-05-24 10:16:14 +12:00
Daniel Hensby
092c8986cb
FIX Query string not built properly
2016-05-23 19:04:28 +01:00
Damian Mooyman
ad213b3576
BUG Fix rollback page crash
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5532
2016-05-23 17:36:58 +12:00
Damian Mooyman
0f646ba375
Fix undefined index error
2016-05-23 16:55:31 +12:00
Daniel Hensby
e04e992c73
Fixes relating to Controller cleanup
2016-05-23 00:49:08 +01:00
Omar Nava
6bc0d026f7
DBField namespace in Search for php7 support
2016-05-17 16:03:54 -05:00
Hamish Friedlander
7393995836
FIX preview in Asset Admin
2016-05-12 12:42:13 +12:00
Ingo Schommer
54573292a3
Merge pull request #1489 from open-sausages/pulls/4.0/fix-save-from-page-settings
...
FIX Not being able to save when viewing page settings
2016-05-09 18:07:11 +12:00
Hamish Friedlander
1263bf8a04
FIX Not being able to save when viewing page settings
2016-05-09 16:43:19 +12:00
Hamish Friedlander
2af63a84ef
FIX add_i18n_javascript calls not being updated after JS move
...
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
2016-05-09 15:41:58 +12:00
Ingo Schommer
d52058a4fd
Merge pull request #1484 from open-sausages/pulls/4.0/Add-page-steps-bug
...
Make page steps use the same styles, consistent markup
2016-05-09 12:53:39 +12:00
Ingo Schommer
4297d33343
Merge pull request #1475 from candidasa/ss4-issue1473
...
MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it up…
2016-05-09 07:59:07 +12:00
Paul Clarke
a039753f5c
removed .field class as it adds a bottom border
2016-05-06 15:30:08 +12:00
Paul Clarke
ca3770f03d
Make page steps use the same styles, consistent markup
2016-05-06 15:11:31 +12:00
Frank Mullenger
1181cac123
MINOR: Removing camel cased 'Html' references.
2016-05-06 14:31:19 +12:00
Julian Seidenberg
9169b11b8f
MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it upon first viewing of a new database ( fixes #1473 )
2016-05-06 11:24:03 +12:00
Damian Mooyman
46f69b0c0d
API set menu title without editing transifex masters
2016-05-02 21:54:09 +12:00
Damian Mooyman
1aa5492410
API Cleanup SilverStripeNavigator and CMSPreview
2016-05-02 17:02:37 +12:00
Damian Mooyman
d7d6fd8758
Merge 3 into master
...
# Conflicts:
# code/controllers/CMSPageAddController.php
# code/model/ErrorPage.php
# composer.json
# css/screen.css
# tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Daniel Hensby
af4b546050
Merge branch '3.3' into 3
2016-04-26 01:59:56 +01:00
Daniel Hensby
06d882b49c
Merge 3.2 into 3.3
2016-04-26 01:50:03 +01:00
Damian Mooyman
7a36789130
Cleanup PHPDoc and use injector for AddToCampaignHandler
2016-04-26 11:56:37 +12:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2
...
Conflicts:
code/reports/SideReport.php
2016-04-26 00:09:19 +01:00
scott1702
69d7a3ae7d
Add 'Add to campaign' button to pages
2016-04-22 08:39:39 +12:00
Ingo Schommer
e4861bdc79
Adjust file paths for new static file structure in framework
2016-04-20 21:13:20 +12:00
Patrick Nelson
000bf09354
FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage()
2016-04-06 17:34:55 -07:00
Damian Mooyman
3ed4c0fd52
Merge pull request #1418 from mikenz/patch-2
...
FIX 'Settings' fields being overwritten by 'Content' fields
2016-04-06 13:06:14 +12:00
Damian Mooyman
716baa6b1f
API Support renamed Versioned API
2016-04-01 16:17:47 +13:00
Damian Mooyman
d22ad706a9
API Support new DataObject::can() signature
2016-04-01 16:17:47 +13:00
Damian Mooyman
5852cd56a5
Merge pull request #1433 from open-sausages/pulls/4.0/build-tooling-fixes
...
Build tooling fixes
2016-03-31 11:56:06 +13:00
David Craig
a9d839396d
Ensure all form fields have a form set
2016-03-28 22:25:04 +13:00
Ingo Schommer
abe565eb01
JS build tooling fixes
...
- Relaxed NodeJS dependency to 4.x
- Switch to NPM "dependencies" (rather than dev)
Provides consistency with framework, where these had previously
been broken out between "dependencies" and "devDependencies", which in turn caused issues with "npm shrinkwrap"
- Add npm-shrinkwrap.json: Consistent with framework approach
Using uber's wrapper library since it prevents npm shrinkwrap from failing on file generation,
as well as actually suceeding with an "npm install" once the file is present.
- Don't add comments to dist files via babelify
We've had some issues with different dependencies causing different results based on the environment,
which in turn causes unnecessary diffs - making our work harder to review.
Comments can be read through the ES6 source files, and through source maps when
generated through `npm run build --development`
- Make JS build tooling and naming consistent with framework
2016-03-28 22:22:21 +13:00
Sam Minnee
46b35ecb0e
FIX: Changes to support php7 and new DBFields
...
These changes are necessary for CMS to work with this API breakage:
https://github.com/silverstripe/silverstripe-framework/pull/4551
2016-03-23 10:05:05 +13:00
Daniel Hensby
9d62d9d381
FIX Link tracking not escaping # Fixes #1409
2016-03-21 15:22:00 +00:00
Damian Mooyman
067d44ac6c
API Update link tracking for image shortcodes
2016-03-21 09:08:31 +13:00
Damian Mooyman
4cc7b0806d
API Update to use new Versioned API
...
API CMS notifications for recursive operations
API Un-deprecated delete action and batch actions
API remove deprecated API
2016-03-17 13:44:26 +13:00
Jake Bentvelzen
68694c01b7
Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page.
2016-03-15 10:48:46 +11:00
Daniel Hensby
bc31d9ca9c
FIX Use Controller::join_links() in Reports
2016-03-10 16:39:00 +00:00
Mike Cochrane
70062ebc9c
FIX 'Settings' fields being overwritten by 'Content' fields
...
CMSMain::getEditForm wasn't passing the $fields parameter to the parent. The the "Settings" fields we being replaced with the "Content" settings when requesting /admin/pages/settings/show/123345
2016-03-09 17:40:43 +13:00
Damian Mooyman
849cd898a4
Cleanup trailing whitespace
2016-03-09 10:28:45 +13:00
Damian Mooyman
de6db9f5c6
API Mark image tracking as owned
2016-03-08 10:58:33 +13:00
Andrew Mc Cormack
e6078be52e
Update SiteTree.php
...
Minor type fix
2016-03-07 20:37:29 +00:00
Ingo Schommer
6a53e607f5
Replace CMSForm use with new setValidationResponseCallback() API
...
Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938
2016-03-07 16:49:33 +13:00
micmania1
7c5f29ce19
Removed dependency for translatable module
2016-03-03 23:11:49 +00:00
Damian Mooyman
99c72fce5f
Merge remote-tracking branch 'origin/3'
2016-02-25 14:52:55 +13:00
Damian Mooyman
2734f1a18e
Merge remote-tracking branch 'origin/3.3' into 3
2016-02-24 17:35:46 +13:00
Damian Mooyman
208497ea42
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# lang/en.yml
# lang/lt.yml
2016-02-24 17:32:58 +13:00
Damian Mooyman
1c907dd227
API Support versioned File management
...
API Decouple File and ErrorPage
API Link tracking is now only performed on stage (in lieu of versioned relationships)
API Refactor versioned API methods out of SiteTree and into Versioned
2016-02-22 12:25:25 +13:00
Daniel Hensby
c8748f58f3
Merge pull request #1395 from tractorcow/pulls/4.0/cleanup-object
...
API Remove references to class aliases; Use correct classname
2016-02-19 23:30:26 +00:00
scott1702
26613dc39e
Correctly require CMS lang files
2016-02-18 12:05:27 +13:00
Andrew Aitken-Fincham
644c807031
BUG Use correct formaction for doRollback exemption #1378
2016-02-17 10:20:38 +13:00
Damian Mooyman
99394a84d0
API Remove references to class aliases; Use correct classname
2016-02-17 10:18:33 +13:00
Damian Mooyman
3cefb2edad
Merge remote-tracking branch 'origin/3'
2016-02-12 15:42:33 +13:00
Damian Mooyman
2ad490c3e2
BUG Prevent folders deleted on the filesystem from breaking asset interface
2016-02-09 13:03:40 +13:00
Damian Mooyman
531e7d4c3b
Merge pull request #1384 from dhensby/pulls/modeladmin-reading-mode
...
Removing stage reading mode as it will be set in LeftAndMain
2016-02-04 11:16:34 +13:00
appchecker
8e40b41460
Fix typo
2016-02-02 20:19:23 +03:00
Daniel Hensby
5f10d66e71
Removing stage reading mode as it will be set in LeftAndMain
2016-02-02 13:43:56 +00:00
Damian Mooyman
c9cf833ad6
Merge pull request #1375 from open-sausages/pulls/4.0/module-loader
...
Implement RFC-7 JavaScript module loader in CMS
2016-01-27 16:57:43 +13:00
Damian Mooyman
3d0178ebc0
BUG Use correct formaction for doRollback exemption
2016-01-27 15:38:48 +13:00
scott1702
66f6ecc57e
Implement RFC-7 JavaScript module loader in CMS
2016-01-27 14:56:47 +13:00
Damian Mooyman
17ee318d06
API VirtualPage permissions now can be set independently of the mirrored page
2016-01-27 10:01:14 +13:00
Daniel Hensby
b1b403cd08
FIX Borders on CMS Actions
2016-01-26 14:42:41 +00:00
David Craig
ebe3d24a56
Removed requirements to non-existant file
...
- CMSMain.GridField.js was moved to LeftAndMain.js in a317b6
2016-01-26 16:14:50 +13:00
scott1702
31e7832875
Update paths in AssetAdmin.php
2016-01-26 16:14:40 +13:00
Daniel Hensby
0eb4b8e256
Merge pull request #1314 from kinglozzer/hide_ancestor
...
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 11:57:04 +00:00
Loz Calver
fb43e59b00
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 09:18:35 +00:00
Damian Mooyman
0a2456e71e
Merge remote-tracking branch 'origin/3'
2016-01-25 16:16:53 +13:00
Damian Mooyman
19c24bb2df
Merge remote-tracking branch 'origin/3.3' into 3
2016-01-25 15:58:35 +13:00
Damian Mooyman
b54d2f1f7f
Merge pull request #1353 from sb-relaxt-at/1334-sitetree-classdropdown-bugfix
...
Adding context parameter to canCreate-check in getClassDropdown
2016-01-22 17:41:27 +13:00
Daniel Hensby
0a0ac86f5b
Merge pull request #1370 from tractorcow/pulls/4.0/defaultclass
...
API Refactor out Page default classname hack
2016-01-21 22:40:33 +00:00
Daniel Hensby
e77cfb5143
Merge pull request #1271 from tractorcow/pulls/4.0/dropdown-cleanup
...
API Use new formfields
2016-01-21 13:00:12 +00:00
Damian Mooyman
c97647078b
API Refactor out Page default classname hack
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/1932
2016-01-21 17:16:55 +13:00
Damian Mooyman
abc5556520
BUG Fix legacy breadcrumbs appearing on page save
...
Fixes #1358
2016-01-20 15:29:51 +13:00
Damian Mooyman
7c4e6f4b60
BUG prevent "Home page" being selected when no selection was made
...
Fixes #1351
2016-01-20 14:44:11 +13:00
Damian Mooyman
7dfe145412
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# code/controllers/CMSFileAddController.php
# code/controllers/CMSPageAddController.php
# code/controllers/CMSPageHistoryController.php
# code/controllers/CMSSiteTreeFilter.php
# code/controllers/ContentController.php
# code/controllers/LeftAndMainPageIconsExtension.php
# code/controllers/SilverStripeNavigator.php
# code/model/SiteTreeFileExtension.php
# code/model/VirtualPage.php
# composer.json
# tests/model/ErrorPageTest.yml
# tests/model/FileLinkTrackingTest.yml
# tests/model/VirtualPageTest.yml
2016-01-20 13:16:43 +13:00
Damian Mooyman
c3e82a4838
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# javascript/lang/src/fi.js
2016-01-19 17:10:41 +13:00
Damian Mooyman
e706b147cc
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-01-19 15:08:33 +13:00
Damian Mooyman
f4d22d6cfe
Merge pull request #1354 from sminnee/remove-trailing-whitespace
...
MINOR: Remove trailing whitespace
2016-01-13 09:30:01 +13:00
Loz Calver
d637141487
FIX: preg_quote() anchors in SiteTreeLinkTracking ( fixes #1359 )
2016-01-11 16:44:55 +00:00
Sam Minnee
bbc3aaaf9f
MINOR: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Loz Calver
54e8c71a4d
Use setFailover() in ContentController ( closes silverstripe/silverstripe-framework#4821 )
2016-01-06 15:24:17 +00:00
