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

9932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
f6d56f51d4 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 
Conflicts:
	src/Umbraco.Core/Services/IRelationService.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
 2014-04-02 12:01:55 +02:00
Sebastiaan Janssen
53c0bd6938 Fixes: Password is not saved when using the Register snippet 2014-04-02 11:59:16 +02:00
Sebastiaan Janssen
a768fe5bb3 Ports behaviour from membershiphelper from v7 to 6 to make them the same 2014-04-02 11:42:48 +02:00
Sebastiaan Janssen
d9c66cd4b3 Adds AddRelation and missing events in RelationService from v7 into v6 2014-04-02 11:41:59 +02:00
Sebastiaan Janssen
77d910b6b6 We don't really need to scream greetings to people who try to use the member picker 2014-04-01 19:14:42 +02:00
Sebastiaan Janssen
47044b3a77 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-01 16:46:43 +02:00
Sebastiaan Janssen
5b693f9310 Adds ability to add/remove a single role to/from a single member, which is much nicer than having to instantiate arrays 2014-04-01 16:43:11 +02:00
Sebastiaan Janssen
40ebc1295c Fixes error thrown when saving password and actually using the Umbraco membership provider 2014-04-01 15:30:42 +02:00
Sebastiaan Janssen
b769b224c2 Fixes error thrown when saving password and actually using the Umbraco membership provider 2014-04-01 15:29:16 +02:00
Sebastiaan Janssen
89efe40f41 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-04-01 14:27:47 +02:00
Sebastiaan Janssen
51660d918c Assembly redirect seems to help a lot installing NuGet pkg, should finally be able to close U4-4510 nuget targets file creates an invalid path in the property group 2014-04-01 14:22:13 +02:00
Sebastiaan Janssen
ea7b053106 Merge pull request #340 from leekelleher/U4-4550 
Fixes: U4-4550 Media Picker preview with transparent images
 2014-04-01 13:06:58 +02:00
Sebastiaan Janssen
3e17201ce7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-04-01 11:59:26 +02:00
Sebastiaan Janssen
1f03983628 Clean up belle/build folder when building with build.bat to make sure it's pristine 2014-04-01 11:54:25 +02:00
Sebastiaan Janssen
15aa6fc4b8 Fixed U4-4576 7.0.4 : InternalMemberSearcher config incorrectly uses 'enableLeadingWildcards', should be 'enableLeadingWildcard' 2014-04-01 11:53:56 +02:00
Sebastiaan Janssen
41e8a9ef2d Fixed U4-4576 7.0.4 : InternalMemberSearcher config incorrectly uses 'enableLeadingWildcards', should be 'enableLeadingWildcard' 2014-04-01 11:51:51 +02:00
perploug
a492976a32 Fixes: U4-4557 Color Picker - default is black, but it can't be added without choosing another color first 
Sets color to be black by default, so will be added if you click add
without setting anything, so its consistent with the default swatch
 2014-04-01 10:08:50 +02:00
perploug
88e09f9077 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-01 10:02:23 +02:00
perploug
65a1709bd3 Fixes: U4-4537 Macro Textbox parameter in RTE Encoding issue 2014-04-01 10:02:10 +02:00
Sebastiaan Janssen
6478a8424a Fixes test, additional Tag mapper requires count to be updated 2014-04-01 09:11:07 +02:00
leekelleher
55ade4e491 Replaced solid/semi-transparent background, with a checkered background image. 2014-03-31 22:45:35 +01:00
Stephan
a767aa9f3a Merge pull request #342 from kipusoep/7.1.0 
Changed $('#form1') usage to $('form')
 2014-03-31 18:19:29 +02:00
Sebastiaan Janssen
50321e5936 Merge pull request #336 from bjarnef/7.1.0_-_U4-4026 
Fix for U4-4026 Inline styling affect header text
 2014-03-31 17:32:50 +02:00
perploug
1321702d19 Fixes: U4-3649 Bottom button bar gradient overlaps last field 
Temp fix, as we will likely refactor or editor directives before
building more core editors
 2014-03-31 13:24:30 +02:00
perploug
005ff2f830 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-31 13:17:27 +02:00
perploug
dff3fde840 Fixes: U4-4553 7.1 Template drop down has values but is blank 
patches the it on the clientside for now, longerterm solution is to have
templates being returned as prevalues, but will leave that to shannon as
there could be other things accidentally being poked doing that.
 2014-03-31 13:17:15 +02:00
Sebastiaan Janssen
44504ff6af Fixes summary for the TagMapper 2014-03-31 12:59:28 +02:00
Sebastiaan Janssen
25d3389759 Merge pull request #341 from robertjf/7.1.0 
Fixes #U4-4544 Issue: TagService.GetAllTags(group) throws Exception in MappingResolver
 2014-03-31 12:57:51 +02:00
Robert Foster
3f97c74712 removed commented out code 2014-03-31 22:00:54 +11:00
perploug
1152b61fb0 7.1 login greetings update 2014-03-31 12:43:05 +02:00
perploug
b1842de045 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-31 12:37:26 +02:00
perploug
750a2862ee Fixes: U4-4562 Images and markdown editor 2014-03-31 12:37:08 +02:00
perploug
7632075df4 Fixes: U4-4536 Tree points to wrong views after install 2014-03-31 12:29:44 +02:00
perploug
aa75cd4ea8 Fixes: U4-4549 Related Links "New Window" checkbox has css "display: none" 2014-03-31 12:28:56 +02:00
Sebastiaan Janssen
06827bd7a5 Merge pull request #338 from vnbaaij/7.1.0 
Solution for  U4-4548
 2014-03-31 11:57:13 +02:00
Stefan Kip
9a82ab7d4a Changed $('#form1') usage to $('form') 
I'm having an issue with v6.1.6 where the form's id is 'aspnetForm' instead of 'form1', I don't know why.
Using $('form') is much safer than using $('#form1').
 2014-03-31 09:56:16 +02:00
Robert Foster
b1037d1936 Added a TagMapper class to resolve ITag back to TagDto. 2014-03-30 19:07:35 +11:00
leekelleher
ccdc3a1eab Fixes: U4-4550 Media Picker preview with transparent images 2014-03-28 16:59:34 +00:00
Vincent Baaij
a47387fec0 Solution for U4-4548 2014-03-28 16:03:51 +01:00
perploug
c29d08c915 Fixes: U4-4489 7.1 RC, warn about changes partially overlays breadcrumb 2014-03-28 11:00:29 +01:00
perploug
b8f796eb2c Fixes: U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper' 2014-03-28 10:39:24 +01:00
Shannon
b9088c9ac0 fixes build 2014-03-28 08:51:25 +11:00
Shannon
7a8f8ac0fe Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-28 08:31:52 +11:00
Shannon
49cf0f98ce U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper 2014-03-28 08:31:21 +11:00
Shandem
22ffa86e18 Merge pull request #301 from Jeavon/U4-1752 
U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper
 2014-03-28 08:21:32 +11:00
perploug
c4e2d98138 U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper' 
Replaces the old media api with the resolveFile helper methods
 2014-03-27 02:46:32 -07:00
Shannon
c01211c62d Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
 2014-03-27 17:28:46 +11:00
Shannon
d8a3e00440 Fixes: U4-2843 Copying Document Type when Selecting Master Doesn't Work (Master ignored), U4-3552 Copy nested document type is failing 2014-03-27 17:26:55 +11:00
Shannon
264c537b50 Fixes: U4-4530 Edit Profile Snippet: Check for null before loop 2014-03-27 16:52:43 +11:00
Shannon
f26c61d736 renames file 2014-03-27 16:43:34 +11:00