Damian Mooyman
b552a7370f
Merge remote-tracking branch 'origin/3'
...
Conflicts:
tests/model/ImageTest.php
2015-09-09 15:44:47 +12:00
Damian Mooyman
dc4c40f642
Merge pull request #4507 from JorisDebonnet/resampled-images-in-folders
...
Save resampled images into a folder structure indicating transformations
2015-09-01 11:16:23 +12:00
JorisDebonnet
ea05526e9d
Save resampled images into a folder structure indicating transformations
2015-09-01 00:40:27 +02:00
Damian Mooyman
1686c83826
Revert #3425 #3396 to restore deprecated functionality
...
Fixes #4514
2015-08-24 11:26:25 +12:00
Damian Mooyman
09210efbc0
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
2015-07-31 15:49:35 +12:00
Damian Mooyman
7ee444e08a
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
Daniel Hensby
dd0e2dc362
FIX Image_Cached exists method doesnt check for positive ID
...
FIX Files should only report as "existing" if the file actually exists
2015-07-30 14:52:06 +12:00
Daniel Hensby
5f0d0ab66a
Merge pull request #4155 from kinglozzer/pulls/getfiletype-case
...
FIX: File::getFileType() was case sensitive (fixes #3631 )
2015-07-28 00:13:26 +01:00
Michael van Schaik
397eaa8cc4
Moving MP4 from audio category to movie Fix #4370
2015-07-08 15:58:38 +02:00
Damian Mooyman
e14f743bf0
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 13:07:41 +12:00
Damian Mooyman
1d122803cc
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
dev/SapphireTest.php
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
forms/DatetimeField.php
forms/NullableField.php
forms/NumericField.php
forms/gridfield/GridField.php
tests/control/DirectorTest.php
tests/model/DataObjectSchemaGenerationTest.php
tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
Damian Mooyman
21e891e28c
Merge pull request #4200 from cwchong/3.1
...
Bug fix: File->setName()
2015-06-18 16:37:56 +12:00
Damian Mooyman
55170a0b74
API make DataObject::validate public
2015-06-17 15:51:30 +12:00
Damian Mooyman
0103b076c3
Merge remote-tracking branch 'origin/3'
...
Conflicts:
forms/Form.php
model/ManyManyList.php
2015-06-17 15:41:13 +12:00
Ingo Schommer
b95fdc7ba0
Merge pull request #4286 from tractorcow/pulls/3.2/fix-public-validate
...
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-17 15:36:03 +12:00
Damian Mooyman
0abacaead6
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Damian Mooyman
58cc3da8d8
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-16 11:59:21 +12:00
Jonathon Menz
838926085c
API New and renamed image functions
...
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
2015-06-12 17:02:55 -07:00
Damian Mooyman
b42ddd107c
Merge pull request #3499 from colymba/ie-multi-file-upload-fix
...
FIX #3458 iframe transport multi file upload FIX #3343 , FIX #3148
2015-06-09 13:22:10 +12:00
Damian Mooyman
e9d4863828
API Formalise new additional arguments to DataObject::canCreate, DataExtension::augmentSQL, and DataObject::extendedCan
2015-06-09 11:31:34 +12:00
Damian Mooyman
786b1dd5d4
Merge remote-tracking branch 'origin/3'
...
Conflicts:
control/HTTPRequest.php
filesystem/Upload.php
model/ManyManyList.php
2015-06-09 11:10:14 +12:00
Jonathon Menz
223466a8b8
NEW Configurable file version prefix
...
Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this.
Filename | Old result | New result
-----------|------------|--------------
IMG001.jpg | IMG2.jpg | IMG001-v2.jpg
2015-06-03 09:24:30 -07:00
Jonathon Menz
44b1ff1931
NEW: Configurable file version prefix
...
Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this, with a default of '-v' proposed for SS4.0.
Filename | Old result | New result (with '-v' prefix)
-----------|------------|--------------
IMG001.jpg | IMG2.jpg | IMG001-v2.jpg
2015-06-03 08:55:38 -07:00
Damian Mooyman
8331171f2c
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Jonathon Menz
a56d08b1ae
FIX: TreeDropdownField Folder expansion
...
When viewing a Folder tree, an expansion icon was shown if the Folder had *any* children, but it should be restricted to children that are Folders.
2015-05-27 09:22:42 -07:00
cwchong
dc24d3f21f
Bug fix: File->setName()
...
Logical error. $base should use PATHINFO_FILENAME instead of
PATHINFO_BASENAME in order to exclude extension; final $name should
include a period before $ext as $ext uses PATHINFO_EXTENSION which
excludes the period.
2015-05-19 13:43:00 +08:00
Loz Calver
1cca37c908
FIX: File::getFileType() was case sensitive ( fixes #3631 )
2015-05-04 15:10:16 +01:00
Damian Mooyman
8e24511266
BUG Fix users with all cms section access not able to edit files
...
Fixes #4078
2015-04-20 18:20:56 +12:00
Ingo Schommer
72a284c9b8
Merge remote-tracking branch 'origin/3'
...
Conflicts:
core/Constants.php
docs/en/05_Contributing/01_Code.md
tests/model/SQLQueryTest.php
2015-04-09 16:26:16 +12:00
Turnerj
ae8dbe309b
FEATURE - Added maximum upload file size by type
...
This support is on both an instance level and a global default level.
2015-03-31 21:57:32 +10:30
Damian Mooyman
319b96b48b
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
wernerkrauss
033582abcc
Fixed typo in HtmlType translation key
2015-03-10 11:24:03 +01:00
Christopher Darling
2da0ebe148
Renamed IMagickBackend to ImagicBackend
...
Also updated config:: to Config:: on line #52
2015-02-27 11:19:09 +00:00
Aden Fraser
0223b6164c
Fixed " Image_Backend interface constructor needs updating (master) #3477 " on both the Image_Backend Model and Imagick_Backend filesystem class
2015-02-11 15:58:47 +00:00
Damian Mooyman
88fdc75456
Merge remote-tracking branch 'composer/3.1' into 3
...
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
Damian Mooyman
7816875e92
Fix file and uploadfield permissions
2015-01-12 10:56:25 +13:00
Damian Mooyman
644f38f2d6
Merge pull request #3726 from willmorgan/bugfixes/gd-image-exists
...
FIX: GD - check file exists before getimagesize
2014-12-12 08:30:39 +13:00
Will Morgan
b5c361a66c
FIX: GD - check file exists before getimagesize
...
Use is_readable to check the file exists and is readable
2014-12-11 15:21:38 +00:00
JorisDebonnet
af47a63322
File.php: support for MS Office template / macro files
...
Fixes #3692
2014-12-04 21:57:31 +01:00
Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Jeremy Shipman
392ddef2e8
FIX: Image resizing breaks when one of the resized image dimensions is between 0 and 1.
...
Solution: Round up to 1 instead of down to 0.
Converted php errors to exceptions in the process.
2014-10-30 14:21:04 +13:00
Devlin
478edfa0c6
BUG Upload: File versioning with existing files
...
reinsert oldFilePath = relativeFilePath in while loop
2014-10-22 08:48:55 +13:00
Thierry François
bbc1cb8270
FIX #3458 iframe transport multi file upload FIX #3343 , FIX #3148
...
UploadField now handles multiple file upload through iframe transport
correctly (mainly for IE) as well as upload errors on a per file basis.
2014-09-26 10:48:41 +03:00
Damian Mooyman
3ff4bf633e
Merge pull request #3407 from dhensby/pulls/file-link
...
Removing duplicate code and keeping File API consistent
2014-09-26 12:16:34 +12:00
Sean Harvey
6d12cf372e
Merge pull request #2921 from JayDevlin/2904-upload-file-versioning
...
BUG Upload: file versioning uses illegal underscore in filename
2014-09-24 15:59:53 +12:00
Sean Harvey
07eef2ece2
Removing deprecated class/functions marked for deprecation in 3.0/3.1
2014-08-25 12:06:05 +12:00
Daniel Hensby
6577324a9c
Removing duplicate code and keeping File API consistent
2014-08-20 11:18:18 +01:00
Sean Harvey
8bd867ef4e
Merge pull request #3334 from jedateach/fixes/imagick-padresize
...
Image Magick PaddedResize fix
2014-08-19 14:19:13 +12:00
Jeremy Shipman
bf3ad56674
FIX: Image_Backend -> croppedResize function doesn't include a backgroundColor, therefore this shouldn't be assumed in ImageMagick->croppedResize
2014-08-19 12:24:45 +12:00
Jeremy Shipman
02265dc3c4
FIX: Correctly paddedResize images in IMagickBackend.
...
FIX: Compression quality setting now takes effect.
fixes #3333
2014-08-19 12:24:07 +12:00