yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,863 Commits 4 Branches 7 Tags
9904dc6cc2b65ade1fc01b28a5a3078d18e6c9c5
Commit Graph

33863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
9904dc6cc2 Merge commit '6dcaa986cda8c8bbca06df8030299d5901d31ceb' into netcore/feature/identity-temp 2020-05-28 17:29:35 +10:00
Shannon Deminick
dc6113ffdb Merge pull request #8168 from umbraco/netcore/feature/move-more-controllers 
Netcore: Move/Migrate more controllers
 2020-05-26 17:14:21 +10:00
Bjarke Berg
2c2d70c500 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved controllers: HealthCheckController + All localization files + fixed issues with MapPath from wwwroot to content root 2020-05-25 14:50:51 +02:00
Bjarke Berg
ee3615e36d https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved controllers: TagsDataController, RteEmbedController, RichTextPreValueController, NestedContentController, WebProfilingController + Moved compose of MapDefinitionCollectionBuilder into core, and uncommented missing map definitions 2020-05-25 13:41:05 +02:00
Bjarke Berg
e4c8e2009c Moved BackOfficeNotificationsController to netcore 2020-05-22 07:26:46 +02:00
Shannon Deminick
b5df81fca2 Merge pull request #8135 from umbraco/netcore/feature/AB6586-migrate_controllers 
Netcore: Migrate Controllers
 2020-05-21 15:00:54 +10:00
Bjarke Berg
28c4f87236 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated ImageUrlGeneratorController + Made usage some strings into the enums in the ImageUrlGenerationOptions 2020-05-20 17:39:07 +02:00
Bjarke Berg
0d65fccd52 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated ImagesController 2020-05-20 13:51:21 +02:00
Bjarke Berg
a94af8db03 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated HelpController 2020-05-20 13:35:55 +02:00
Bjarke Berg
ea300f61ce Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6586-migrate_controllers 2020-05-20 13:30:02 +02:00
Bjarke Berg
aa63ce5ed9 Merge branch 'netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2020-05-20 12:43:13 +02:00
Bjarke Berg
490ae37b28 #8142 - Added smtp authentication if username or password provided 2020-05-20 12:38:21 +02:00
Bjarke Berg
a120b9cffb Merge pull request #8142 from umbraco/netcore/feature/AB6507-reimplement-email-service 
Netcore: Re-implementing Email Service
 2020-05-20 12:29:21 +02:00
Bjarke Berg
2b4dfbca9d #8142 - Small cleanup, and bugfix 2020-05-20 11:42:23 +02:00
Bjarke Berg
1c220b4925 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Removed uncommented code, that was removed due to the container needs only a single valid constructor 2020-05-20 08:44:02 +02:00
Bjarke Berg
a8f5d21eeb https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - removed old OutgoingEditorModelEventAttribute and EditorModelEventManager 2020-05-20 08:39:27 +02:00
Bjarke Berg
ca399c7e89 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - removed old tourcontroller 2020-05-20 08:33:00 +02:00
Elitsa Marinovska
65fa1efc9c Changing a var name for better reflection on the origin of its value 2020-05-20 00:54:28 +02:00
Elitsa Marinovska
16d805e6f5 Adding Smtp section in appsettings, registering IEmailSender as an email service and ofc the MailKit nuget in Infrastructure proj 2020-05-20 00:24:55 +02:00
Elitsa Marinovska
ad31db9f4a Adding DeliveryMethod option which we make use of in EmailSender.cs 2020-05-20 00:21:45 +02:00
Elitsa Marinovska
e85ccb0dab Removing TODOs with the actual implementation 2020-05-20 00:20:25 +02:00
Elitsa Marinovska
ea380985db Moving files using MailKit nuget package (Smtp successor) as SmtpClient has been marked as obsolete by Microsoft 2020-05-20 00:19:43 +02:00
Bjarke Berg
bff9477c31 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated ExamineManagementController 2020-05-19 14:02:12 +02:00
Scott Brady
6dcaa986cd Removed unnecessary TODO and code duplication 2020-05-19 12:18:47 +01:00
Bjarke Berg
35680bba46 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated DashboardController and BackOfficeAssetsController 2020-05-19 09:52:58 +02:00
Bjarke Berg
e7354c9b45 Merge pull request #8124 from umbraco/netcore/feature/boot-failed-exception 
boot failed exception handling
 2020-05-19 07:50:06 +02:00
Shannon
95d695594a Ensure we capture boot failed exception earlier and ensure that composers registered to run on boot failed are executed 2020-05-19 14:51:05 +10:00
Bjarke Berg
4ca6868553 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated TourController 2020-05-18 15:19:52 +02:00
Scott Brady
a44dde9432 Added IdentityExtensions 2020-05-18 13:00:32 +01:00
Scott Brady
091712e5de Merge remote-tracking branch 'Umbraco/netcore/netcore' into netcore/feature/aspnetcoreidentity 2020-05-18 12:52:03 +01:00
Scott Brady
6f75fe6cc4 Reintroduced missing OWIN user manager functionality 2020-05-18 12:51:24 +01:00
Scott Brady
7b1ce5bbe7 Removed duplication with user store and manager 2020-05-18 12:06:26 +01:00
Bjarke Berg
52035c043d https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated UmbracoWebApiRequireHttpsFilter 2020-05-18 12:40:01 +02:00
Bjarke Berg
0cfd40747c Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6586-backofficecontroller 2020-05-18 12:01:48 +02:00
Bjarke Berg
287f379c1b Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-05-18 12:01:18 +02:00
Bjarke Berg
a198d4a37c Merge pull request #8122 from AndyButland/feature/7799-netcore-web-api-component-migration 
Netcore: Implemented various Web API components
 2020-05-18 12:00:07 +02:00
Bjarke Berg
5e131ebafb Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-05-18 11:51:55 +02:00
Bjarke Berg
cda531e34e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	src/Umbraco.Web/Editors/ContentController.cs
 2020-05-18 10:37:28 +02:00
Andy Butland
0e4d8506fb Updated following PR review. 2020-05-18 09:36:56 +02:00
Scott Brady
c92c633edb Reduced duplicated code 2020-05-18 08:21:34 +01:00
Shannon
06ce62d922 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/boot-failed-exception 2020-05-18 16:20:25 +10:00
Shannon Deminick
c36c2f6a33 Merge pull request #8099 from umbraco/netcore/feature/auto-routing 
Netcore/feature/auto routing
 2020-05-18 16:19:18 +10:00
Shannon
1cf8fb376c Merge branch 'netcore/feature/auto-routing' of https://github.com/umbraco/Umbraco-CMS into netcore/feature/auto-routing 2020-05-18 15:35:34 +10:00
Shannon
a84bcdd6ae fix ctor, fix usages of GetBackOfficeUrl 2020-05-18 15:35:20 +10:00
Shannon
027b449cb6 fixes virtual path 2020-05-18 15:16:09 +10:00
Shannon Deminick
074a174139 Update src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-05-18 15:15:53 +10:00
Shannon Deminick
5dc0dfb5ad Update src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-05-18 15:12:30 +10:00
Shannon
0973e49fcf removes test controller 2020-05-18 15:12:07 +10:00
Bjarke Berg
1f51d667e9 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated UmbracoWebApiRequireHttpsFilter 2020-05-18 06:43:33 +02:00
Scott Brady
c6210ba7f2 Working installation. Use of Thread.CurrentPrincipal removed for now 2020-05-17 10:39:30 +01:00