Commit Graph

2679 Commits

Author SHA1 Message Date
Ingo Schommer
eb030fa0f9 BUGFIX Don't allow dragging tree nodes outside of the root node, don't allow moving the root node, don't access drag/drops from other trees. 2011-03-22 18:43:38 +13:00
Ingo Schommer
cf467d5272 MINOR Disabled animation on tree (for performance reasons) 2011-03-22 18:43:38 +13:00
Ingo Schommer
6d3cf213e7 MINOR Removed unnecessary tree CSS styles, will be replaced by new styles based on jstree.js 2011-03-22 18:43:38 +13:00
Ingo Schommer
8419ee8b3a MINOR Removed custom TreeDropdownField CSS styles (copypasted the entire block only to adjust widths), no longer necessary due to a flexible width system on the base styles 2011-03-22 18:43:38 +13:00
Ingo Schommer
3dbe03c3f9 MINOR Reverted floating of TinyMCE icons, as they don't automatically break into multiple lines like other floated elements 2011-03-22 18:43:38 +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
a137360085 MINOR Temporarily disabled onchange bindings in ThumbnailStripField, as they fail in IE7/IE8 2011-03-22 18:43:37 +13:00
Ingo Schommer
0e9bf073c8 BUGFIX Switching all ajax implementations to consistently use jQuery.ajax instead of Prototype's Ajax.Request() (AssetTableField, CommentTableField, MemberTableField, WidgetAreaEditor) 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
564038b463 ENHANCEMENT Added drag'n'drop support for tree 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
934c3f2c1b BUGFIX Re-selecting tabs when refreshing editform in LeftAndMain.EditForm.js 2011-03-16 14:19:03 +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
a220d37e3b Revert "MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10)" - causing too many issues in mixed build environments with other projects requiring PHPUnit 3.4
This reverts commit 7d609f24c9.
2011-03-11 16:10:38 +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
5bb67d15d3 API-CHANGE: updated jquery-layout to latest version (jquery layout 1.3.0 - Release Candidate 29.14) to be compatible with jQuery 1.5 and jQuery UI 1.8 2011-02-24 17:13:53 +13:00
Julian Seidenberg
86fa29accc API-CHANGE: ssui.core.js rewrite to work with jQuery UI 1.8. Renamed _init => _create and renamed defaults => options. See the following websites for a complete guide to what has changed in jquery UI version 1.8:
https://github.com/scottgonzalez/jquery-ui-1.8-widget-factory
http://jqueryui.com/docs/Upgrade_Guide
2011-02-24 17:12:19 +13:00
Julian Seidenberg
f380d88c80 BUGFIX: removing colon (:) from selectors throughout SilverStripe. jQuery 1.5 is stricter about what is allowed in a selector and the colon is not allowed for elements like :select. 2011-02-24 17:10:01 +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
Ingo Schommer
7d609f24c9 MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10) 2011-02-21 18:49:47 +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
Ingo Schommer
7d1bd72153 MINOR Added README 2011-02-12 14:25:53 +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
357b868b4f BUGFIX Disallow web access to cms/silverstripe_version to avoid information leakage (from r114770)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
375151c14d MINOR Updated SilverStripe logo to new design (from r114764)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00