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,856 Commits 29 Branches 403 Tags 28 MiB
9e783cfc5c
Commit Graph

46 Commits

Author SHA1 Message Date
Sam Minnee
7c863341ea Merge branch '2.4' into post-2.4 2012-02-03 09:42:30 +13:00
Ingo Schommer
bb757d13a4 ENHANCEMENT Allow editing of new File.ShowInSearch flag through AssetTableField 2011-09-15 16:17:47 +02:00
Ingo Schommer
aa1ce1af39 MINOR Argument checks in AssetTableField->getCustomFieldsFor() (AIR-40) 2011-08-26 09:26:17 +02: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
Ingo Schommer
fc19125698 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:35 +13:00
Andrew Short
fcbce693b7 BUGFIX: Properly closed a tag in AssetTableField that was hiding content after the back link tracking tab. 
From: Andrew Short <andrewjshort@gmail.com> (from r95036)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97437 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:22 +13:00
Sam Minnee
37dcb0d970 MINOR moved File validation to the model (from r92044) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96815 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:16 +13:00
Sam Minnee
713f595138 MINOR implement the allowedExtensions functionality of AssetAdmin when you rename a file (from r92037) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96814 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:16 +13:00
Sam Minnee
096bfb2565 BUGFIX: Fix image tracking not working cross subsite (from r88008) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96782 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:11 +13: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
2436d7869a BUGFIX If image does not exist in the file system, don't show a non-object error when viewing the Image/File record in AssetTableField (from r82390) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89812 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:33:51 +00:00
Sean Harvey
65a9830b13 BUGFIX Paging of search results now works for AssetTableField by overloading the TableListField link methods (from r81190, r82188) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89811 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:32:57 +00:00
Geoff Munn
ecb09780a4 MINOR FIX: column names escaped 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@85459 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-31 22:24:23 +00:00
Sam Minnee
db01848417 BUGFIX Fixed FileSearch parameter in AssetTableField. Pagination of filtered search results and refresh of the tabular view after saving a popup wasn't working because the search parameter wasn't retained 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81460 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-09 05:41:00 +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
Sean Harvey
3680bbea46 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:22:20 +00:00
Ingo Schommer
7e09cc8a18 MINOR merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69858 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-07 23:01:47 +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
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
Sean Harvey
827224b47f BUGFIX Removed offending $this->canEdit() which returned a boolean, not appropriate to be passed into Member::mapInCMSGroups() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-11 20:45:11 +00:00
Sam Minnee
e28bfb2730 Merged branches/2.2 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65524 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-10 04:07:03 +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
118efae75d BUGFIX Adjusted HeaderField and LabelField implementation to new constructor arguments (see r64421) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64423 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-16 13:27:12 +00:00
Sean Harvey
2da4e8a66a BUGFIX Asset area in CMS refused to load because of error in code from r60920 - #2751 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61195 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-20 10:27:04 +00:00
Sam Minnee
27fd6937a5 Updated AssetTableField to work with ComplexTableField updates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60913 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-18 00:52:15 +00:00
Ingo Schommer
a894ad377d MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +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
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
1cf8093821 Added 'Edit this Image' text so people know they can click to access the ImageEditor 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44338 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-06 03:28:47 +00:00
Andrew O'Neil
b0d78ea5bd mujma: BUGFIX: All global variables added to ImageEditor namespace, solved issue reported in ticket 102, http://support.silverstripe.com/gsoc/ticket/102 (merged from gsoc branch, r42789) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42989 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 23:26:35 +00:00
Andrew O'Neil
6aed530816 mujma: ENHANCEMENT: Added garbage collection (merged from gsoc branch, r40463, r42790, r41070) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42958 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 21:34:57 +00:00
Andrew O'Neil
ab88be37fe Gallery Module Update (merged from trunk, r42474) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42939 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 05:17:35 +00:00
Andrew O'Neil
60440e888f Explicitation of the swf file which seem like pdf file (merged from 2.1.0 branch, r42424) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42936 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 05:12:33 +00:00
Romain Louis
0c0bb09e24 Detail Form Modifications to be able to set some file parameters for the gallery 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42327 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-20 04:06:50 +00:00
Ingo Schommer
83d500865e bfojcapell: strings replaced with _t() calls 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42134 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:33:05 +00:00
Ingo Schommer
f8222a7506 mujma: REFACTORING: Removed unnecessary loading of Activator.js 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42082 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:04:32 +00:00
Ingo Schommer
31a9fbee3c mujma: Fixed various browser compatibility problems. Now should work on Safari 3.0.2 /Windows, FF 1.5/2.0 Windows/Linux. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41891 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:19:43 +00:00
Ingo Schommer
bd58e931bb mujma: All PHP and JS files for ImageEditor?, works on FF 1.5/2.0. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41872 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:08:25 +00:00
Hayden Smith
abb9a61d0d Moved CMS module to open source path 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39000 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-07-19 10:40:05 +00:00