Sebastiaan Janssen 7a778d4c42 Merge branch 'dev-v7' into temp8 ...

# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs

2019-01-29 13:11:03 +01:00

..

ApiDocs

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

Umbraco.Core

Merge branch 'dev-v7' into temp8

2019-01-29 13:11:03 +01:00

Umbraco.Examine

Fixing all the TODO, FIXME & HACK comments so they all follow the same layout.

2019-01-27 11:16:00 +01:00

Umbraco.ModelsBuilder

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

Umbraco.Tests

Merge branch 'temp8' into temp8-fixme-no-caching-of-url-and-inject-umbraco-context-accessor

2019-01-29 17:12:35 +11:00

Umbraco.Tests.Benchmarks

Merge remote-tracking branch 'origin/temp8' into temp8-ispublished-again

2019-01-28 08:46:17 +01:00

Umbraco.Web

Obsolete direct hash generation methods, and switch to generic GenerateHash

2019-01-29 12:58:51 +01:00

Umbraco.Web.UI

Merge branch 'temp8' into temp8-dashboards-collection

2019-01-28 10:35:34 +01:00

Umbraco.Web.UI.Client

Merge remote-tracking branch 'origin/temp8' into temp8-3396-fix-YSOD-for-publishing

2019-01-29 21:48:09 +11:00

SolutionInfo.cs

Bumps version to 7.14.0

2019-01-08 21:49:17 +01:00

umbraco.sln

Bye bye dashboard.config.install XDT transform as part of NuGet install

2019-01-25 10:17:40 +00:00

umbraco.sln.DotSettings

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00