Paul Meyrick
766e652ca0
Minor Moved ContentControllerSearchExtension from sapphire/search/ to cms module
2011-03-28 09:02:19 +13:00
Paul Meyrick
d3c5a309bf
Minor Moved ErrorPage, RedirectorPage, SiteConfig, SiteTree, SiteTreeDecorator, VirtualPage from sapphire/core/model/ to cms module
2011-03-28 09:02:19 +13:00
Ingo Schommer
9b4f3aaf81
Minor Moved ContentController, ModelAsController, RootURLController, NestedController from sapphire/core/control/ to cms module
2011-03-28 09:02:19 +13:00
Paul Meyrick
c905bcb471
MINOR Moved AdvancedSearchForm, SearchForm from sapphire/search to cms module
2011-03-28 09:02:19 +13:00
Paul Meyrick
fa7da8f716
MINOR Moved Diff class to sapphire module
2011-03-28 09:02:19 +13:00
Ingo Schommer
6cfade0b3d
BUGFIX Allowing "batch action" selection in new jstree implementations (first draft, doesn't reflect success/fail state on nodes afterwards)
...
BUGFIX Passing native JSON array back from CMSBatchActionHandler in order to simplify clientside logic in LeftAndMain.BatchActions.js
2011-03-22 18:43:40 +13:00
Ingo Schommer
6e60314006
MINOR Adding classes and markup necessary to style tree before jstree.js loads
2011-03-22 18:43:39 +13:00
Ingo Schommer
91995ad73b
MINOR Disabled AssetAdmin form reload after uploading through iframe, relies on old tree.js library - UI will change anyway
2011-03-22 18:43:39 +13:00
Ingo Schommer
6a2fe5671b
MINOR Limited css scope for compare view styling to avoid clashes with jstree
2011-03-22 18:43:39 +13:00
Ingo Schommer
20427cd45b
MINOR Using 'apple' theme in tree (until we decide on a proper redesign)
2011-03-22 18:43:39 +13:00
Ingo Schommer
11071eabbd
BUGFIX Removed CSS classes duplication in <a> tags in LeftAndMain->getSiteTreeFor(), they're already applied to the parent list element, and confuse the styling of jstree.js
2011-03-22 18:43:37 +13:00
Ingo Schommer
fd3ae9100f
API CHANGE Replaced LeftAndMain->ajaxupdatesort() and LeftAndMain->ajaxupdateparent() with a combined LeftAndMain->savetreenode() (and a changed request parameter signature)
2011-03-22 18:43:37 +13:00
Ingo Schommer
4f0c5d115a
MINOR Added data-id=0 to root node in LeftAndMain->getSiteTreeAsUL()
2011-03-22 18:43:37 +13:00
Ingo Schommer
f53fe8193f
BUGFIX Fixed regular expression to trim off last "</ul>" tag in LeftAndMain->getsubtree(), switched from deprecated ereg_replace() to preg_replace
2011-03-22 18:43:37 +13:00
Ingo Schommer
57e1c41f15
BUGFIX Don't include firebug-lite.js by default in LeftAndMain->init()
2011-03-22 18:43:37 +13:00
Ingo Schommer
2d85a4596b
FEATURE Replacing custom tree.js with jstree thirdparty library
2011-03-22 18:43:34 +13:00
Ingo Schommer
fe126e1a23
BUGFIX Using UTF-8 compatible string parsing in CMSMain and MemberTableField for htmlentities() and htmlspecialchars() invocations
2011-03-21 18:22:31 +13:00
Ingo Schommer
3535dec032
MINOR Removed unused code from Diff
2011-03-21 18:21:26 +13:00
Ingo Schommer
03acbb737e
MINOR Translatable strings in CMSMain ( fixes #6523 , thanks Tonyair)
2011-03-20 09:59:26 +13:00
Ingo Schommer
dc045d079d
BUGFIX Allowing POST data in LeftAndMain->currentPageID() in order to fix stricter form submission validations in RequestHandler (checks for valid form action before executing e.g. 'save' command, hence needs to construct a correct form state)
2011-03-16 17:53:13 +13:00
Ingo Schommer
4eac937da6
BUGFIX Reconstruct form before returning from LeftAndMain and CMSMain controller actions, in order to avoid stale form fields or form actions (e.g. after hitting CMSMain->unpublish(), the 'unpublish' FormAction has to be removed from the existing form)
2011-03-16 17:53:10 +13:00
Ingo Schommer
824f7451a0
ENHANCEMENT Supporting passing in objects in LeftAndMain->getRecord() (and subclasses) in order to reduce boilerplate code in controller actions
2011-03-16 16:39:49 +13:00
Ingo Schommer
a27369978d
BUGFIX Fixed AssetAdmin->SyncForm() execution by switching from calling dev/tasks/FilesystemSyncTask to doSync()
2011-03-16 14:19:03 +13:00
Ingo Schommer
a99d7b0b1d
API CHANGE Removed CMSBatchAction->getDoingText(), the same information can be visualized via a spinner button without this overhead
2011-03-16 14:19:02 +13:00
Ingo Schommer
495e15be9f
MINOR Fixed merge errors
2011-03-16 14:18:59 +13:00
Ingo Schommer
4374bd815a
BUGFIX Respecting Member::summaryFields() in SecurityAdmin->autocomplete instead of hardcoding Firstname,Surname,Email. This also allows to include Member::$unique_identifier_field in the autocomplete results
2011-03-08 21:01:51 +13:00
Julian Seidenberg
a3bd51e388
BUGFIX: re-applied commit 1192d5b671 in order to get ReportAdmin to work with entwine Tree, not _left _right javascript.
2011-03-01 18:05:26 +13:00
Julian Seidenberg
a3da342b06
BUGFIX: fixed assess to a protected attribute variable of form causing an error.
2011-03-01 16:00:21 +13:00
Julian Seidenberg
188827a7b5
BUGFIX: added missing entwine dependency to Security admin
2011-03-01 15:02:38 +13:00
Julian Seidenberg
3678df8b0f
BUGFIX: added in DoingText method for AssetAdmin_DeleteBatchAction to allow it to be enumerated by CMSBatchActionHandler->batchActionList()
2011-03-01 14:44:35 +13:00
Julian Seidenberg
a394831013
BUGFIX: including entwine dependency in SecurityAdmin
2011-02-24 17:08:38 +13:00
Julian Seidenberg
88f67c5859
ENHANCEMENT: including all of jquery-ui instead of specifying individual pieces of it. This is a larger download size, but should be quicker overall as it is just a single download instead of lots of small files.
2011-02-24 17:07:20 +13:00
Julian Seidenberg
1c5f161384
BUGFIX: added SideReportForm back in as an allowed action, which is called when loading a new page in the CMS.
2011-02-24 17:03:24 +13:00
Julian Seidenberg
dba2ed6c07
BUGFIX: updated links to new jquery ui file paths
2011-02-24 12:12:31 +13:00
Sam Minnee
e45f4c923c
MINOR: Misc fixes to clean up the 2.4 mergeback.
2011-02-22 10:52:56 +13:00
Sam Minnee
5a23f69f0b
Merge remote branch 'origin/master'
2011-02-22 10:23:08 +13:00
Ingo Schommer
3495fc0b7c
BUGFIX Fixing TinyMCE path enumeration which throws off its 'template' plugin by invalid spaces ( fixes #6407 , thanks drombolaget_fredric)
2011-02-22 00:28:26 +13:00
Sam Minnee
3498e41b0a
Merge branch '2.4'
...
Conflicts:
_config.php
code/AssetAdmin.php
code/AssetTableField.php
code/CMSBatchAction.php
code/CMSBatchActionHandler.php
code/CMSMain.php
code/CMSSiteTreeFilter.php
code/CommentAdmin.php
code/CommentTableField.php
code/GroupImportForm.php
code/LeftAndMain.php
code/MemberImportForm.php
code/MemberTableField.php
code/ModelAdmin.php
code/PermissionRoleAdmin.php
code/ReportAdmin.php
code/SecurityAdmin.php
code/SideReport.php
code/reports/BrokenLinksReport.php
code/sitefeatures/MathSpamProtection.php
code/sitefeatures/PageComment.php
code/sitefeatures/PageCommentInterface.php
code/sitefeatures/SSAkismet.php
css/cms_left.css
css/cms_right.css
css/layout.css
css/silverstripe.tabs.css
images/loading.gif
javascript/AssetAdmin.js
javascript/AssetTableField.js
javascript/CMSMain_left.js
javascript/CMSMain_right.js
javascript/LangSelector.js
javascript/LeftAndMain.Tree.js
javascript/LeftAndMain.js
javascript/LeftAndMain_right.js
javascript/MemberImportForm.js
javascript/MemberTableField.js
javascript/ModelAdmin.js
javascript/PageCommentInterface.js
javascript/ReportAdmin_left.js
javascript/ReportAdmin_right.js
javascript/SecurityAdmin_right.js
javascript/SideReports.js
javascript/SideTabs.js
javascript/SitetreeAccess.js
javascript/TranslationTab.js
javascript/WidgetAreaEditor.js
javascript/lang/cs_CZ.js
javascript/lang/en_US.js
javascript/lang/sk_SK.js
javascript/tinymce_ssbuttons/editor_plugin_src.js
javascript/tinymce_ssmacron/editor_plugin_src.js
lang/en_US.php
templates/Includes/AssetAdmin_left.ss
templates/Includes/AssetTableField.ss
templates/Includes/CMSMain_left.ss
templates/Includes/CommentTableField.ss
templates/Includes/ModelAdmin_left.ss
templates/Includes/SecurityAdmin_left.ss
templates/PageCommentInterface.ss
templates/PageCommentInterface_singlecomment.ss
templates/ReportAdminForm.ss
tests/CMSMainTest.php
tests/CMSMainTest.yml
tests/LeftAndMainTest.php
tests/MemberTableFieldTest.php
tests/MemberTableFieldTest.yml
thirdparty/multifile/multifile.js
2011-02-15 11:50:24 +13:00
Sean Harvey
27aad3deca
BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey
3b6a9579d4
BUGFIX #6304 PageCommentInterface::PostCommentForm() loads inappropriate data from cookie, including wrong values for ParentID
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
25de6303a8
BUGFIX Allowing CMSMain->rollback() outside of form contexts, temporariliy disabling CSRF protection. Necessary in order to get rollback actions working from admin/getversion (regression from 2.4.4 release, see #6291 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115313 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
6a02f2edb5
BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission() (from r115185)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey
77c5701fa6
BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!) (from r114940)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
7428010748
BUGFIX Added SecurityToken to PageCommentInterface->DeleteAllLink() ( fixes #6223 , thanks Pigeon)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:52 +13:00
Sean Harvey
e907e2e266
BUGFIX Fixed case where AssetAdmin would throw an error if $links was not an object in AssetAdmin::getCustomFieldsFor()
...
MINOR Defined $backlinks as an array before adding entries to it
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Saophalkun Ponlu
75f12d5a7e
ENHANCEMENT: Update Asset's left and right panels with filders and files after 'Look for new files' was triggered (open #5543 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer
b8338bc2bc
MINOR Typo in AssetAdmin ( fixes #6191 , thanks Juanitou)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113695 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer
e8e5c62c5a
BUGFIX Avoid reloading CMS form twice after certain saving actions ( fixes #5451 , thanks muzdowski)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113692 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer
6df2e74323
MINOR Fixed regression from r113282 for changed SecurityToken API in CMSMain->publishall() ( fixes #6159 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
bc3df654bd
API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
