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
1,765 Commits 29 Branches 403 Tags 28 MiB
88cbd4605e
Commit Graph

113 Commits

Author SHA1 Message Date
Ingo Schommer
88cbd4605e MINOR Better error checking in AssetAdmin->doUpload() (AIR-41) 2011-08-29 08:59:58 +02:00
Ingo Schommer
e988dccec3 MINOR Fail more gracefully in AssetAdmin->getsubtree() for nonexistant objects (AIR-45) 2011-08-22 14:12:05 +02:00
Marcus Nyeholt
43cac99064 BUGFIX: Fixed issue where folderID wasn't being correctly resolved from request, thus making file upload permissions only ever checked against the 'root' folder 2011-06-29 10:28:14 +10: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
Sam Minnee
287887ccca BUGFIX #4642: Fixed creation of folders in non-english languages. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90552 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 01:25:32 +00:00
Sean Harvey
9cd09d53f8 ENHANCEMENT Current search and current page of asset section are persistent. Fixes the open source ticket #4470 and also a part of #4256 (from r84091) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:39:50 +00:00
Sean Harvey
760b7eb67c MINOR Removed user_error() that broke AssetAdmin to the end user (from r82622) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89814 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:35:25 +00:00
Andrew O'Neil
c68e3f8875 NOTFORMERGE: Merged r83631 from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84119 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-11 01:08:29 +00:00
Sean Harvey
00c8fd25d9 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80875 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-02 07:23:29 +00:00
Sam Minnee
9bc3f5fe2a ENHANCEMENT: Added manual Filesystem::sync() button to improve load time of admin/assets area. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80783 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-01 22:28:06 +00:00
Sean Harvey
42a6692d79 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 01:44:28 +00:00
Sam Minnee
550931c02a Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72801 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-10 21:59:19 +00:00
Sean Harvey
34a50e3de6 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:46:15 +00:00
Sean Harvey
3d4630a2c8 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71259 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 02:50:25 +00:00
Ingo Schommer
266acd409d ENHANCEMENT Moved batch forms in CMSMain and AssetAdmin from hardcoded templates to SilverStripe forms. Enhances styling capabilities, unifies HTML syntax, better support for unobtrusive scripting, validation and field additions. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69744 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-06 02:18:33 +00:00
Ingo Schommer
7b3068ac4f MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69703 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:17:59 +00:00
Ingo Schommer
3c8e45f65a MINOR merged branches/2.3 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@67466 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-04 22:38:58 +00:00
Sam Minnee
e79dd5558b Updating queries to be more DB agnostic 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66506 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-24 09:30:41 +00:00
Sam Minnee
a93a0c3c95 Updated SQL queries to be ansi compatable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66402 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 00:31:13 +00:00
Sam Minnee
f9342e562c Removed javascript from AssetAdmin template to prevent warnings 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66398 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-22 03:47:56 +00:00
Sean Harvey
f5a5002f14 MINOR Tidied up AssetAdmin functions 
MINOR Removed commented out junk
 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65897 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-14 00:45:32 +00:00
Sam Minnee
c2fe5b15ae FEATURE #594: Added javascript-on-demand support 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65689 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-12 04:31:53 +00:00