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
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
Andreas Piening
3ba6e70540
MINOR: fixed visual glitch in CMS access tab for IE
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +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
c19aa2ce85
MINOR Making some JavaScript strings in cms/javascript translatable, and updated their cs_CZ and sk_SK translations ( fixes #6085 , thanks Pike)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113689 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
Ingo Schommer
4bc9a5aee8
MINOR Removed unused SecurityAdmin->MemberForm() and savemember() (see MemberTableField)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
b31cb6731e
MINOR Removed unused Security->addmember() (see MemberTableField and SecurityAdmin->addtogroup())
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113280 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
f8fd60f02b
MINOR Removed unused SecurityAdmin->removememberfromgroup() (see MemberTableField)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113279 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Ingo Schommer
0c177bcbca
MINOR Removed unused MemberList templates (see MemberTableField)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113278 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Ingo Schommer
ba4da1fa63
MINOR Javascript translations in CMSMain_right.js ( fixes #6142 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113248 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Jean-Fabien Barrios
c0f8b44f3f
ENHANCEMENT Added localisation for batch actions in javascript + translations
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Sean Harvey
602fcaa7b5
MINOR Use Filesystem::removeFolder() in FilesystemPublisherTest::tearDown() instead of specific code to handle this
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Sean Harvey
9cd40767f6
MINOR #6090 FilesystemPublisherTest now stores temporary files in assets, which is writable, instead of the webroot which almost never has write permissions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Jean-Fabien Barrios
6c0a41f0c4
Added doc for static help_link
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Saophalkun Ponlu
ee4e748803
MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Jean-Fabien Barrios
75544392a2
ENHANCEMENT: 6017 - Configurable help link
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Ingo Schommer
054a6d2270
MINOR Fixed SS_Datetime references in BrokenLinksReport and CommentAdmin ( fixes #6063 , thanks nicolaas)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111786 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Ingo Schommer
9ccf28e254
MINOR Fixed indentation in PageCommentInterface.js
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Will Rossiter
55e245aca8
MINOR: removed debug
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111454 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Will Rossiter
a584a1f516
BUGFIX: added validation to the page comment form
...
Fixes #2782
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Will Rossiter
6bf7bd1819
MINOR: removed debug
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111450 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Will Rossiter
4cc09f2a39
ENHANCEMENT: allow PageCommentForm to store all users data, rather than hardcoding the fields
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111449 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Will Rossiter
b76b6f61d2
ENHANCEMENT: simple extend hook for PageCommentForms. Temporary measure till #6053 is implemented
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Saophalkun Ponlu
2ec69aa597
MINOR: Add translation correction for Czech and add Slovakian translation in cms and sapphire (js). Thanks to @Pike
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111262 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00