yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,424 Commits 4 Branches 7 Tags
647492fbfba024dd4b3964997ebcc0b45cc60aeb
Commit Graph

21424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Jansssen
647492fbfb Merge branch 'dev-v7.9' into temp-u4-10794 2018-02-01 12:55:53 +01:00
Sebastiaan Jansssen
fc43d3cdee Merge branch 'dev-v7.8' into dev-v7.9 2018-01-31 17:03:19 +01:00
Sebastiaan Jansssen
b76b09026b Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
#	src/Umbraco.Web.UI.Client/src/controllers/search.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Models/BackOfficeTour.cs
#	src/Umbraco.Web/Models/BackOfficeTourStep.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
#	src/Umbraco.Web/TourFilterResolver.cs
#	src/Umbraco.Web/Trees/MacroTreeController.cs
#	src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
#	src/umbraco.cms/businesslogic/Packager/Installer.cs
#	src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
 2018-01-31 17:02:03 +01:00
Stephan
971d7cf933 U4-10794 - refactor 2018-01-31 15:20:03 +01:00
Sebastiaan Jansssen
118a83e56c Consent class should be public for 3rd parties to be able to register consents 2018-01-31 13:19:30 +01:00
Sebastiaan Jansssen
1f6dea7177 Adds migration to create constent table 2018-01-31 12:47:41 +01:00
Sebastiaan Jansssen
f2667c3360 Bumps version to 7.9.0 2018-01-31 12:47:16 +01:00
Sebastiaan Janssen
f331736384 Merge pull request #2421 from umbraco/temp-U4-10797 
U4-10797 Sensitive values
 2018-01-31 10:59:18 +01:00
Sebastiaan Janssen
090f89e5b6 Merge pull request #2223 from kgiszewski/fix/U4-6309 
U4-6309: Fix black bars that appear on a RTE image resize
 2018-01-31 10:43:29 +01:00
Shannon
a6bc94185c Ensures that a user without access to sensitive values cannot change a member type's sensitive values, this also validates on the server side 2018-01-30 19:38:42 -06:00
Warren Buckley
5f5759c8a3 Merge pull request #2422 from umbraco/temp-U4-10869 
U4-10869 Make sure the getting started tour is only shown to the right users
 2018-01-30 09:10:12 +00:00
Robert
0b90097aad "requiredSections" tour property documentation 
Added a few words about "requiredSections" tour property
 2018-01-30 10:00:54 +01:00
Shannon
58533ca17e Validates sensitive properties during model binding to ensure that someone cannot hack a posted value for sensitive props if they don't have access to sensitive props. 2018-01-29 13:24:27 -06:00
Shannon
427e99dd29 WIP - need to validate sensitive properties for invalid posted data 2018-01-29 12:20:06 -06:00
Shannon
1ec09e15cf fixes tests 2018-01-29 12:02:20 -06:00
Shannon
a48568d1ba Fixes problem where the sensitive value placeholder was being posted back to the server for saving, instead we don't post this value at all which means it will not be overwritten when it posts back. 2018-01-29 11:38:08 -06:00
Stephan
5aa1b81cd4 U4-10794 - revert PEtaPocoMapper changes 2018-01-29 16:27:16 +01:00
Sebastiaan Jansssen
7cd540c37e Remove additional premature uses of C#7 features 2018-01-29 14:35:30 +01:00
Sebastiaan Jansssen
83595ecaf5 Don't rely on C# 7 features 2018-01-29 14:06:25 +01:00
Robert
e07c5e6ff8 Removed unused using directives 2018-01-29 13:18:11 +01:00
Robert
67ff827d67 Tours will only load if the current user has access to the same sections the tours has access to 2018-01-29 13:13:43 +01:00
Stephan
e1208e5019 U4-10794 - use string ids, not udis 2018-01-29 11:30:01 +01:00
Sebastiaan Jansssen
3f7159797f U4-10880 Update install background 2018-01-29 09:49:16 +01:00
Shannon
995f644501 Adds upgrade logic, fixes tests, fixes model mappings to not do so much AfterMap 2018-01-26 17:27:35 -07:00
Shannon
f7eec8dafb Allows editing the property metadata even if the property type is locked 2018-01-26 16:24:40 -07:00
Shannon
e039265fab adds descriptions to the member type options 2018-01-26 16:11:14 -07:00
Shannon
f08192a4ab Changes copy for hidden values and makes the rendering for hidden values it's own property editor view so we can more easily update it. 2018-01-26 15:52:12 -07:00
Stephan
a16ac1f0ba U4-10794 - implement basic consent service 2018-01-26 10:57:12 +01:00
Shannon
469d6f9ca3 Now checks for the sensitiveData group to view sensitive data 2018-01-25 15:06:23 -07:00
Shannon
54cc80f4e8 Updates all required mappings to use AutoMapperExtensions.MapWithUmbracoContext where appropriate 2018-01-25 14:41:28 -07:00
Shannon
64628c0a9d Gets the IsSensitive property mapped to the display object and changes the property output to show that the field contains sensitive data. Refactors the TabsAndPropertiesResolver and simplifies it a lot which also allows us to pass in an UmbracoContext which we'll need in order to determine a user's rights, etc... Refactors how the TreeNodeUrls are mapped and they now use a proper mapper. This now means we do much less in AfterMap 2018-01-25 14:14:12 -07:00
Robert
6f81b7fe24 'getting-started' tour only available to admins 2018-01-25 12:10:34 +01:00
Stephan
f2819f61e5 Merge pull request #2417 from umbraco/temp-u4-10846 
U4-10846 - fix member group cache
 2018-01-25 11:06:17 +01:00
Sebastiaan Janssen
2107e9d9e3 Merge pull request #2420 from PerplexDaniel/patch-1 
Fix NullReferenceException when HttpContext is not available
 2018-01-25 10:18:32 +01:00
Daniël Knippers
c623b448ba Fix NullReferenceException when HttpContext is null 
This method will throw a NullReferenceException in contexts without an HttpContext, like is the case in background threads. As HttpContext is only used to set an isDebug flag, it seems more sensible to not throw in cases without an HttpContext, but simply set isDebug to false instead. If this is not acceptable behavior, could we perhaps look at something other than HttpContext.Current.IsDebuggingEnabled to decide whether isDebug should be set?
 2018-01-25 08:56:46 +01:00
Sebastiaan Janssen
8bb49f57e8 Merge pull request #2419 from umbraco/redmorello-U4-10864_close_back_office_search_results 
Redmorello u4 10864 close back office search results
 2018-01-24 17:47:44 +01:00
Sebastiaan Jansssen
da0b1c2f23 Merge branch 'U4-10864_close_back_office_search_results' of https://github.com/redmorello/Umbraco-CMS into redmorello-U4-10864_close_back_office_search_results 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-24 17:43:19 +01:00
Sebastiaan Jansssen
a288fc62eb Workaround: keep the cache we used to have but clear all cache for membergroups when a member group changes 2018-01-24 17:26:21 +01:00
Sebastiaan Jansssen
82e50ccd3a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-01-24 16:13:31 +01:00
Sebastiaan Jansssen
15b0dc9f29 Merge branch 'dev-v7.8' of https://github.com/kristoffer-tvera/Umbraco-CMS into kristoffer-tvera-dev-v7.8 2018-01-24 16:12:06 +01:00
Sebastiaan Janssen
8057d09fc2 Merge pull request #2416 from PeteDuncanson/patch-1 
Prevent Pinterest messing with media in the back office
 2018-01-24 15:53:40 +01:00
Sebastiaan Jansssen
8877100bf0 Merge branch 'dev-v7' into temp-u4-10846 2018-01-24 15:50:08 +01:00
Stephan
41c96e6e26 Merge pull request #2398 from leekelleher/issue/U4-10756 
Proposed patch for U4-10756 - Guid TypedContent performance
 2018-01-24 15:27:43 +01:00
Sebastiaan Jansssen
abdd117264 Fixes bug in MB 3.0.9 2018-01-24 15:26:40 +01:00
Sebastiaan Jansssen
6272dac698 Use string.Format instead of interpolation 2018-01-24 14:34:21 +01:00
Sebastiaan Jansssen
7a4b5fa796 Bump version to 7.7.10 2018-01-24 14:34:03 +01:00
Sebastiaan Jansssen
c962132ee0 Update to ModelsBuilder 3.0.9 2018-01-24 14:33:32 +01:00
leekelleher
0780979469 Eagerly populating the Guid lookup 
as per @Shazwazza's comment: https://github.com/umbraco/Umbraco-CMS/pull/2398#issuecomment-358752346

Tested against 12,000 nodes (in the XML cache), profiling showed it took 55ms.
 2018-01-24 11:53:52 +00:00
leekelleher
a42e568fdf Initialized the ConcurrentDictionary statically 
as per @JimBobSquarePants's comment: https://github.com/umbraco/Umbraco-CMS/pull/2398#discussion_r162799543
 2018-01-24 11:51:53 +00:00
Robert
e62661cc6a Merge pull request #2397 from leekelleher/issue/U4-10845 
U4-10845 MNTP value-converter - trashed content causes database lookups
 2018-01-24 12:48:29 +01:00