yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,089 Commits 4 Branches 7 Tags
c7fabf84ba426cbe9e020e2d2c2d6dcfdd25e7f4
Commit Graph

26 Commits

Author SHA1 Message Date
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Shannon
a673babfb7 Fixes Content List View installation, removes unecessary properties from the RecycleBinEventArgs, updates both the upload and image cropper property editors to properly remove all files including any associated with variants, updates several other places to deal with variants and Property.GetValue(langId), adds notes, ensures we are returning the corect IDictionary instead of Dictionary for some interfaces 2018-04-04 13:11:12 +10:00
Stephan
09f499d5d6 More content refactoring (WIP, barely builds) 2017-11-08 08:39:36 +01:00
Stephan
c76403077f Normalize cr/lf/tab 2017-07-20 11:21:28 +02:00
Stephan
b26b415096 Merge origin/dev-v7-deploy into dev-v8-zbwip (builds) 2016-11-03 10:31:44 +01:00
Stephan
0597eea72b Resvolution - Components, Runtime & Booting 2016-09-19 16:33:43 +02:00
Stephan
14adc2a3b3 deploy-30 refactoring 2016-01-26 14:18:30 +01:00
Stephan
ebae2ceb73 Merge 7.4.0 into dev-v7-deploy 2016-01-13 12:15:23 +01:00
Wincent
96b24d7ee0 Removes dependency to System.IO.File 2015-12-31 12:01:35 +01:00
Stephan
f4c2437e53 Merge origin/7.4.0 into dev-v7-deploy 
Conflicts:
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
	src/Umbraco.Core/Media/ImageHelper.cs
	src/Umbraco.Web/Editors/ImagesController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
 2015-12-18 18:44:57 +01:00
Sebastiaan Janssen
1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Stephan
e68dda81d2 Try to make sense of files and medias for Deploy 2015-12-09 16:45:40 +01:00
Wincent
e0ee786271 Re-enables support for non media thumbnails 2015-12-04 09:31:39 +01:00
Wincent
5d9bde807e Changes GetBigThumbnail to image processor in mediahelper.service.js and fileupload.controller.js 
Changed ImageController.GetBigThumbnail to redirect
Changed thumbnail paths to include rnd equal to UpdateDate
 2015-12-03 17:27:47 +01:00
Shannon
c8482b9f59 Revert "Merge pull request #875 from Phosworks/U4-7312" 
This reverts commit 14265fc964, reversing
changes made to 18c3345e47.

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-11-25 20:27:58 +01:00
Shannon
b7795e19ef Changes bigthumbnail pr to not cache per second, just minute 2015-11-25 20:21:24 +01:00
Wincent
0409cbe613 Changed ImageController.GetBigThumbnail to redirect 
Changed thumbnail paths to include rnd equal to UpdateDate
 2015-11-09 21:41:25 +01:00
TimoPerplex
68ff77f5b6 This commit removes the hardcoded .jpg thumbnails 
This commit removes the hardcoded .jpg thumbnails and uses the image
original extension to create the thumbnail.
Because we now use the original extension the image is no longer masked
as another (extension is .jpg but the file is actually a .png)

This fixes issues with Internet Explorer used in combination with the
no-sniff header.
Ref topic:
https://our.umbraco.org/forum/umbraco-7/using-umbraco-7/66788-adding-nosniff-header-breaks-png-images-in-internet-explorer
 2015-07-24 16:27:26 +02:00
Shannon
389724cba5 Re-fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) 2014-05-09 14:06:15 +10:00
Sebastiaan Janssen
59cb1ad31e Revert "Fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) - this is done by using the entityResource in the mediaPicker but to do this we need to return a cut down version of the media properties in the additionalData which is tricky because the cropper stores json which is ntext and the existing sql didn't cater for this. This also cleans up the entity service and we no longer have this internal collection of properties, everything is just added to additionalData, then had to add mediaHelper method to deal with getting urls from a media 'entity' not just a media object." 
This reverts commit c38c2ede11.
 2014-05-08 16:08:16 +02:00
Shannon
c38c2ede11 Fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) - this is done by using the entityResource in the mediaPicker but to do this we need to return a cut down version of the media properties in the additionalData which is tricky because the cropper stores json which is ntext and the existing sql didn't cater for this. This also cleans up the entity service and we no longer have this internal collection of properties, everything is just added to additionalData, then had to add mediaHelper method to deal with getting urls from a media 'entity' not just a media object. 2014-05-07 23:55:20 +10:00
Shannon
5e43ddc13c Fixes: U4-4502 Umbraco7.0.4 media picker shows uploaded images minus 1 2014-03-24 13:43:20 +11:00
Shannon
98f76a989f Adds better error handling for the media picker - we were not detecting image types before and were getting loads of server errors. Fixes up some method return calls 2014-03-24 12:38:49 +11:00
Sebastiaan Janssen
36c107c0ef Quick fix for U4-4206 - not the absolute correct fix, but it'll get rid of that horrible null reference error 2014-03-19 14:30:53 +01:00
Shannon
6a6d9ec7b0 Updates the image helper and imagescontroller to never scale images larger than what they are. 2013-12-10 18:24:20 +11:00
Shannon
23cf5b544a Moved image handling to diff controller since it doesn't support the csrf header, need to test more in an hour (WIP) 2013-12-05 19:06:55 +11:00