Emma Garland
|
b8ef38d287
|
Merge branch 'netcore/netcore' into netcore/members-userstore
|
2021-01-20 17:57:16 +00:00 |
|
Emma Garland
|
6dd5ae910a
|
Fixed tests, merged latest
|
2021-01-20 17:42:31 +00:00 |
|
berg
|
ad7981246e
|
Fix test
|
2021-01-20 16:45:19 +01:00 |
|
Bjarke Berg
|
d573928cc1
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs
# src/Umbraco.Tests/Services/EntityServiceTests.cs
|
2021-01-20 15:53:19 +01:00 |
|
Emma Garland
|
4cd9fcc36d
|
Merge branch 'netcore/netcore' into netcore/members-userstore
|
2021-01-20 14:27:54 +00:00 |
|
Sebastiaan Janssen
|
2a46bd9d59
|
Merge branch 'v8/8.11' into v8/dev
|
2021-01-20 11:30:35 +01:00 |
|
Sebastiaan Janssen
|
120dbd358e
|
Bump version to 8.11.0
|
2021-01-20 11:30:07 +01:00 |
|
Sebastiaan Janssen
|
724d4d1e20
|
Merge branch 'v8/8.10' into v8/8.11
# Conflicts:
# src/SolutionInfo.cs
|
2021-01-20 11:29:47 +01:00 |
|
Sebastiaan Janssen
|
ae30a8db91
|
Bump version to 8.10.2
|
2021-01-20 11:29:04 +01:00 |
|
Sebastiaan Janssen
|
251c5d08ef
|
Merge branch 'v8/8.9' into v8/8.10
# Conflicts:
# src/SolutionInfo.cs
|
2021-01-20 11:28:31 +01:00 |
|
Sebastiaan Janssen
|
e913c2720c
|
Bump version to 8.9.2
|
2021-01-20 11:27:40 +01:00 |
|
Sebastiaan Janssen
|
7d229bc5a9
|
Merge branch 'v8/8.8' into v8/8.9
# Conflicts:
# src/SolutionInfo.cs
|
2021-01-20 11:27:10 +01:00 |
|
Sebastiaan Janssen
|
cda81ae9be
|
Bump version to 8.8.3
|
2021-01-20 11:26:14 +01:00 |
|
Sebastiaan Janssen
|
435695e2c3
|
Merge branch 'v8/8.7' into v8/8.8
# Conflicts:
# src/SolutionInfo.cs
|
2021-01-20 11:25:29 +01:00 |
|
Sebastiaan Janssen
|
0b3256c4fe
|
Bump version to 8.7.2
|
2021-01-20 11:24:28 +01:00 |
|
Sebastiaan Janssen
|
59e27c4850
|
Merge branch 'v8/8.6' into v8/8.7
# Conflicts:
# src/SolutionInfo.cs
|
2021-01-20 11:24:02 +01:00 |
|
Bjarne Fyrstenborg
|
b44a3e4280
|
Inject missing localization service
(cherry picked from commit c501ef0b68)
|
2021-01-20 11:19:37 +01:00 |
|
Sebastiaan Janssen
|
e18bda50a1
|
Bump version to 8.6.7
|
2021-01-20 11:18:18 +01:00 |
|
Sebastiaan Janssen
|
0744b38fe4
|
Fixes umbraco/Umbraco-CMS#9244
Log a warning instead of throwing an error so existing code doesn't fail
|
2021-01-20 11:16:28 +01:00 |
|
Mads Rasmussen
|
704fad92e5
|
Fixes: 9360: Nested validation freezes browser (#9677)
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
(cherry picked from commit b75a237162)
|
2021-01-20 11:09:14 +01:00 |
|
Niels Lyngsø
|
b6558cf734
|
empty value should also enable in order to stay backwards compatible.
(cherry picked from commit 2321fbfcab)
|
2021-01-20 11:06:03 +01:00 |
|
Niels Lyngsø
|
2321fbfcab
|
empty value should also enable in order to stay backwards compatible.
|
2021-01-20 11:00:55 +01:00 |
|
Mads Rasmussen
|
b75a237162
|
Fixes: 9360: Nested validation freezes browser (#9677)
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
|
2021-01-20 10:04:54 +01:00 |
|
Bjarke Berg
|
465826e101
|
Merge pull request #9583 from rustybox/netcore/feature/test-db-count-experirment
Netcore: test duration on CI pipeline with more databases
|
2021-01-20 08:59:09 +01:00 |
|
Bjarke Berg
|
72f470222a
|
Merge remote-tracking branch 'rustybox/netcore/feature/test-db-count-experirment' into netcore/feature/test-db-count-experirment
# Conflicts:
# src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
# src/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs
# src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
|
2021-01-20 07:53:27 +01:00 |
|
Paul Johnson
|
f1aa22e9e3
|
test duration on CI pipeline with more databases
|
2021-01-20 07:41:59 +01:00 |
|
Sebastiaan Janssen
|
159e1dfc6f
|
Merge branch 'v8/8.11' into v8/dev
|
2021-01-19 17:40:21 +01:00 |
|
Sebastiaan Janssen
|
a04af69181
|
Merge branch 'v8/8.10' into v8/8.11
|
2021-01-19 17:31:07 +01:00 |
|
Nik
|
6a8c2a0a55
|
[AMEND] Updated the redirect URL Repository to search for entries wit… (#9653)
Co-authored-by: Nik Rimington <nrimington@spindogs.com>
(cherry picked from commit aa5470a801)
|
2021-01-19 17:30:00 +01:00 |
|
Bjarne Fyrstenborg
|
b1eebdd598
|
Add back icon name in class attribute to work again with font icons
(cherry picked from commit c1ebfc58cf)
|
2021-01-19 17:18:49 +01:00 |
|
Emma Garland
|
9ba78497a0
|
Merge branch 'netcore/netcore' into netcore/members-userstore
# Conflicts:
# src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs
|
2021-01-19 15:29:40 +00:00 |
|
Bjarke Berg
|
817b63266d
|
Merge pull request #9679 from umbraco/netcore/feature/merge-v8-18-01-2021
Netcore: Merge from v8/dev
|
2021-01-18 18:16:12 +01:00 |
|
Bjarke Berg
|
774e3d193b
|
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/merge-v8-18-01-2021
|
2021-01-18 16:22:25 +01:00 |
|
Bjarke Berg
|
a54e10bc13
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021
# Conflicts:
# .gitignore
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/IO/SystemFiles.cs
# src/Umbraco.Core/Models/ContentBase.cs
# src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
# src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/RuntimeOptions.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
# src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
# src/Umbraco.Examine/Umbraco.Examine.csproj
# src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
# src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
# src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
# src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Tests/Testing/TestDatabase.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
# src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.cshtml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
# src/Umbraco.Web/Editors/PreviewController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/JavaScript/PreviewInitialize.js
# src/Umbraco.Web/Telemetry/TelemetryComponent.cs
# src/Umbraco.Web/UmbracoApplication.cs
|
2021-01-18 16:06:23 +01:00 |
|
Bjarke Berg
|
cf3018c8a5
|
Merge pull request #9599 from AndyButland/feature/clean-up-umbraco-integration-tests
NetCore: Code clean-up (Umbraco.Tests.Integration)
|
2021-01-18 14:35:09 +01:00 |
|
Bjarke Berg
|
c715195b41
|
Merge pull request #9584 from AndyButland/feature/clean-up-umbraco-tests-common
NetCore: Code clean-up (Umbraco.Tests.Common)
|
2021-01-18 14:34:51 +01:00 |
|
Bjarke Berg
|
05ef2d80ae
|
Merge branch 'feature/clean-up-umbraco-tests-common' into netcore/feature/merge-v8-18-01-2021
|
2021-01-18 10:47:18 +01:00 |
|
Bjarke Berg
|
7f27aa1dfe
|
Fix merge issue
|
2021-01-18 08:45:14 +01:00 |
|
Bjarke Berg
|
6310ca31e3
|
Merge remote-tracking branch 'origin/netcore/netcore' into feature/clean-up-umbraco-integration-tests
# Conflicts:
# src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
# src/Umbraco.Tests.Integration/RuntimeTests.cs
# src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
# src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
# src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
|
2021-01-18 07:34:59 +01:00 |
|
Bjarke Berg
|
16ef520e8c
|
Merge remote-tracking branch 'origin/netcore/netcore' into feature/clean-up-umbraco-tests-common
# Conflicts:
# src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
|
2021-01-18 06:44:01 +01:00 |
|
Emma Garland
|
1431a0a076
|
Merge branch 'netcore/netcore' into netcore/members-userstore
# Conflicts:
# src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs
# src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
|
2021-01-15 16:51:23 +00:00 |
|
Bjarke Berg
|
9d0665e66c
|
Merge pull request #9601 from umbraco/netcore/feature/remove-httpresponseexception
NetCore: Getting rid of HttpResponseException
|
2021-01-15 07:26:19 +01:00 |
|
Bjarke Berg
|
04bb4e99b6
|
Fixed possible null reference exceptions
|
2021-01-14 19:41:32 +01:00 |
|
Sebastiaan Janssen
|
72c6ffea52
|
Merge branch 'v8/8.11' into v8/dev
|
2021-01-13 17:03:23 +01:00 |
|
Sebastiaan Janssen
|
23a50df3a5
|
Merge branch 'v8/8.10' into v8/8.11
|
2021-01-13 17:02:54 +01:00 |
|
Sebastiaan Janssen
|
46faf32c9e
|
Merge branch 'v8/8.9' into v8/8.10
|
2021-01-13 17:02:29 +01:00 |
|
Warren Buckley
|
86504d69d3
|
Merge pull request #9644 from umbraco/v8/bug/9432-checkboxes-on-doctype-compositions
V8/bug/9432: Backoffice UI - checkboxes on doctype compositions uncheck after selecting an item
(cherry picked from commit 0d7a683c60)
|
2021-01-13 16:54:26 +01:00 |
|
Sebastiaan Janssen
|
e696aea1fc
|
Merge branch 'v8/8.11' into v8/dev
|
2021-01-13 16:50:54 +01:00 |
|
Sebastiaan Janssen
|
062829dc76
|
Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev
|
2021-01-13 16:50:45 +01:00 |
|
Sebastiaan Janssen
|
1842f766ae
|
Merge branch 'v8/8.10' into v8/8.11
|
2021-01-13 16:50:02 +01:00 |
|