tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
2,500 Commits 29 Branches 403 Tags 28 MiB
3678df8b0f
Commit Graph

163 Commits

Author SHA1 Message Date
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
Sam Minnee
e45f4c923c MINOR: Misc fixes to clean up the 2.4 mergeback. 2011-02-22 10:52:56 +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
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
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
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
dd70fcd5be BUGFIX AssetAdmin->doUpload() shows JS alert *before* triggering a page reload, as this seems to mess up TinyMCE in Firefox on subsequent page loads (fixes #5838) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108096 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:45 +13:00
Luke Hudson
0fe83d2264 BUGFIX: re-enable broken link notification using BackLinkTracking() (this was broken since r101127 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106360 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:42 +13:00
Ingo Schommer
f5be047b97 BUGFIX Stop IE6/IE7 from redirecting in admin/assets after deleting multiple folders (fixes #5208) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101969 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:24 +13:00
Will Rossiter
1a3a8d0a0c MINOR: removed duplication of variable and conditional that would never pass 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101889 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:24 +13:00
Ingo Schommer
5271e54972 MINOR Fixed wrong default value for AssetAdmin (see r101106) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101111 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:16 +13:00
Ingo Schommer
67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:16 +13:00
Will Rossiter
2b99e45627 BUGFIX: Fixed notice level error with folder ID 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100858 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:14 +13:00
Will Rossiter
b033c1839c BUGFIX: fixed file uploading not uploading any files at all 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100854 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:14 +13:00
Sean Harvey
56a32fe5c6 MINOR Reverted r100484 as it was causing too many problems 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100485 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:06 +13:00
Sean Harvey
df46043a67 MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100484 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:06 +13:00
Sean Harvey
b810f0ecbc BUGFIX #5023 AssetAdmin::sync() is now used to sync tasks, as it works when the user only has access to the AssetAdmin controller instead of going to dev/tasks/FilesystemSyncTask which can only be run by administrators or if the site is in dev mode 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100335 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:05 +13:00
Sean Harvey
4dd3740682 ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100058 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:05 +13:00
Ingo Schommer
8302f97ffc FEATURE set file metadata on upload. (from r97780) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99117 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:50 +13:00
Ingo Schommer
a7c0797a9d FEATURE Import groups from CSV in admin/security through the new GroupImportForm class (and GroupCsvBulkLoader) (merged and rewritten from r98711) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98736 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:43 +13:00
Will Rossiter
39772cfcc4 ENHANCEMENT: Select the uploaded image after uploading by default. #4962 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97765 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:29 +13:00
Andreas Piening
5f4a432619 MINOR: #4674 applied patch for special chars in folder titles 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97669 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:28 +13:00
Will Rossiter
a19fea2416 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:24 +13:00
Sean Harvey
cb541e6333 BUGFIX #4857 Fixed potential bug where a file would just be uploaded to a random folder, also files can now be uploaded to the assets root properly 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96993 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:19 +13:00
Sam Minnee
d674e2b032 MINOR moved allowed_extensions and friends to the model layer (from r92046) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96816 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:17 +13:00
Sean Harvey
2e762da45e MINOR Moved defined variables in AssetAdmin::doUpload() to the top of the method for consistency 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96230 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:09 +13:00
Will Rossiter
8eddb47344 API CHANGE: removed Director::Link(). Use Controller::join_links() instead 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93785 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:05 +13:00
Sean Harvey
5a1a947b92 MINOR Removed ContentNegotiator::disable() since it's disabled by default (in AssetAdmin) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93681 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:05 +13:00
Ingo Schommer
ce3365d095 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:04 +13:00
Tom Rix
a3a70c85eb BUGFIX FolderID was not present in post, so file would not be uploaded to the correct place. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91958 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:04 +13:00
Will Rossiter
a9427422c0 FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:03 +13:00
Ingo Schommer
1e0579cbe4 BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115185 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-20 00:00:49 +00:00
Jean-Fabien Barrios
9f2d488758 BUGFIX File upload not working when open_basedir is set #5547 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114471 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-03 00:28:30 +00:00
Sam Minnee
18add377f2 MINOR Fixed wrong default value for AssetAdmin (see r101106) (from r101111) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111637 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 06:07:04 +00:00
Sam Minnee
c49b38f615 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review. (from r101106) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111636 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 06:06:57 +00:00
Sam Minnee
f8f18f40aa Several merges from branches/2.4 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111631 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 06:04:21 +00:00
Sam Minnee
70105f066e ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload (from r100058) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111618 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 05:47:30 +00:00
Sam Minnee
b212b5c98b FEATURE set file metadata on upload. (from r97780) (from r99117) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111601 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 05:21:21 +00:00
Ingo Schommer
2a5cb1eb87 ENHANCEMENT: Select the uploaded image after uploading by default. #4962 (from r97765) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102747 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-14 01:33:29 +00:00
Ingo Schommer
32bdc74381 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. (from r97489) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102718 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 21:57:55 +00:00
Ingo Schommer
afd8faf567 BUGFIX #4857 Fixed potential bug where a file would just be uploaded to a random folder, also files can now be uploaded to the assets root properly (from r96993) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102705 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 06:59:09 +00:00
Ingo Schommer
168589a59f MINOR Updated jQuery.concrete references to point to the new "entwine" name 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102697 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 05:55:56 +00:00
Ingo Schommer
cc522e07ae MINOR moved allowed_extensions and friends to the model layer (from r92046) (from r96816) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102678 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 03:55:52 +00:00
Ingo Schommer
480d5068d1 API CHANGE: Added numChildrenMethod argument to LeftAndMain::getSiteTreeFor() 
BUGFIX: Use the correct numChildrenMethod when showing the 'all children, including deleted' tree (from r91166) (from r96809)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102474 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 09:22:43 +00:00
Ingo Schommer
0624cc69ed MINOR Moved defined variables in AssetAdmin::doUpload() to the top of the method for consistency (from r96230) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:47:46 +00:00
Ingo Schommer
677beef9dd MINOR Removed ContentNegotiator::disable() since it's disabled by default (in AssetAdmin) (from r93681) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93954 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-30 01:05:13 +00:00
Ingo Schommer
8e8f9c5e77 MINOR Fixed Requirements path references in LeftAndMain and AssetAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92861 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 04:50:02 +00:00
Ingo Schommer
394e0c0b38 MINOR Removed cms/thirdparty/swfupload, moved to sapphire/thirdparty 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92852 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:21:16 +00:00
Ingo Schommer
990ae9f145 BUGFIX Fixed CMSMain.js search clearing logic, wasnt clearing the first field properly. Fixed LeftAndMain->getsubtree() filtering in AssetAdmin and SecurityAdmin. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92849 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:21:03 +00:00