Commit Graph

35000 Commits

Author SHA1 Message Date
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
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
Bjarke Berg
ba129fa927 Skip ExamineLuceneComposer if not on windows and reintroduce ExamineComposer 2020-08-26 12:01:01 +02:00
Andy Butland
64f8752587 Removed introduced second constructors for IOptions based depenedencies and used Options.Create instead. 2020-08-26 11:58:44 +02:00
Andy Butland
96104b9fdf Fixed further failing tests. 2020-08-26 11:29:21 +02:00
Bjarke Berg
e85b914868 Merge pull request #8730 from umbraco/netcore/feature/lowercase-view-paths
Changed all view paths to lowercase from gulp
2020-08-26 10:50:47 +02:00
Bjarke Berg
f286fdd855 Skip ExamineComposer if not on windows 2020-08-26 10:50:31 +02:00
Nikolaj
1243b7e127 Remove out of date TODO 2020-08-26 10:21:43 +02:00
Nikolaj
fd7e46588e Remove unused partialViewMacro tests 2020-08-26 10:17:41 +02:00
Nikolaj
9a243566ae Use Path.DirectorySeperatorChar for InstallView test 2020-08-26 10:09:24 +02:00
Nikolaj
3e3f91c14d No longer use relative path to find views 2020-08-26 09:55:14 +02:00
Bjarke Berg
25a7a2c7fb Changed all view paths to lowercase from gulp 2020-08-26 09:44:15 +02:00
Warren Buckley
7e5383396a Merge pull request #8715 from umbraco/v8/bugfix/block-catalouge-use-absolute-path-and-dont-scale-svg
8.7RC umb-block-card absolute path and dont scale SVGs
2020-08-26 08:09:59 +01:00
Andy Butland
25849703cc Fixed further failing tests. 2020-08-26 09:09:52 +02:00
Bjarke Berg
459e730510 Fix issues after merge 2020-08-26 08:17:05 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Andy Butland
8fd59d546e Fixed failing tests. 2020-08-26 07:55:23 +02:00
Warren Buckley
eee3d489f1 Update src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js 2020-08-25 13:32:05 +01:00
Andy Butland
8666547cf1 Updated configuration models used within Umbraco.ModelsBuilder.Embedded project. 2020-08-25 14:19:33 +02:00
Niels Lyngsø
4cc9935b10 Merge remote-tracking branch 'origin/v8/8.7' into v8/bugfix/block-catalouge-use-absolute-path-and-dont-scale-svg
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
2020-08-25 13:55:54 +02:00
Niels Lyngsø
30e6f83358 Update umbBlockCard.component.js
change transparent to none
2020-08-25 13:23:11 +02:00
Andy Butland
8241643183 Resolved various failing tests. 2020-08-25 12:30:43 +02:00
Andy Butland
b4e01392d9 Removed registration of old-style configuration in Netcore executable. 2020-08-25 11:00:11 +02:00
Andy Butland
967f0be705 Aligned property names in code with those in configuration. 2020-08-25 10:45:54 +02:00
Andy Butland
2c05718689 Restored Umbraco.Tests.Benchmarks. 2020-08-25 10:25:30 +02:00
Andy Butland
ae6fdede76 Restored Umbraco.Tests to compiling state. 2020-08-25 10:23:50 +02:00
Andy Butland
2ed3568295 Fix after merge. 2020-08-25 10:11:19 +02:00
Andy Butland
2ea89acaaa Merge branch 'netcore/netcore' into feature/8651-config-options-patten
# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
2020-08-25 10:09:54 +02:00
Andy Butland
aedd7563a4 Restored Umbraco.Tests (further) 2020-08-24 22:58:23 +02:00
Niels Lyngsø
7e32de7bb6 important fix 2020-08-24 21:59:34 +02:00