yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,780 Commits 4 Branches 7 Tags
14ea374b24f694a5c8b882cf24e6486acfb12bc9
Commit Graph

7573 Commits

Author SHA1 Message Date
Sebastiaan Janssen
4d49268c47 U4-4515 GenericProperty.ascx.cs references non-existent lblAlias control, causing YSOD of death when editing certain document types 
Codebehind file somehow got out of sync
 2014-03-24 15:16:57 +01:00
Sebastiaan Janssen
bf2efd30e9 U4-4073 Audit Trail is missing from action menu 
Removed the icons for now as they are missing and should be new style icons anyway
 2014-03-24 09:34:47 +01:00
Shannon
187373132f Completes: U4-4154 convert existing property data from XML to JSON during upgrade v6 - 7 2014-03-24 18:44:18 +11:00
Shannon
79584a9cf9 Fixes thread safety issue with RichTextPreValueController 2014-03-24 16:32:42 +11:00
Shannon
96fa8c7dc9 Publicizes a few things, including the fix for U4-3981 Make Umbraco.Web.WebApi.Filters.UmbracoApplicationAuthorizeAttribute public 2014-03-24 15:41:46 +11: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
Shannon
2e8993adb8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	build/NuSpecs/tools/Readme.txt
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2014-03-24 11:31:52 +11:00
Shannon
81600f0f3c Merge branch 'patch-2' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-2 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2014-03-24 11:18:11 +11:00
Shannon
74ccd79408 Merge branch 'patch-1' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-1 2014-03-24 11:13:07 +11:00
Shandem
3e0a754dc0 Merge pull request #328 from arjanpot/7.1.0 
CropUrl should be formatted with InvariantCulture.
 2014-03-24 11:04:59 +11:00
Sebastiaan Janssen
29dbbee173 Imageprocessor config files are no longer required and shouldn't ship with Umbraco 2014-03-23 15:02:54 +01:00
arjanpot
cd31637371 CropUrl should be formatted with InvariantCulture. 2014-03-22 11:22:01 +01:00
perploug
ab70c98d4c Ensures the config is cleared properly every time 2014-03-20 09:41:30 -07:00
Jeavon Leopold
5c5827e319 If cropper property editor not in use on umbracoFile then we can use mediaItem.Url 2014-03-20 14:31:21 +00:00
Jeavon Leopold
2d2f57a71b GetCropUrl - needed to get the url from within the json within the check for a crop otherwise a exception can occur 2014-03-20 13:22:45 +00:00
designagencytom
6133e8f8c2 Update loadMemberGroups.cs 
Sort the roles alphabetically to make it easier to manage the list when it becomes very large.
 2014-03-20 13:02:25 +00:00
Jeavon Leopold
6a3fb87499 GetCropUrl to not use .Url property but get directly from cropper JSON 2014-03-20 12:42:05 +00:00
Jeavon Leopold
9b02457f7a Adding a basic unit test for GetCropUrl - more to come 2014-03-20 12:22:50 +00:00
Jeavon Leopold
6077e24685 Add GetCropUrl(string cropAlias) overload and fix mediaItem.Url 2014-03-20 11:23:17 +00:00
Sebastiaan Janssen
39a3a9dc56 Reference the correct ImageProcessor version to get it included in the build 2014-03-20 09:42:06 +01:00
Shannon
801a3731a2 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-20 17:55:03 +11:00
Shannon
bcb7561e74 fixes unit test 2014-03-20 17:44:13 +11:00
Shannon
f077520781 Fixes: U4-4154 convert existing property data from XML to JSON during upgrade v6 - 7 to ensure that other data types that have this property editor are upgraded as well. Fixes some of the installer bits so that the steps are not marked as completed if they have problems. 2014-03-20 17:35:51 +11:00
Shannon
61ec1e4c35 Fixes the Url property to work with the image cropper to be consistent with the upload field. 2014-03-20 14:58:18 +11:00
Shannon
3710c0916c Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property). 2014-03-20 14:57:48 +11:00
Shannon
863667f5bd Moves the image crop enums to their correct location and renames them to be more descriptive (less generic). 2014-03-20 14:27:58 +11:00
Shannon
7475851bb5 Ensures that we log exceptions instead of completely ignoring them 2014-03-20 14:17:00 +11:00
Shannon
0bc621c40f Merge branch 'Jeavon-7.1.0-ImageCropper-JeavonWIP' into 7.1.0 2014-03-20 13:19:26 +11:00
Shannon
620fbde1db Merge branch '7.1.0-ImageCropper-JeavonWIP' of https://github.com/Jeavon/Umbraco-CMS into Jeavon-7.1.0-ImageCropper-JeavonWIP 
Conflicts:
	src/Umbraco.Web/ImageCropperBaseExtensions.cs
 2014-03-20 13:18:57 +11:00
Shannon
39e7947435 fixes merge issues 2014-03-20 13:15:53 +11:00
Shannon
2792937b17 Merge branch '7.1_U4-4447' of https://github.com/arknu/Umbraco-CMS into arknu-7.1_U4-4447 
Conflicts:
	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
 2014-03-20 13:10:39 +11:00
Shannon
af9a9a9a7a Fixes: U4-4481 Image cropper pre value editor doesn't validate properly 2014-03-20 13:03:30 +11:00
Shannon
83f4c0262e Fixes: U4-4475 Creating new member doesn't put it in examine. Fixes up some cache refreshers to ensure they are calling the base method so that events fire consistently. 
Conflicts:
	src/Umbraco.Web/Cache/UserPermissionsCacheRefresher.cs
 2014-03-20 12:38:19 +11:00
Shannon
08d4ce7667 Fixes: U4-4475 Creating new member doesn't put it in examine. Fixes up some cache refreshers to ensure they are calling the base method so that events fire consistently. 2014-03-20 12:36:13 +11:00
Shannon
2340adbe94 Fixes: U4-4425 Umbraco Macros break on quote, U4-4290 RTE changes Macro parameter values containing right angle brackets, U4-4442 Line break in macro text area breaks the Macro 2014-03-20 12:21:40 +11:00
Shannon
fb6b234491 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-20 10:38:40 +11:00
Shannon
15222e176e Fixes: U4-4474 YSOD when expanding Members tree 2014-03-20 10:37:54 +11:00
Shannon
63b92eaee5 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
 2014-03-20 09:54:13 +11:00
Shannon
84dd7dc61a Fixes: U4-4466 6.2-beta - Creating Member Type without Alias results in no viewable Member Types in back office 2014-03-20 09:52:31 +11:00
Sebastiaan Janssen
5a4b09f9d1 Make sure we use the latest ImageProcessor version in VS as well, not just in the nuget package. 2014-03-19 19:56:48 +01:00
perploug
bbbd03f001 Final tweak to the U4-4477 - media items could not be retreived on refreshing the editor 2014-03-19 19:14:39 +01:00
perploug
4a721ddf34 Fixes: U4-4477 Single Media picker doesn't show thumbnail any more 2014-03-19 18:44:46 +01:00
Jeavon Leopold
d88745bf49 Adding ToLowerInvariant to compares and also removing a redundant method copied in from my cropper package but not needed 2014-03-19 16:53:13 +00:00
perploug
3543204794 Revert "Merge" 
This reverts commit 1573eb2f74.
 2014-03-19 09:51:07 -07:00
arknu
c565744a9b Fix drag-and-drop upload 2014-03-19 17:46:04 +01:00
perploug
2470ec3ded Minor addition to the U4-4477 fix 2014-03-19 09:38:27 -07:00
perploug
7b4f7abbcd Fixes: U4-4477 Media picker doesn't show thumbnail any more 2014-03-19 09:38:24 -07:00
perploug
1573eb2f74 Merge 2014-03-19 09:38:22 -07:00
Jeavon Leopold
e8e8b536f1 Fix for GetCropUrl method when mediaItem.Url has JSON data 2014-03-19 16:12:30 +00:00