tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
4,421 Commits 31 Branches 527 Tags 162 MiB
cbd2bfb976
Commit Graph

167 Commits

Author SHA1 Message Date
Andreas Piening
8ee148297a MINOR: #4674 applied patch for special chars in folder titles 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97669 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:15 +13:00
Andrew Short
8361a41c16 MINOR: Don't include files and folders starting with an underscore in the asset system. 
MINOR: Automatically rename files and folders beginning with an underscore.

From: Andrew Short <andrewjshort@gmail.com> (from r97400)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97435 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:12 +13:00
Sean Harvey
e77964a5b9 API CHANGE #3600 Inconsistency in File::getURL() which returns an absolute URL, when it should be relative - please use getAbsoluteURL() instead for old behaviour 
API CHANGE #3600 Image no longer has an explicit getURL() method, instead it inherits getURL() from File which returns a relative URL


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96988 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:08 +13:00
Sam Minnee
67f827cb5a BUGFIX: Apply file extension restrictions to extensions properly. (from r93531) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96761 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:07 +13:00
Sam Minnee
da2f90d187 BUGFIX: Changed default config to restrict file-upload types to ADMINs, since it's protecting against security holes. (from r93327) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96759 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:06 +13:00
Sam Minnee
3c88905299 BUGFIX: Add a default list of allowed extensions so that the CMS works reasonably out of the box. 
BUGFIX: Allow files that don't have an extension (most notably folders)
BUGFIX: Ensure that file URL rewriting works if you rename a page twice without publishing.
BUGFIX: Ensure that the page doesn't go green after URLs are rewritten
ENHANCEMENT: Recognise HTTP_X_FORWARDED_HOST header and use that in place of HTTP_HOST (from r93148)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96752 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:06 +13:00
Sam Minnee
5930458997 MINOR moved allowed_extensions and friends to the model layer (from r92046) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96743 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:05 +13:00
Sam Minnee
b4dc73e002 MINOR moved File validation to the model (from r92044) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96742 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:05 +13:00
Sam Minnee
ba0dd8b5eb BUGFIX: Update file link tracking as part of Filesystem::sync() (from r89907) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96722 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:03 +13:00
Sean Harvey
28ee3ec772 MINOR Fixed error message for Folder::addUploadToFolder() to be accurate 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94136 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:56 +13:00
Sean Harvey
b85af0194e ENHANCEMENT Filesystem::sync() now accepts a folderID argument, meaning you can specifically target a folder and it's children to sychronise, instead of everything (from r82840) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89724 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:33:55 +00:00
Sean Harvey
d1af532bf4 MINOR Destroy the child object in Folder::syncChildren() after destroying it's internal records and components (from r82790) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89722 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:32:11 +00:00
Sean Harvey
6b0a508502 BUGFIX Folder::syncChildren() now uses far less memory - we do this by destroying the child object memory after use (from r82780) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89719 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:30:48 +00:00
Sean Harvey
65501a6ff2 ENHANCEMENT Filesystem::sync() will now return the number of added and deleted files and folders instead of null (from r82616, 82617 and 82724) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89717 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:29:20 +00:00
Sam Minnee
aaeaf6ccb2 BUGFIX: Fixed image link rewriting and added a test. (from r89011) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89208 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:40:06 +00:00
Sam Minnee
a920b7689f BUGFIX: Fix image tracking not working cross subsite (from r88008) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89177 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:21:02 +00:00
Sam Minnee
f84180813f #150 - Pages with similar content 
#148 - Stable against restructures (from r87251)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89174 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:19:25 +00:00
Geoff Munn
9131df8061 MINOR FIX: full text column now named 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86517 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-17 00:11:20 +00:00
Ingo Schommer
5708f79312 BUGFIX Consistently returning from a Security::permissionFailure() to avoid ambiguous situations when controllers are in ajax mode 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86008 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-10 02:00:42 +00:00
Julian Seidenberg
844853ab10 BUGFIX: Ticket #4220 - Copying of uploaded files from temp to assets folder fails on IIS installs; simple patch fixes it 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85696 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-03 22:45:15 +00:00
Geoff Munn
e031478576 MINOR FIX: column names escaped 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85451 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-31 06:06:44 +00:00
Sam Minnee
e3d31f1bdd BUGFIX: Use default File classname in Folder::syncChildren() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85085 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-24 07:21:08 +00:00
Sean Harvey
f7dc370b16 BUGFIX #4486 Make use of DataObject::get_by_id() in File::getRelativePath() instead of building ID query manually in a get_one() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84843 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-19 23:39:39 +00:00
Sam Minnee
6a52153b9f BUGFIX #4285: Fixed application of decorators when add_extension not used. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81676 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-13 03:56:26 +00:00
Sam Minnee
f41e2b474c ENHANCEMENT: Improved performance of admin/assets area. 
BUGFIX: Fixed bug in 'sake interactive' error handling.
BUGFIX: Fixed bugs with MSSQL and Windows support.
API CHANGE: Added FormAction::setButtonContent()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80782 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-01 22:27:18 +00:00
Sam Minnee
73cfe3ab84 API CHANGE: Added increase_time_limit_to(), which respects safe_mode. 
API CHANGE: Added no-arg option to increase_memory_limit_to()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80241 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-28 02:36:46 +00:00
Sam Minnee
547a9b700d BUGFIX #4303: Fixed File::CMSThumbnail() HTML 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80184 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-27 03:30:47 +00:00
Sam Minnee
e0fbc7ac83 BUGFIX: Added explicit DataObjectDecorator::load_extra_statics() calls as a workaround for issues with extensions defined directly in-object. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79720 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-22 02:42:42 +00:00
Sam Minnee
8d4e1dd6e0 ENHANCEMENT ajshort: Major refactoring of FileIFrameField and ImageField to use the new URL handler. Access control to the field is now controlled by the form, and ImageField now uses a codebase much more aligned with FileIFrameField. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77012 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-17 22:06:59 +00:00
Sean Harvey
b1018f5864 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76846 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 05:26:47 +00:00
Sean Harvey
9044d7a141 MINOR Fixed misleading information in File::onBeforeWrite() phpDoc 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76546 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-11 05:34:56 +00:00
Sean Harvey
e41c0e2e55 BUGFIX Fixed error in Folder::getUsedFilesList() if ID column wasn't selected 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76544 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-11 05:30:29 +00:00
Sean Harvey
a5e82ddff1 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75590 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 01:20:24 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 00:07:39 +00:00
Sean Harvey
76b5adc979 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75579 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-28 23:52:15 +00:00
Sean Harvey
ec9765d9f2 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75572 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-28 23:40:35 +00:00
Geoff Munn
03acac8e59 API CHANGE: addslashes now DB-specific 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@74083 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-05 23:24:56 +00:00
Sean Harvey
69f1595cc8 BUGFIX Fixed possible SQL injection in file name part for File::find() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73436 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-20 01:36:19 +00:00
Ingo Schommer
6121cc4782 BUGFIX Validating $_FILES in Upload->validate() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73254 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-17 22:26:33 +00:00
Geoff Munn
807736490f API CHANGE: NOW() replaced with DB-specific version 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72922 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-11 21:50:03 +00:00
Sam Minnee
08a5a7c387 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72803 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-10 22:08:52 +00:00
Sean Harvey
4e0bf2c671 BUGFIX Fixed Upload::isValidSize() error if a file was uploaded without an extension 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71559 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-09 23:02:46 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-01 23:49:53 +00:00
Ingo Schommer
b7d394008e MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69957 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-10 11:35:50 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:19:48 +00:00
Geoff Munn
fe0a640c39 API CHANGE: fulltext and unique indexes are now arrays 
API CHANGE: db/build now no longer notifies you of changes which haven't actually happened.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69303 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-17 00:40:24 +00:00
Ingo Schommer
d26f08b481 MINOR merged branches/2.3 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@67465 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-04 22:38:32 +00:00
Sam Minnee
96c5be8252 Updating queries to be more DB agnostic 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66507 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-24 09:31:14 +00:00
Sam Minnee
93438e0be2 API CHANGE: Adding double quotes to all table and field references (a work in progress) 
API CHANGE: DataObject::get()'s GROUP BY clause is only generated for MySQL as it needs to be improved for other databases to accept it.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66427 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 23:28:16 +00:00
Sam Minnee
a3d3fb65a9 Updated SQL queries to be ansi compatable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 00:31:06 +00:00
Sam Minnee
2984355f43 Merged branches/2.3 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66395 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-22 03:33:00 +00:00
Will Rossiter
8052c5dce4 Merged pre-2.3-oct08 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66080 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-17 22:59:17 +00:00
Ingo Schommer
1b65a6bf46 MINOR removed debug commits from r65523 in Folder.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65537 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-10 11:33:29 +00:00
Sam Minnee
58dbe416ee Merged from branches/2.2 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65523 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-10 03:51:35 +00:00
Ingo Schommer
cfde8adaee API CHANGE Removed Folder->userCan*() and File->userCan*()permissions and added more consistent behaviour with Folder->can*() and File->can*() 
ENHANCEMENT Allowing decoration of can*() methods in File and Folder

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-07 12:17:42 +00:00
Sean Harvey
d145c50cc2 ENHANCEMENT Folder name can now be used for uploading files. Ticket #3026 - Thanks simon_w! 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65266 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 03:56:22 +00:00
Sam Minnee
5f177b9f08 BUGFIX #2056: Removed all references to deprecated Member::isAdmin() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65232 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-04 23:31:33 +00:00
Ingo Schommer
3edc358ead ENHANCEMENT Added fieldLabels() overloading to various DataObject subclasses. Use this method instead of directly calling _t() in getCMSFields(), and use fieldLabel('MyField') to get the label for a specific FormField. This way, we can transparently support formfield scaffolding and re-use the labels for search fields automatically. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65072 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-02 20:04:10 +00:00
Ingo Schommer
252f739919 API CHANGE Removed deprecated File->setMaxFileSize(), use Upload class 
API CHANGE Removed deprecated File->getMaxFileSize(), use Upload class
API CHANGE Removed File::sync(), use Filesystem::sync()
API CHANGE Removed deprecated File::fixfiles()
API CHANGE Removed deprecated File::loadContent(), use Upload class
API CHANGE Removed deprecated File::loadallcontent(), use Upload class

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64402 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-16 11:05:57 +00:00
Ingo Schommer
b3f57dd454 API CHANGE Removed Filesystem::moverootfilesto() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-16 11:03:45 +00:00
Sean Harvey
31df9f440f ENHANCEMENT Added additional known file types, for audio and video files 
MINOR Tweaked text of file type descriptions slightly

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64356 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-16 03:55:33 +00:00
Ingo Schommer
72047aa3a1 BUGFIX Fixing AssetAdmin translations which were previously moved to Folder.php - i18n::include_by_class() doesn't like filenames/namespaces which are in a different folder than the language file they're referenced in (see #2359) - started in r64076 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64077 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-10 17:35:24 +00:00
Ingo Schommer
f009e8de8a API CHANGE Moved PostBackup class to module (see r63758) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63759 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-07 16:42:25 +00:00
Ingo Schommer
5927bf2399 BUGFIX Fixed Upload->isValidExtension() - was checking array keys instead of array values .... 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-01 18:31:08 +00:00
Ingo Schommer
9371f4688b 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/sapphire/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-27 16:02:38 +00:00
Ingo Schommer
f0feea5109 API CHANGE Removed useless File->test() method 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63077 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-25 12:38:36 +00:00
Sam Minnee
f2c619d10c FEATURE: Files & Images tree now shows filename rather than meta-data title, to make it easier to find the file you're looking for 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62284 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-12 01:05:11 +00:00
Geoff Munn
864875c2fa Multiple 'protected' variable declaration fixed 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62184 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-10 22:01:09 +00:00
Sam Minnee
5fb17f1eca Improved File tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61462 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-25 01:42:27 +00:00
Sam Minnee
53cc576dab Reverted Folder::CanEdit() to its original behaviour; that of returning a many-many join. Note that this conflicts with DataObject::CanEdit() now. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60911 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-18 00:51:35 +00:00
Sam Minnee
4acd84a837 Trap potential data-integrity bug 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60778 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-14 22:20:14 +00:00
Hayden Smith
19da6e3128 Refactored [47088]: File::getFullPath now compares the filename with Director::baseFolder and returns filename if the filename stars with Director::baseFolder. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 22:26:52 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 02:51:33 +00:00
Andrew O'Neil
1107757128 MINOR: #2445 - Function getFilename in File.php cehcks for Name, but returns Filename (Blynx) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56944 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 05:52:58 +00:00
Andrew O'Neil
5ec9ff8862 FEATURE: #2166 - Ability to set deafult for all resampeld JPEGs (dio5) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56939 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 05:22:56 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +00:00
Ingo Schommer
b1ccd1a04d BUGFIX Unsetting unused objects to conserve memory in Filesystem::sync() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55082 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-05-24 05:23:24 +00:00
Ingo Schommer
0a3b20e672 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/sapphire/trunk@55081 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-05-24 05:19:42 +00:00
Ingo Schommer
d344eef293 Merged revisions 54204 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r54204 | ischommer | 2008-05-09 10:19:21 +1200 (Fri, 09 May 2008) | 1 line
  
  API CHANGE Made deleteDatabaseOnly() public (used in Filesystem::sync())
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55071 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-05-24 01:21:04 +00:00
Sam Minnee
091c0afc2e Merged revisions 52293 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52293 | aoneil | 2008-04-08 12:03:43 +1200 (Tue, 08 Apr 2008) | 2 lines
  
  don't cache in overridden instance_get(), as the fields are different for subclasses
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:47:29 +00:00
Ingo Schommer
1c929747ce Merged revisions 47623 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47623 | ischommer | 2008-01-04 21:44:51 +1300 (Fri, 04 Jan 2008) | 1 line
  
  fixed extension checking
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52400 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-09 11:13:24 +00:00
Ingo Schommer
00f95679ce Merged revisions 47621 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47621 | ischommer | 2008-01-04 21:44:07 +1300 (Fri, 04 Jan 2008) | 1 line
  
  added get_file_extension()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52398 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-09 11:08:58 +00:00
Ingo Schommer
b465a46bcc 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/sapphire/trunk@52205 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 08:20:13 +00:00
Ingo Schommer
5d1336a5a4 Merged revisions 47616 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47616 | ischommer | 2008-01-04 19:19:06 +1300 (Fri, 04 Jan 2008) | 1 line
  
  wording
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52203 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:10:51 +00:00
Ingo Schommer
e7a683c0c4 Merged revisions 51257 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51257 | ischommer | 2008-03-18 12:50:03 +1300 (Tue, 18 Mar 2008) | 2 lines
  
  ENHANCEMENT Deprecated Image->URL(), changed to Image->getURL() to be consistent with File class
  FEATURE File->getAbsoluteURL()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51251 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-17 23:50:18 +00:00
Ingo Schommer
1b5b3f8627 Merged revisions 51246 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51246 | ischommer | 2008-03-18 11:50:47 +1300 (Tue, 18 Mar 2008) | 1 line
  
  ENHANCEMENT findOrMake() now deals with absolute paths and replaces leading/trailing slashes before checking for existing folder objects in the database
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51240 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-17 22:51:25 +00:00
Ingo Schommer
265528a67c #2306 Attempt to unset static property File:: 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50729 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-09 05:08:08 +00:00
Ingo Schommer
844fe81cca removed alternative_instance_get() (only used for gallery-hack) 
refactored query-caching in instance_get() to just cache the raw db fields (unlikely to change) - overzealous caching was causing problems with wrong SQL selects on subsequent calls

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-07 03:19:49 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 01:06:39 +00:00
Sam Minnee
b10974b553 Merged revisions 48425 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/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/sapphire/trunk@49799 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-19 00:50:17 +00:00
Sam Minnee
8eb13d5128 Moved folder admin form to Folder::getCMSFields() to let you more easily manipulate the form with a decorator 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49797 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-19 00:49:33 +00:00
Andrew O'Neil
41b4064c9d Merged revisions 48857 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-ssopen

........
  r48857 | aoneil | 2008-01-31 09:19:00 +1300 (Thu, 31 Jan 2008) | 2 lines
  
  fix upload folder
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48952 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-01 01:21:42 +00:00
Andrew O'Neil
97f3d722b4 Add ability to choose which file to upload to in a FileField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48778 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-29 20:18:06 +00:00
Sam Minnee
b1d2e3906b API Documentation updates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags 
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 06:37:50 +00:00
Andrew O'Neil
4056408d73 Merged revisions 46775 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46775 | aoneil | 2007-12-14 09:40:30 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Fix loops when saving files
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46782 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:51:00 +00:00
Andrew O'Neil
69d40fd5aa Merged revisions 46506 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46506 | aoneil | 2007-12-10 10:50:26 +1300 (Mon, 10 Dec 2007) | 2 lines
  
  Remove comments
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46775 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:47:23 +00:00
Andrew O'Neil
4a233b8854 Merged revisions 46505 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46505 | aoneil | 2007-12-10 10:48:37 +1300 (Mon, 10 Dec 2007) | 2 lines
  
  Load content from files into the database
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46774 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:47:07 +00:00
Andrew O'Neil
5b2bcd75c2 #1660 - Drag to relocate images not working 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44561 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 04:13:26 +00:00