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

7544 Commits

Author SHA1 Message Date
Shannon
e6a354876d disables ContentFinderByUrlAndTemplate 2018-06-01 01:00:51 +10:00
Shannon
40791e1266 Merge remote-tracking branch 'origin/temp8' into temp8-U4-11384 2018-06-01 00:15:33 +10:00
Shannon
6ae538d555 reverts the fix that doesn't work 2018-06-01 00:06:59 +10:00
Shannon
79f95f4243 fixes removing content item from the cache when it is trashed 2018-05-31 23:34:10 +10:00
Shannon
437855979d Fixes passing in the user id for copy operations 2018-05-31 23:33:52 +10:00
Shannon
abbb119fc9 Ensures ref integrity for all FKs to umbracoUser table but support NULL values 2018-05-31 23:05:35 +10:00
Stephan
3862ff9076 Cleanup and get rid of other warnings 2018-05-31 11:55:37 +02:00
Stephan
38eae90640 Cleanup and get rid of warnings 2018-05-31 11:53:14 +02:00
Shannon
1cd4862803 Fixes user Id is 0 everywhere 2018-05-31 16:52:38 +10:00
Shannon
0d68a3fb4f avoids a ysod if the wrong user id sneaks in to the log 2018-05-31 15:54:23 +10:00
Stephan
6208a3ec73 Ensure server messenger actually starts 2018-05-30 10:00:20 +02:00
Stephan
3da596eedf Fix PublishedSnapshotAccessor to not throw but return null 2018-05-30 10:00:19 +02:00
Stephan
91396e561f Deal with IDE1006 2018-05-30 10:00:17 +02:00
Stephan
ac04abe59b Fix ContentTreeController 2018-05-30 10:00:16 +02:00
Stephan
a7ba4a155e Fix logging in NuCache SnapshotService 2018-05-30 10:00:15 +02:00
Stephan
2fade20656 Kill legacy, get rid of warnings 2018-05-30 10:00:14 +02:00
Shannon
9b08a73210 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2018-05-30 15:29:08 +10:00
Stephan
f535f6d324 Cleanup ModelsBuilder merge 2018-05-21 11:49:08 +02:00
leekelleher
21dbd1e402 Corrected a typo with MultipleTextStringConfiguration class name 
@zpqrtbnk approved in person this at CGRT18 ;-)
 2018-05-20 18:16:09 +01:00
Stephan
6ce24bf1a1 Various fixes 2018-05-17 17:24:30 +02:00
Stephan
a8ba8598f2 Merge branch origin/temp8 into temp8-xbuild 2018-05-17 15:34:27 +02:00
Shannon
50659787ee fixes published content Url for invariant 2018-05-17 15:26:06 +02:00
Shannon
3da120ce33 Adds Property Type to the published content model, fixes some web.config versions 2018-05-17 13:32:20 +02:00
Stephan
de9f4f8d0b Cleanup references and dependencies 2018-05-17 13:19:35 +02:00
Shannon
07a263b794 Fixes validation check for variant nodes that don't have names assigned 2018-05-17 10:28:38 +02:00
Claus
9e3db051c9 Merge remote-tracking branch 'origin/temp8' into temp-U4-11218 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html
#	src/Umbraco.Web.UI/web.Template.config
 2018-05-17 08:26:02 +02:00
Claus
70d1bed396 Merge branch 'temp8' into temp-U4-11218 2018-05-17 08:16:17 +02:00
Stephan
6bedc1020b Cleanup solution and build wip 2018-05-16 15:46:51 +02:00
Shannon
b565b8be77 disables redirect tracking for now until we fix it to work with variants 2018-05-16 11:25:57 +02:00
Shannon
bf7591aaa0 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-16 10:33:57 +02:00
Claus
8044ccbf27 adding missing null check after navigating to parent. 2018-05-16 10:17:38 +02:00
Shannon
95c6de5534 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-16 10:15:57 +02:00
Shannon
c655873b7d Cleanup canvas designer files, no more dotless dependency, cleans up preview, removes bloat 2018-05-16 10:13:55 +02:00
Shannon
ea6c466323 Fixes up some warnings 2018-05-16 10:06:51 +02:00
MADSRASMUSSB4A1\madsrasmussen
6e647d87fa Merge branch 'temp8' into temp-U4-11218 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
 2018-05-16 09:51:26 +02:00
Shannon
971114e0fd Updates to 472 and re-targets to the original System.Threading.Tasks.Dataflow package against netstandard 1.3 but with 472 this completely fixes dependency outputs 2018-05-15 17:17:05 +02:00
Shannon
03977c4806 removed too much 2018-05-15 17:13:24 +02:00
Shannon
842d5049b5 Fixing dependencies so we aren't relying so much on netstandard 1.3 libs which require system runtime facade's 2018-05-15 17:02:06 +02:00
Dan Booth
9a8f71dd81 Fixed issue where TypedMedia didn't work with UDI strings 2018-05-11 14:53:03 +01:00
Shannon
aa4dc64a57 Fixes ContentCache.GetRouteByIdInternal to ensure that no route is returned for any variant in the path of an unpublished variant of the same culture 2018-05-10 23:07:33 +10:00
Shannon
d78fa85307 null check fix 2018-05-10 22:40:32 +10:00
Shannon
68f0a64136 Fixes auth with AllowsCultureVariation and LanguageController post methods, fixes merge issues with navigation.controller 2018-05-10 19:16:46 +10:00
Shannon
573b8a0701 Merge remote-tracking branch 'origin/temp8' into temp8-U4-11282 
# Conflicts:
#	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
#	src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
 2018-05-10 18:55:39 +10:00
Shannon
4ce6f5c3b0 Fixes how the name is ensured on the content tree so that the media tree doesn't break. 2018-05-10 18:20:33 +10:00
Shannon
f2b78c06ef FIxes issue where an invariant property type was being validated with a culture when that would always fail. Fixes issue when saving a content type to ensure that a property type is never both variant and invariant. Adds test. 2018-05-10 18:01:41 +10:00
Mads Rasmussen
600979d129 Merge branch 'temp8' into temp-U4-11218 2018-05-09 08:51:34 +02:00
Shannon
8642a52a12 Fixes property model binding to display to show the invariant data if the property is non variant 2018-05-09 14:35:23 +10:00
Shannon
9c1451ecd3 Fixes LanguageRepository for deleting a lang, updates UrlProvider to have consistent method parameter order, updates UmbracoHelper to have culture params for getting URLs 2018-05-09 12:50:34 +10:00
Stephan
c890421f55 Fix mixed properties (wip) 2018-05-08 17:09:26 +02:00
Stephan
6d1f42c9b6 Fixes 2018-05-08 16:41:37 +02:00