 Shannon
|
17b0547cfc
|
Merge commit '874f464a2b51000920e2323f93bea116546e9b88' into 7.1.5
Conflicts:
src/Umbraco.Core/IO/FileSystemExtensions.cs
src/Umbraco.Core/IO/UmbracoMediaFile.cs
src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
|
2014-07-10 11:53:45 +10:00 |
|
|
Shannon
|
874f464a2b
|
Fixes: U4-5190 Overwrite Media File in 6.2.1 - process cannot access along with a bunch of other undisposed disposables :/
|
2014-07-10 11:45:57 +10:00 |
|
|
Shannon
|
56001a8ccb
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Services/PackagingService.cs
|
2014-03-19 18:55:20 +11:00 |
|
|
stefana99
|
067268a96e
|
Changes to imageCropper, supports new mediafilesystem
|
2013-12-16 13:35:18 +00:00 |
|
|
Shannon
|
e02dddc747
|
obsoleting legacy prop eds
|
2013-09-25 19:03:05 +10:00 |
|
|
Sebastiaan Janssen
|
a1ee352514
|
Additional fix for U4-335 Image cropper out of memory
|
2013-05-31 05:46:10 -02:00 |
|
|
agrath
|
3594693f4b
|
Backported fix for u4-335 from Commit b15d0ab0b879 into 4.11.7
|
2013-04-22 11:12:03 -12:00 |
|
|
shannon@ShandemVaio.home
|
580cb340ac
|
Cleaning up folder structure (U4-56)
|
2012-06-22 20:39:48 +04:00 |
|