tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-05 10:59:35 +02:00
Code Issues Projects Releases Wiki Activity
2,715 Commits 29 Branches 517 Tags 147 MiB
8ae9db13c0
Commit Graph

92 Commits

Author SHA1 Message Date
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