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 |
|
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 |
|
Niels Lyngsø
|
056a554875
|
use absolute path for thumbnail and dont scale SVGs
|
2020-08-24 21:38:36 +02:00 |
|
Bjarke Berg
|
c561b256bf
|
Updated solution to include correct filenames
|
2020-08-24 18:09:16 +02:00 |
|
Bjarke Berg
|
0a954d1804
|
Fix issue with build targets after nuget rename
|
2020-08-24 18:01:56 +02:00 |
|
Andy Butland
|
863a7195b2
|
Restored Umbraco.Tests (partially)
|
2020-08-24 16:06:09 +02:00 |
|
Bjarke Berg
|
b5b492106d
|
Clean up by moving stuff from Startup.cs into extention methods
|
2020-08-24 14:23:08 +02:00 |
|
Bjarke Berg
|
892a7e0b34
|
Changed default value of HideTopLevelNodeFromPath to true
|
2020-08-24 14:16:34 +02:00 |
|
Bjarke Berg
|
49ce3da698
|
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore
|
2020-08-24 14:16:04 +02:00 |
|
Bjarke Berg
|
c0d4516e15
|
Updated default config files
|
2020-08-24 14:15:53 +02:00 |
|
Bjarke Berg
|
95523e2a93
|
Merge pull request #8677 from umbraco/netcore/bugfix/send-notifications-dont-use-stmp-info-from-config
Netcore: Fixes issue with notifications that did not use the SMTP from config
|
2020-08-24 14:14:22 +02:00 |
|
Andy Butland
|
adf687579c
|
Restored Umbraco.Tests.IntegrationTests (some failures remaining)
|
2020-08-24 12:34:37 +02:00 |
|
Bjarke Berg
|
0f72339d4a
|
Merge pull request #8678 from umbraco/netcore/bugfix/scope-asynclocal-enumerable-issue
Fixes issue with scopes being disposed or referenced incorrectly
|
2020-08-24 11:52:57 +02:00 |
|
Andy Butland
|
9bd8b894b8
|
Restored Umbraco.Tests.UnitTests
|
2020-08-24 10:52:48 +02:00 |
|
Andy Butland
|
7774878c26
|
Restored Umbraco.Tests.Common
|
2020-08-24 09:56:27 +02:00 |
|
Andy Butland
|
c3c8d79720
|
Merge branch 'netcore/netcore' into feature/8651-config-options-patten
|
2020-08-24 09:45:25 +02:00 |
|
Andy Butland
|
7884e4ca17
|
Resolved issues such that application boots and back-office is navigable.
|
2020-08-24 09:29:40 +02:00 |
|
Bjarke Berg
|
31e8acb875
|
Renamed nuget pacakges to Umbrac.Cms.*
|
2020-08-24 09:23:37 +02:00 |
|
Shannon Deminick
|
46aee2536e
|
Merge pull request #8674 from umbraco/netcore/feature/update_user_on_login
Netcore: Update user on successful login
|
2020-08-24 14:31:44 +10:00 |
|