yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,606 Commits 4 Branches 7 Tags
8d7ec23f6913f3c1029b272f94de2bce0146ac32
Commit Graph

36606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
e42b8b20f4 Merge branch 'v8/8.9' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-11-04 11:30:27 +01:00
Sebastiaan Janssen
ca098e8a01 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 11:27:28 +01:00
Sebastiaan Janssen
0608862da9 Revert "Adds icons from App_Plugins/**/Icons/*.svg (#8884)" 
This reverts commit d7bf980f12.
 2020-11-04 11:25:45 +01:00
Sebastiaan Janssen
466f59c8d4 Bump version to 8.9.1 2020-11-04 11:22:47 +01:00
Sebastiaan Janssen
d7f10ff154 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 11:21:03 +01:00
Sebastiaan Janssen
54ad4c2481 Bump version to 8.8.2 2020-11-04 11:19:32 +01:00
Sebastiaan Janssen
cea8ac35b3 Merge branch 'v8/8.8.1' into v8/8.8 2020-11-04 11:12:15 +01:00
Mole
d0ca07bce2 Merge pull request #9336 from umbraco/netcore/feature/migrate_custom_view_engines 
Netcore: Migrate our custom view engines
 2020-11-04 10:08:51 +01:00
Sebastiaan Janssen
aac35698a1 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 10:07:04 +01:00
Sebastiaan Janssen
bff6ded89d Merge branch 'v8/8.7' into v8/8.8 2020-11-04 09:27:02 +01:00
Sebastiaan Janssen
d4fa37d6fb Merge branch 'v8/8.6' into v8/8.7 2020-11-04 09:25:33 +01:00
Bjarke Berg
9b9b5d70be Merge branch 'netcore/netcore' into netcore/feature/migrate_custom_view_engines 2020-11-04 08:40:28 +01:00
Bjarke Berg
dae6e2b8ee Migrated RenderNoContentController + related (#9309) 
* Migrated RenderNoContentController + related

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Fix after MSDI

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Update src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

* Removing connection string

* Fixed tests after moving endpoint registration

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-11-03 18:55:55 +01:00
Elitsa Marinovska
6d23075d9a Migrating the rest of the files from ContentEditing\ 2020-11-03 16:36:59 +01:00
Elitsa Marinovska
5104430879 Changing the way we register json converters globally 2020-11-03 16:36:09 +01:00
Warren Buckley
dbee98bf02 Merge pull request #9258 from umbraco/v8/feature/AB8699-Support-blocks-in-clipboard-service 
Support blocks in backoffice clipboard
 2020-11-03 13:48:07 +00:00
Bjarke Berg
1a4a72ee21 Cleanup 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 14:35:27 +01:00
Bjarke Berg
aefb596b4b More viewengine migration. Including wrapping in profiler etcs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 14:25:45 +01:00
Niels Lyngsø
67367fe111 display an error message if settings does not align. 2020-11-03 13:38:54 +01:00
Bjarke Berg
3faf0cb9ce Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate_custom_view_engines 2020-11-03 13:25:55 +01:00
Bjarke Berg
3cf45c9e88 Merge pull request #9329 from AndyButland/feature/amend-health-check-notifier-first-run-time-to-crontab 
.NetCore: change health check notifier first run time to cron expression
 2020-11-03 12:06:34 +01:00
Bjarke Berg
94b9f7453c Fix boot issue, because hosted services uses IServerMessenger that uses ISqlContext before the db is ready 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 11:20:51 +01:00
Bjarke Berg
9776816282 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate_custom_view_engines 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 10:51:00 +01:00
Bjarke Berg
9cda7d1b5a Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account 
(cherry picked from commit 223b19cbd8)
 2020-11-03 10:22:15 +01:00
Bjarke Berg
223b19cbd8 Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account 2020-11-03 10:20:46 +01:00
Bjarke Berg
8e44d89856 Introducing interface for our needs of a CronTabParser. And inject it where needed 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 09:36:56 +01:00
Bjarke Berg
1c2f048402 Migrated ProfilingViewEngine.cs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 08:14:38 +01:00
Bjarke Berg
63acacab7e Merge pull request #9332 from AndyButland/feature/further-hosted-services-2 
NetCore: Migrated scheduled publishing task to a hosted service.
 2020-11-03 07:33:58 +01:00
Bjarke Berg
2da6c8517a Merge remote-tracking branch 'origin/netcore/netcore' into feature/amend-health-check-notifier-first-run-time-to-crontab 
# Conflicts:
#	src/Umbraco.Core/ServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
 2020-11-03 07:09:15 +01:00
Bjarke Berg
f81fcc8437 Merge pull request #9330 from rustybox/netcore/netcore 
NetCore: Fixes registration issue (continued)
 2020-11-03 07:06:14 +01:00
Andy Butland
2f2da679a4 Migrated scheduled publishing task to a hosted service. 2020-11-02 18:08:25 +01:00
Niels Lyngsø
aa06051418 Update da.xml 2020-11-02 15:16:25 +01:00
Warren Buckley
9c820c7939 Update src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js 2020-11-02 13:37:27 +00:00
Bjarke Berg
051dcccae7 Merge pull request #9324 from AndyButland/feature/further-hosted-services 
Netcore: Migrates further background tasks to hosted services
 2020-11-02 14:36:37 +01:00
Warren Buckley
3a41861aa0 Update src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js 2020-11-02 13:34:34 +00:00
Warren Buckley
99441789d8 Update src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js 2020-11-02 13:30:02 +00:00
Warren Buckley
016f883ee3 Update src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js 2020-11-02 13:29:27 +00:00
Warren Buckley
d39ca35e8b Merge pull request #9243 from umbraco/v8/feature/umbBlockCard-use-umb-outline 
use umb-outline for umb-block-card
 2020-11-02 12:17:33 +00:00
Warren Buckley
5c6702bd17 Merge pull request #9241 from umbraco/v8/bugfix/umbBlockCard-should-work-without-blockConfiguration 
Make blockConfigModel optional
 2020-11-02 12:06:18 +00:00
Andy Butland
21c29d6446 Fixes failing unit test due to null reference. 
Amended signatures of method under test to support testing without the previously observed behaviour of an erroring test passing but crashing the test runner process.
 2020-11-02 11:59:39 +01:00
Paul Johnson
ebdad9f91e Add additional "mutliple unique" registrations and rename extension for clarity. 2020-11-02 10:54:29 +00:00
Andy Butland
978b8eeda7 Added additional comments on IOHelper.CleanFolder(). 2020-11-02 11:19:21 +01:00
Andy Butland
719a443af8 Moved CleanFolderResultStatus enum to it's own file. 2020-11-02 11:06:02 +01:00
Andy Butland
794d293c36 Merge branch 'netcore/netcore' into feature/further-hosted-services 2020-11-02 11:01:26 +01:00
Bjarke Berg
308617930b Merge pull request #9323 from AndyButland/feature/fix-issue-with-multiple-di-registations-for-same-interface 
NetCore: Fixes registration issue
 2020-11-02 10:47:59 +01:00
Niels Lyngsø
e145a4cf1f implement widely on BlockList Prevalue Editor 2020-11-02 09:05:37 +01:00
Bjarke Berg
2dc96c99a4 Merge pull request #9318 from umbraco/netcore/bugfix/fix-issue-with-scope-test 
Netcore : Fixed issue in ScopedRepositoryTests
 2020-11-02 08:49:20 +01:00
Andy Butland
0bffe9aa55 Updated health check configuration validation tests to match change to cron expression. 2020-11-01 08:41:17 +01:00
Andy Butland
ed8c29f902 Fixes issue with introduced MSDI abstractions where a single implemention is used for two interfaces, ensuring only one singleton instance is created. 2020-10-31 22:49:16 +01:00
Andy Butland
a0ce44c9fc Changed configuration of first run time for health check notifier from a time string to a cron expression. 2020-10-31 22:49:12 +01:00