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

23380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
a8ba8598f2 Merge branch origin/temp8 into temp8-xbuild 2018-05-17 15:34:27 +02:00
Stephan
6e7bb41190 Version 8.0.0-alpha.36 2018-05-17 15:33:38 +02:00
Stephan
7387379aea Upgrade to ModelsBuilder -alpha.18 2018-05-17 15:32: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
Stephan
20ecb6a779 Merge branch origin/temp8 into temp8-xbuild 2018-05-17 13:04:57 +02:00
Stephan
40f2558a70 Cleanup 2018-05-17 13:03:37 +02:00
Stephan
f44c5ad757 Cleanup nuget, bindings, build 2018-05-17 12:17:42 +02:00
Shannon
1cf63bd471 missing checkin of package-lock 2018-05-17 11:29:21 +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
c2236b7b97 Merge pull request #2632 from umbraco/temp-U4-11218 
Merge infinite editing UI branch to temp8
 2018-05-17 09:16:01 +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
a6ea270d93 Cleanup build 2018-05-16 21:52:40 +02:00
Stephan
a39a9b7a89 Cleanup nuspec 2018-05-16 16:02:51 +02:00
Stephan
8c815cf47e Git-ignore local directory 2018-05-16 15:54:08 +02:00
Stephan
2b7966dc55 Depend on Umbraco.SqlServerCE, package in net47 2018-05-16 15:54:07 +02:00
Stephan
fe1a4f7d4f Depend on Umbraco.SqlServerCE 2018-05-16 15:54:07 +02:00
Stephan
9b17468c43 Cleanup solution 2018-05-16 15:53:22 +02:00
Stephan
6bedc1020b Cleanup solution and build wip 2018-05-16 15:46:51 +02:00
Stephan
fc56126820 Cleanup Solution 2018-05-16 15:46:51 +02:00
Shannon
c6fa0e560a Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-16 15:21:35 +02:00
Shannon
34de58e0dc adjust assembly redirects 2018-05-16 15:21:23 +02:00
Shannon Deminick
056bcaff96 adds notes on what to work on 2018-05-16 13:51:59 +02:00
Shannon Deminick
8985d514ec cross link to v8 branch 2018-05-16 13:36:57 +02:00
Shannon Deminick
f38df3753c Adds quick start v8 link 2018-05-16 13:35:52 +02:00
Shannon Deminick
7fd78aaf2e adds link to quick start guide 2018-05-16 13:29:38 +02:00
Shannon Deminick
9bba6f4b9b adding get started guide for v8 2018-05-16 13:21:29 +02:00
Shannon Deminick
5128c23413 cross link to v7 branch 2018-05-16 12:57:13 +02:00
Shannon Deminick
3c82315782 cross link to the v8 branch 2018-05-16 12:56:00 +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 Deminick
2e2e76c92a Merge pull request #2624 from umbraco/temp-U4-11327 
fixes: U4-11327 Remove styles for umb-era-button and use umb-button c…
 2018-05-16 18:51:12 +10:00
Shannon
1bc3fdd07c Fixes package tree references 2018-05-16 10:49:43 +02:00
Shannon
c1e0b86554 Merge branch 'temp8' into temp-U4-11327 2018-05-16 10:39:51 +02:00
Shannon
bf7591aaa0 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-16 10:33:57 +02:00
Shannon
6c5abf14bd Removes legacy dialog client files 2018-05-16 10:33:46 +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
Stephan
2c124e87dd Merge pull request #2630 from umbraco/temp8-dependency-fixing 
Temp8 dependency fixing
 2018-05-16 10:15:45 +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
07e7068c22 removed too many assembly bindings 2018-05-15 18:07:48 +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
Sebastiaan Janssen
58751577c6 Merge pull request #2622 from DanDiplo/temp-U4-11313 
u4 11313 - ContainsAny() method in StringExtensions doesn't honour the StringComparison parameter
 2018-05-15 13:07:21 +02:00
Sebastiaan Janssen
debe0d811c Merge pull request #2628 from ragivi/patch-1 
Update preview page
 2018-05-15 13:00:57 +02:00
Sebastiaan Janssen
8d09243473 Merge pull request #2626 from DanDiplo/temp-U4-10706 
U4-10706 - Fixes TypedMedia not working with UDI strings
 2018-05-15 12:44:46 +02:00