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

35028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
e079bd5a50 Cleanup usages of Configs 2020-09-08 13:03:43 +02:00
Bjarke Berg
3efee8284a Post merge fixes 2020-09-07 15:28:58 +02:00
Bjarke Berg
e5bb9a22d0 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 2020-09-07 09:43:14 +02:00
Bjarke Berg
13ad1e0a88 remove hardcoded version number 
Signed-off-by: berg <mail@bergmania.dk>
 2020-09-04 20:12:49 +02:00
Bjarke Berg
c8669b18c2 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 14:30:48 +02:00
Bjarke Berg
1218f3564c Merge pull request #8798 from umbraco/netcore/bugfix/integration-tests-examine-indexes 
Fixes integration tests bootstrapping
 2020-09-04 10:54:43 +02:00
Bjarke Berg
a58859ade6 updated version to 0.5.0-alpha002 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 09:39:46 +02:00
Bjarke Berg
d69c93e4ee https://github.com/umbraco/Umbraco-CMS/issues/8814 - Decoreated endpoints with DetermineAmbiguousActionByPassingParametersAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 09:32:35 +02:00
Bjarke Berg
ed2fa27b18 Fix issue with login url 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 09:26:24 +02:00
Shannon
123e3cb22b fix build 2020-09-04 10:12:55 +10:00
Shannon
855a58a3cc fix tests 2020-09-04 01:40:46 +10:00
Shannon
1c83c68862 Fixes integration tests localization text 2020-09-04 01:30:47 +10:00
Shannon
e6b6dd6d92 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/integration-tests-examine-indexes 2020-09-04 00:30:46 +10:00
Shannon
734b222e1b cleanup 2020-09-04 00:30:06 +10:00
Shannon
16e4ffb725 Fixes unsubscribing from static events on Terminate 2020-09-04 00:28:38 +10:00
Shannon
7c78b5b34f Updates CoreRuntime with better dependencies so we can disable caches, fixes integration test to run multiple callbacks registered for TearDown, ensure we TearDown the runtime. 2020-09-04 00:27:43 +10:00
Bjarke Berg
02648eb5a6 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 2020-09-03 14:37:56 +02:00
Bjarke Berg
6f6d9cb938 Fixed issue with wrong link to GetSetup method on InstallApiController 2020-09-03 14:37:29 +02:00
Andy Butland
88e3c58647 Fixed issue after merge. 2020-09-03 13:02:29 +02:00
Andy Butland
885c8d2371 Merge branch 'feature/8651-config-options-patten' of https://github.com/AndyButland/Umbraco-CMS into feature/8651-config-options-patten 2020-09-03 12:57:35 +02:00
Andy Butland
14404f2720 Changed singleton created dependencies in composition root to use IOptionsMonitor. 2020-09-03 12:52:47 +02:00
Andy Butland
b87630250b Removed unused private field and constructor variable for configuration global settings from UmbracoVersion. 
Updated singleton created instances in CreateCompositionRoot to accept IOptions based parameters for configuration.
 2020-09-03 11:36:57 +02:00
Shannon
775360ef78 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/integration-tests-examine-indexes 2020-09-02 18:27:53 +10:00
Shannon
a5772f10e1 comments 2020-09-02 18:21:51 +10:00
Shannon
b5d2adaf25 remove explicit 2020-09-02 18:20:30 +10:00
Shannon
27586d9f19 removes proj ref that wasn't needed 2020-09-02 18:19:27 +10:00
Shannon
f84a93ae20 Adds IUmbracoBuilder to build the config so it's easier to split apart, ensures background tasks don't run in integration tests, uses a custom CoreRuntime to ensure we use SimpleMainDom, re-wires the UmbracoWebApplicationFactory so that duplicate Hosts are not running at the same time, fixes issues with overriding/shadowing, uses RAMDirectory in lucene for tests, fixes CoreRuntime's events that we're moved incorrectly and not backwards compat, adds new real non static events which we can use in integration tests to install the DB before the runtime state is calculated 2020-09-02 18:10:29 +10:00
Bjarke Berg
97e6d76ec9 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 2020-09-02 10:03:53 +02:00
Bjarke Berg
edca4af7f4 Fix MaxFailedAccessAttemptsBeforeLockout from config 2020-09-02 10:03:35 +02:00
Bjarke Berg
90d14158ee Clean up - Removed duplicate ctor in UmbracoVersion 2020-09-02 09:05:55 +02:00
Andy Butland
8638419088 Fixed dependency resolution issue in PackagingService. 2020-09-02 08:41:41 +02:00
Andy Butland
f1bda37a64 Updates following PR review. 2020-09-01 18:10:12 +02:00
Bjarke Berg
cb88865a7d Added iconApiBaseUrl to BareMinimumServerVariables 2020-08-31 15:23:43 +02:00
Bjarke Berg
edd457c24b Force Examine to run in sync for integration tests 2020-08-31 11:31:56 +02:00
Bjarke Berg
30b1d52e67 Merge pull request #8750 from idseefeld/netcore/fix-install-api-url 
Netcore/fix install api url
 2020-08-28 16:46:02 +02:00
Dirk Seefeld
7791fdcafa ensure the the install api url ends with / to respect umbraco.installer.js method 2020-08-28 16:07:21 +02:00
Bjarke Berg
162861d0c4 Merge pull request #8731 from umbraco/netcore/feature/FileNameTests 
NetCore: Add file name tests
 2020-08-28 09:50:13 +02:00
Andy Butland
1d124ea0ac Merge branch 'netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Tests.Integration/Persistence/Repositories/DictionaryRepositoryTest.cs
#	src/Umbraco.Tests.Integration/Persistence/Repositories/LanguageRepositoryTest.cs
#	src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Services/UserServiceTests.cs
 2020-08-27 18:58:12 +02:00
Mole
df4677e970 Update src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-08-27 11:31:46 +02:00
Bjarke Berg
cbe06e11b2 Merge pull request #8645 from umbraco/netcore/feature/AB7481-umbraco-tests-migration 
NetCore: Migrating some Repository tests
 2020-08-27 10:45:59 +02:00
Andy Butland
e6ac534069 Resolved post-merge issues. 2020-08-27 09:27:11 +02:00
Andy Butland
2a59a8385c Merge branch 'netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
#	src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
 2020-08-27 09:03:01 +02:00
Bjarke Berg
361125e84b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/merge-v8-into-netcore-netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-08-27 08:39:02 +02:00
Andy Butland
4e222f103e Reintroduced legacy config into CoreRuntime to support remaining use of Current.Configs (e.g. in UserInvite) 2020-08-26 18:21:09 +02:00
Bjarke Berg
9d79b46949 Merge remote-tracking branch 'origin/v8/8.7' into netcore/netcore 2020-08-26 15:49:19 +02:00
Bjarke Berg
77520733d4 Fixed issue with source link referenced in nuget package 2020-08-26 13:32:09 +02:00
Niels Lyngsø
fd170094b6 minor visual adjustments 2020-08-26 13:09:00 +02:00
Warren Buckley
4a3f0f27f3 Merge pull request #8669 from umbraco/v8/feature/clipboard_sort_newest_first 
V8.7RC Sort paste entries by date
 2020-08-26 11:56:59 +01:00
Andy Butland
c0134b0b74 Added files missing from previous commit. 2020-08-26 12:30:20 +02:00
Bjarke Berg
4eb097d617 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore 2020-08-26 12:01:11 +02:00