yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,646 Commits 4 Branches 7 Tags
180e93a3bf7cd5baee010193fa1281137f705bc9
Commit Graph

361 Commits

Author SHA1 Message Date
AndyButland
180e93a3bf Refactor of ContentTypeContainerConfiguration to use a collection instead of multiple delimited strings 2014-07-28 22:34:30 +02:00
AndyButland
50f1a995e9 Set up headings with localization for container list view custom columns 2014-07-28 22:07:57 +02:00
AndyButland
4d19826d98 Store and retrieval of flags for allowing bulk publish, unpublish and/or delete on container doc types 2014-07-27 15:36:18 +02:00
AndyButland
5ad8ebfa6e Store, retrieve and use default order by and direction for list container document type 2014-07-27 15:04:15 +02:00
AndyButland
599872a310 Created new field in cmsContentType and related models for storing the configuration for a container doc type; implemented configurable page size 2014-07-27 08:53:32 +02:00
Stephan
8a1db41fc4 Implement content.FirstChild 2014-06-09 13:04:40 +02:00
Shannon
0a76757cea Merge branch '7.1.2' of https://github.com/darrenferguson/Umbraco-CMS into darrenferguson-7.1.2 2014-05-23 09:51:48 +10:00
Stephan
dacec47cd9 Fix the build 2014-05-18 21:27:41 +02:00
Stephan
82c1c95e35 Detached PublishedProperty - refactor 2014-05-18 19:06:28 +02:00
Darren Ferguson
a2a81222e6 Adding extension methods to PartialViewMacroModel to allow: Model.GetParameterValue<DateTime>("datey") 
Model.GetParameterValue<int>("booly", 8) //optional default value if parsing can't happen
Model.GetParameterValue("booly",8) // can be used like this as type is implied by default value argument
 2014-05-14 11:33:40 +01:00
Darren Ferguson
5abbca0f5d Adding extension methods to PartialViewMacroModel to allow: Model.GetParameterValue<DateTime>("datey") 
Model.GetParameterValue<int>("booly", 8) //optional default value if parsing can't happen
Model.GetParameterValue("booly",8) // can be used like this as type is implied by default value argument
 2014-05-14 11:32:39 +01:00
Adam Weber
470913f796 Update ImageCropMode.cs 
Fixed spelling error in ImageCropMode.Stretch
 2014-04-28 10:17:41 -05:00
Shandem
95cd32ad8c Merge pull request #359 from Jeavon/7.1.2-ImageCropper 
Adding support for Image Crop Ratio Dimension Support & UpScale to GetCropUrl & More Tests
 2014-04-23 20:20:09 +10:00
Shannon
508a40cd50 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Models/RegisterModel.cs
 2014-04-23 12:00:32 +10:00
Shannon
a92c232178 Fixes: U4-4653 MembershipHelper RegisterMember does not set password and ignores logMemberIn, adds a new flag to the model as to whether or not to have the cookie set as a persistent cookie (default is true) 2014-04-22 19:03:43 +10:00
Stephan
e42149e8d9 Detached PublishedProperty remains internal for now 2014-04-22 10:13:39 +02:00
Jeavon Leopold
7787c51156 Creating the internal GetBaseCropUrl method and moving the logic from the Model GetCropUrl method to ImageCropperBaseExtensions so that it can be used by both the Model method and the template extensions 
Also added some new tests
 2014-04-21 08:38:53 +01:00
Stephan
1a02e6be97 Detached PublishedProperty 2014-04-19 18:39:11 +02:00
Jeavon Leopold
e8d41a1b5e Adding Ratio Mode parameter to GetCropUrl helper 2014-04-18 22:04:23 +01:00
Stephan
a4eedb9f8b U4-4575 - refactor 2014-04-16 18:51:12 +02:00
Stephan
1da901be96 U4-4575 - refactor prop. conversion logic 2014-04-16 18:25:41 +02:00
Shannon
5990a95d13 Fixes: U4-4610 Unmapped members in Automapper 2014-04-14 15:20:02 +10: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
Stephan
b6185b847f U4-4575 - property converters use wrong source value 2014-04-02 11:39:53 +02:00
Jeavon Leopold
07934161a4 Fix for U4-4527 U7 - Creating initial Folder in media section causes exception 2014-03-26 10:07:20 +00:00
Shannon
3427f596e3 fixes up a few notes. 2014-03-25 13:07:16 +11:00
Shannon
c31ea7409f Merge branch 'fix-u4-3839' of https://github.com/lars-erik/Umbraco-CMS into lars-erik-fix-u4-3839 2014-03-25 12:47:26 +11:00
Jeavon Leopold
ff2ee540e2 Fixing the CacheBusting on GetCropUrl as it was totally random which meant the server cache was creating a new cache file for every request. Now changed it to use item updateDate.ToFileTimeUtc as the cache busting value so it will change only when the item is updated in Umbraco. 2014-03-24 19:27:00 +00:00
Jeavon Leopold
b450299d45 GetCropUrl - moved propertyAlias and cropAlias to after width and height so that GetCropUrl(100,100,"myProperty") is possible and renamed useFocalPoint to preferFocalPoint 2014-03-24 18:37:15 +00:00
Jeavon Leopold
0ebe535922 ImageCropDataSet - a little bit of Stylecop 2014-03-24 17:58:12 +00:00
Jeavon Leopold
40be3957f6 GetCropUrl - ensuring that GetCropUrl(width,height) works and also adding the useFocalPoint parameter 2014-03-24 15:44:04 +00:00
Jeavon Leopold
59de0613f5 GetCropUrl - Removing duplicate code 2014-03-24 11:43:55 +00: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
perploug
a4c9fae05c Fixes: U4-4461: Case sensitive crop alias's 2014-03-18 23:49:01 -07:00
Shannon
6f586c7eeb Ensures we are not directly referencing Membership.Provider and instead targetting our provider by alias. 2014-03-18 20:36:02 +11:00
Shannon
4d13925e3b Fixes merge issues 2014-03-18 19:05:07 +11:00
Shannon
e0e0076a7a allows for client side validation on the text box and date picker controls and updates the models to allow support for this for any prop editor. 2014-03-18 15:29:14 +11:00
Tom Fulton
1ec2901762 Expose Mandatory setting in ContentProperty 
This allows a PropertyEditor to be aware of whether it's required or not, via: `$scope.model.mandatory` (along with `$scope.model.alias`, etc)
 2014-03-13 23:32:12 -06:00
Shannon
8574c6b7d0 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
 2014-03-13 14:12:45 +11:00
Shannon
221bfa5f3d Fixes up issues with editing the member profile and registering a member with our snippets including specifying a custom member type. 2014-03-13 14:10:05 +11:00
Shannon
59cdb8a6fe Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-11 17:27:30 +11:00
Shannon
aed4c1faed minor code cleanup and a null check. 2014-03-11 17:26:14 +11:00
Shannon
3c771648e3 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/UmbracoHelper.cs
 2014-03-11 14:47:00 +11:00
Shannon
d737afa327 Working on 2014-03-11 14:23:51 +11:00
Shannon
d95ca7bc6f updates naming from CreateProfileModel to GetCurrentMemberProfile 2014-03-11 10:39:19 +11:00
Shannon
bc371e69a3 Completes: U4-4227 Rename default member property aliases 2014-03-07 19:30:54 +11:00
perploug
458c51a955 Implements IHtmlString on imagecropdataset 2014-02-24 10:42:29 +01:00