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

9956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
ecae5a856a 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/Models/PublishedProperty.cs
	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
 2014-04-03 11:13:13 +02:00
Sebastiaan Janssen
bf8add4f8d Manually picked up PR #343 2014-04-03 11:10:43 +02:00
perploug
256fa3385a Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-03 09:31:47 +02:00
perploug
ebaa46b2fc Fixes: U4-4212 Insert Image in RTE not resizing image 2014-04-03 09:31:32 +02:00
Sebastiaan Janssen
e207185d51 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-03 09:30:12 +02:00
Sebastiaan Janssen
5efc45a7dd Bump version number 2014-04-03 09:29:52 +02:00
Sebastiaan Janssen
c3fc27565d Update version of ImageProcessor and refer to NuGet in the csproj instead of the bin (!) 2014-04-03 09:26:51 +02:00
Sebastiaan Janssen
0af3f9dce0 Fixes U4-4278 Multiple RadioButtonList on one Document 
Manually applying pull request as it's a bit faster to copy&paste instead of resolve merge conflicts
 2014-04-03 08:55:19 +02:00
perploug
426b02b08a Sets zoom throttle to 100 instead of 300 
To limit the number of re-calculations, but still keep it somewhat
fluent
 2014-04-03 00:41:27 +02:00
perploug
a4e23ef82b Missing files in last commit 2014-04-03 00:40:36 +02:00
perploug
d0c6c4aafa Fixes: U4-4332 MediaPicker - Typealias is hardcode several places 2014-04-03 00:37:59 +02:00
perploug
3ea7e6fb8a Partially fixes: U4-4479 Cropper preview in backoffice is a bit off from the actual crop 
Makes the cropper card UI reset on save, ensuring changes populate
 2014-04-02 23:04:37 +02:00
Stephan
9940b78a57 U4-4575 - fix 8371105 2014-04-02 17:00:24 +02:00
Stephan
8371105c10 U4-4575 - property converters use wrong source value 2014-04-02 16:00:46 +02:00
perploug
d4b0f3c570 Resizing safeguards to ensure we only return positive 2014-04-02 14:21:40 +02:00
perploug
29416320d2 Fixes failing macrospec tests 
doooh, it referenced marcoParamsDictionary - instead of
macroParamsDictionary - whats up with that Marco guy?
 2014-04-02 13:43:03 +02:00
perploug
d11eb485e1 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-02 13:19:41 +02:00
perploug
300bd3bed4 Fixes: U4-4558 U7 Macro Parameter Editors needs some love! 
Adds some config to the media picker and fixes thumbnail issues
 2014-04-02 13:19:26 +02:00
Sebastiaan Janssen
3ca5443350 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-02 12:02:29 +02:00
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
perploug
174aa9f4ad Fixes: U4-4581 Hotkey - Click on disabled element 2014-04-02 11:51:56 +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
Stephan
6d3e8e1f6d U4-4559 - tests 2014-04-02 11:40:05 +02:00
Stephan
b6185b847f U4-4575 - property converters use wrong source value 2014-04-02 11:39:53 +02:00
perploug
c8877d0a2c Fixes failing dropdown prop editor tests 2014-04-02 11:35:23 +02:00
perploug
891810b045 Adds newsletter to installer 
With the good ol' V6 installer code, ahhh the smell of code patina
 2014-04-02 11:20:35 +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