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
Ingo Schommer
6db9650b32
ENHANCEMENT Adjusted AssetAdmin to Folder->can*() changes
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65455 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 12:21:41 +00:00
Sean Harvey
a0c87179e5
MINOR Tidied up messy code formatting
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 23:47:28 +00:00
Sean Harvey
e052d533f9
MINOR Tidied up AssetAdmin->SiteTreeAsUL()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65409 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 22:56:24 +00:00
Sean Harvey
97c2f470e0
Removed redundant code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 22:51:30 +00:00
Sam Minnee
cac5594e35
MINOR: Removed redundant code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65233 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 23:31:42 +00:00
Sean Harvey
bd10591e7c
ENHANCEMENT Added filter/search capability to AssetTableField, this is similar to MemberTableField, except you search by file name.
...
ENHANCEMENT Refactored CSS applied to filter boxes by using common selector
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 23:09:49 +00:00
Ingo Schommer
e1d5fc9db6
BUGFIX Fixed menu titles entity references in CMSMain and AssetAdmin
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-02 22:45:05 +00:00
Ingo Schommer
2cdf57053f
FEATURE Added CMSMenu and CMSMenuItem and adjusted existing LeftAndMain subclasses to use new notation.See #2872 (thanks to hamish for the patch!)
...
API CHANGE Removed LeftAndMain::add_menu_item(), LeftAndMain::remove_menu_item(), LeftAndMain::replace_menu_item(), LeftAndMain::clear_menu()
MINOR Disabled LeftAndMainTest, now covered by CMSMenuTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65095 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-02 21:27:55 +00:00
Sean Harvey
21a61404ba
MINOR Code formatting cleanup in AssetAdmin->addfolder()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 01:23:52 +00:00
Sean Harvey
1c9c600e68
MINOR phpdoc tweaks
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 00:34:41 +00:00