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

18342 Commits

Author SHA1 Message Date
Claus
633d1bb0ae changing the template check to an enabled check instead. 2018-02-09 13:19:56 +01:00
Claus
fb89c3da3c allowing to disable the template check when sending content through to render. 2018-02-09 12:58:50 +01:00
Sebastiaan Jansssen
3097a46ab3 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-02-09 09:57:00 +01:00
Sebastiaan Jansssen
c63156fcd8 Bump version to 7.7.11 
(cherry picked from commit 0c25c36af0)
 2018-02-09 09:53:52 +01:00
Stephan
84a90884e3 Merge pull request #2433 from umbraco/temp-U4-10947 
Fix for not being able to save decimal value
 2018-02-09 08:14:51 +01:00
Shannon
d29b7311fa reverts the convertible2 back to what it was before 2018-02-09 10:08:25 +11:00
Shannon
17b59cc20f Updates the ObjectExtensions TryConvertTo code and moved all unit tests to ObjectExtensionsTests which now all pass 2018-02-09 10:02:51 +11:00
Robert
4423571eaa Added ConvertToNullableDecimalTest and check that fixes the decimal save issue 2018-02-08 16:21:09 +01:00
Sebastiaan Jansssen
28eb4ff03a Bump version to 7.8.1 2018-02-08 14:08:38 +01:00
Robert
151c35bc47 Moving check to TryToConvertValueToCrlType 2018-02-08 13:15:43 +01:00
Robert
84265a9716 Fix checkbox in nested content 2018-02-08 12:18:51 +01:00
Robert
6618388973 Fix for not being able to save decimal value 2018-02-08 12:10:57 +01:00
Shannon
a6d57a5f6d Updates the dateHelper when converting to a local date, we need to check if the current string format is in UTC format and ensure that it's loaded that way 2018-02-07 12:51:15 +11:00
Shannon
6b7a83c6c9 Updates logic for setting the scheduled publishing date/times to ensure that the local date/time is displayed but the server time is persisted 2018-02-07 11:17:02 +11:00
Sebastiaan Jansssen
eb5f2e29a3 U4-10937 Datepicker on Info tabe and dates on audit trail do not work if server time needs offsetting 2018-02-06 19:15:15 +01:00
Mads Rasmussen
134f5e2601 fixes: U4-10935 Intro tour doesn't start automatically on cloud 2018-02-06 10:14:30 +01:00
Sebastiaan Jansssen
a20584e3de Not beta009, Final! 2018-02-01 16:18:49 +01:00
Sebastiaan Jansssen
19ec26fef9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 2018-02-01 15:20:13 +01:00
Claus
527f98189a Merge pull request #2423 from umbraco/temp-u4-10897 
temp U4-10897
 2018-02-01 13:29:45 +01:00
Sebastiaan Janssen
78c289a559 Merge pull request #2425 from umbraco/mittonp-dev-v7 
Mittonp dev v7
 2018-02-01 08:59:35 +01:00
Sebastiaan Jansssen
646abb3aea Merge branch 'dev-v7' of https://github.com/mittonp/Umbraco-CMS into mittonp-dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
 2018-02-01 08:57:47 +01:00
Sebastiaan Janssen
2af59471a2 Merge pull request #973 from mattbrailsford/dev-v7-insertmacrofix 
Updated insert macro dialog to prevent closing on enter key
 2018-02-01 08:28:59 +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
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
Stephan
4870afd2d3 U4-10897 - change enlisting priorities 2018-01-30 14:27:58 +01:00
Stephan
80257b6684 Revert "U4-10897 - change enlisting priorities" 
This reverts commit 8f3a0b6919.
 2018-01-30 14:26:59 +01:00
Stephan
8f3a0b6919 U4-10897 - change enlisting priorities 2018-01-30 14:25:43 +01:00
Stephan
9fd2f34343 U4-10897 - defer Examine indexing until scope is all done 2018-01-30 13:53:37 +01:00
Stephan
e774717346 U4-10897 - expose enlisted mutable Xml in events 2018-01-30 13:14:01 +01: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
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
Sebastiaan Jansssen
3f7159797f U4-10880 Update install background 2018-01-29 09:49:16 +01: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
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 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