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,223 Commits 29 Branches 403 Tags 28 MiB
5bec1d7088
Commit Graph

76 Commits

Author SHA1 Message Date
Andrew O'Neil
27bfe60a33 BUGFIX: #3596 - Creating more than one new folder causes infinite loop (hamish) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72852 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:48:08 +13:00
Sam Minnee
39f7d47b84 BUGFIX #3590: Allow subclassing of Folder 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@72693 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:48:06 +13:00
Ingo Schommer
b423bbe5e0 BUGFIX Disabled inline "create folder" and "upload" for anything but Flash Player 9 - versions below have general compatibily issues, versions above (Flash Player 10) have new security restrictions around file dialogues which require an SWFUpload upgrade (see #3023) 
ENHANCEMENT Allowing setting of foldername in AssetAdmin->addfolder() to simplify the inline "create folder" logic (doesn't need to send of a fake ajax form-save from CMS into /admin/assets just to save the folder name) (see #3412)
ENHANCEMENT Removed BrowserDetect javascript library which was randomly placed in Security_login.js and just included in AssetAdmin. Reverted to regex-matching for simple browser detection for now
BUGFIX Fixed "cancel" button for inline "create folder" functionality (was not stopping event in IE7)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70775 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:48:04 +13:00
James Kirkus-Lamont
c15b86a86e BUGFIX: cms ui added colon to image upload prompt (inline with other step) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70683 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:48:03 +13:00
Sean Harvey
39b10d2923 MINOR Code formatting for delete unused thumbnails functionality 
MINOR Use FormResponse instead of echoing strings as JS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70678 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:48:02 +13:00
Ingo Schommer
c2de88f893 BUGFIX Fixed js error due to inlined inclusion of CMSMain_upload.js which was conflicting with inline initialization. Disabled initializiation as the flash uploader was pulled out a while ago anyway (see #3251) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69657 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:50 +13:00
Ingo Schommer
aae16dc1f6 MINOR Hardcoded yoursite.com in assets treeview (see #3230) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68534 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:46 +13:00
Ingo Schommer
12f46de93d MINOR fixed php notices on AssetAdmin (see #3187) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68517 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:46 +13:00
Sam Minnee
fc14227238 BUGFIX: Fixed warning on AssetAdmin (merged from trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66940 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
43598d35e1 MINOR Added php end tag to AssetAdmin, coding conventions 
MINOR Fixed tabbing for various functions
MINOR Removed commented out code that shouldn't be lying around

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sam Minnee
45c4d670b6 API CHANGE: Revamped CMSMenu system to not instantiate any objects, so that _config.php doesn't get fskd 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Andrew O'Neil
53f59b6593 FEATURE #1531 - Allow moving files in root assets file (hamish) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66163 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13: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
Sean Harvey
e0982889b5 BUGFIX AssetAdmin->Link() returned a trailing slash that was not necessary. See ticket #2884 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63457 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-01 06:44:56 +00:00
Ingo Schommer
9d8b60ac87 ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-27 16:02:38 +00:00
Andrew O'Neil
c2da78d2e9 MINOR Fixed PHP notice 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-01 04:54:48 +00:00
Sam Minnee
387b5edd21 Merged changes from branches/2.2.2-assets: 
Static publishing
Ability to lock down comments to logged-in members only

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60470 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 02:59:27 +00:00
Ingo Schommer
9a6483b024 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 02:25:44 +00:00
Ingo Schommer
689c34400b (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-09 05:57:44 +00:00
Ingo Schommer
4af9a5b5a2 BUGFIX Re-enabled "Unused files" tab in AssetAdmin (fixed memory problems) 
MINOR Moved getUsedFilesList() and getAssetList() from AssetAdmin to Folder (needed for Folder->getCMSFields()), changed their visibility from private to protected

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@55081 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-05-24 05:19:42 +00:00
Ingo Schommer
168b9673d7 BUGFIX getUsedFilesList() now gets single DataObjects one-by-one instead of the whole DataObjectSet of *all* File instances in the database (which is a huge memory hog on each AssetAdmin call) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@55080 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-05-24 05:16:05 +00:00
Sam Minnee
5aea02ee82 Merged revisions 52392 via svnmerge from 
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r52392 | sminnee | 2008-04-09 18:00:12 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Upgraded SWFUpload to improve CMS uploads
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53499 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:39:23 +00:00
Ingo Schommer
533aec3815 API CHANGErefactored upload functionality from File into newly created Upload class 
API CHANGE deprecated some File functions and attributes
API CHANGE moved management function from File to Filesystem and added permission checks: sync(), loadContent(), fixfiles(), moverootfilesto()
API CHANGE deprecated use of File->loadUploaded()
ENHANCEMENT added filesize and extension validation to AssetAdmin and FileField
FEATURE added tests for Upload class

Merged revisions 47617 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq

........
  r47617 | ischommer | 2008-01-04 19:20:29 +1300 (Fri, 04 Jan 2008) | 5 lines

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52205 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 08:20:13 +00:00
Matt Peel
66c3db1e8e Reverted geoffm's accidental commit to /open 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 02:10:37 +00:00
Geoff Munn
4475726ad6 First post 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 01:06:39 +00:00
Sam Minnee
f7474bf059 Added to main CMS controllers 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49888 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-20 09:41:33 +00:00
Sam Minnee
c9fc1ea46b Merged revisions 48425 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r48425 | sminnee | 2008-01-22 17:16:41 +1300 (Tue, 22 Jan 2008) | 3 lines
  
  Updated AssetAdmin to use TreeTitle() in place of Title for tree generation
  > Updated TreeTitle() to allow use of alternateTreeTitle() in decorator
  > Updated File to allow the insertion of extra columns by decorator
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49771 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-19 00:24:13 +00:00
Sam Minnee
29d9896dcf Merged revisions 48401 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r48401 | sminnee | 2008-01-22 14:27:13 +1300 (Tue, 22 Jan 2008) | 2 lines
  
  Updated core to allow for subsites restriction of filesystem: Folder::getCMSFields() is now responsible for generating the folder form.
  Folder::syncChildren() now exclusively uses DB::query() calls instead of DataObject::get().
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49770 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-19 00:23:57 +00:00
Andrew O'Neil
c2f1785ff6 Disabled unused files list, as it uses way too much memory 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49185 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-07 03:36:02 +00:00
Sam Minnee
7d00a996b4 rbarreiros: #1918 Translate newsletter and other strings 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 03:28:13 +00:00
Sam Minnee
d9ac1a1f85 Improved API documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47798 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 00:33:49 +00:00
Sam Minnee
bfc448fa7f Added package tags and docblock info for API documentation 
Fixed whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47726 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 06:41:55 +00:00
Andrew O'Neil
1e87e05e0b Merged revisions 46433 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy

........
  r46433 | aoneil | 2007-12-06 15:23:18 +1300 (Thu, 06 Dec 2007) | 2 lines
  
  Some basic styling for HasManFileField
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46790 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 22:03:48 +00:00
Andrew O'Neil
14d802454d Merged revisions 46776 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy

........
  r46776 | aoneil | 2007-12-14 09:49:36 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Fix ambiguous SQL
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46788 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:56:37 +00:00
Andrew O'Neil
b4b4311eb6 SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44898 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:31:22 +00:00
Andrew O'Neil
d44ef49db6 Revert r44795 (merged from branches/2.2.0, r44812) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:30:25 +00:00
Andrew O'Neil
58c39593b3 Update SWFUpload to 7.0-beta-3 (merged from branches/2.2.0, r44795) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44896 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:30:08 +00:00
Andrew O'Neil
b166122aa7 #1703 - Folder dropdown doesn't refresh after adding a folder 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44661 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 21:47:45 +00:00
Andrew O'Neil
2088a0ffc5 #1484 - Cannot upload files 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44601 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 23:01:17 +00:00
Normann Lou
b10466a0da fix ambigours ID in Where clause in unUsedFiles function 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44460 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 06:35:55 +00:00