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

10956 Commits

Author SHA1 Message Date
Shannon
06ce62d922 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/boot-failed-exception 2020-05-18 16:20:25 +10:00
Bjarke Berg
dd986d4f73 Post merge + fix in views 2020-05-15 14:22:10 +02:00
Bjarke Berg
515d43e11b Merge branch 'netcore/netcore' into netcore/feature/auto-routing 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
 2020-05-15 14:10:03 +02:00
Shannon
3d9603e669 Migrates more logic from the umb module over to netcore 2020-05-14 22:50:27 +10:00
Shannon
88f6d09ef9 Enables the boot failed exception logic 2020-05-14 22:14:00 +10:00
Shannon
e3591923c3 Gets auto-routing back office api controllers working, lots of notes 2020-05-14 17:04:16 +10:00
Shannon
768d95588f Moves the PreviewController to netcore, ports the UmbracoAuthorizeAttribute to netcore, routes the minimal back office controllers and dynamically routes based on runtime. 2020-05-13 16:09:54 +10:00
Elitsa Marinovska
0eefbfd449 Migrating SurfaceController 2020-05-11 20:29:38 +02:00
Elitsa Marinovska
87ce202a1e Marking actions in old BackOfficeController as migrated. Updating the netcore BackOfficeController after merge 2020-05-11 17:05:57 +02:00
Elitsa Marinovska
412067e11f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6455-migrate-surfacecontroller 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-05-11 16:50:36 +02:00
Elitsa Marinovska
00f4899d94 Merge branch 'netcore/dev' into netcore/feature/AB6352-migrate-action-results 2020-05-11 16:07:59 +02:00
Bjarke Berg
be81e927a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-05-11 12:31:47 +02:00
Bjarke Berg
3c622905ba Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2020-05-11 08:23:59 +02:00
Shannon
12bb68100a Remove ununsed and unneeded DbProviderFactory CreateFactory(); from IDbProviderFactoryCreator, ensure the app doesn't explode if exceptions are thrown and boot fails 2020-05-08 17:30:30 +10:00
Bjarke Berg
8f7c022f2d AB#6233 - Handle ApplicationUrl 2020-05-07 09:34:16 +02:00
Shannon Deminick
aff41762ac Merge pull request #8061 from umbraco/v8/bugfix/5716-section-check-when-no-dashboards 
Preventive check that will enable sections load for users with no dashboards
 2020-05-07 15:46:16 +10:00
Bjarke Berg
269c75e26b AB¤6233 - Reverted changes to typefinder and implemented check for if SqlCE is available in the install process 2020-05-06 20:37:03 +02:00
Warren Buckley
0f4681f3f9 Merge pull request #7973 from umbraco/v8/feature/AB6057-segment-feature 
Segment feature
 2020-05-05 14:53:12 +01:00
Bjarke Berg
13197eb5ff AB#6233 - Cleanup / Fixes from review 2020-05-05 14:28:01 +02:00
Bjarke Berg
ecc596c483 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core 
# Conflicts:
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
 2020-05-05 12:15:53 +02:00
Bjarke Berg
e8fc2a766b Implemented GetUsersInRoleAsync and reintroduced email check 2020-05-05 11:33:19 +02:00
Elitsa Marinovska
3763427726 Adding section value check in the query string 2020-05-05 09:41:04 +02:00
Scott Brady
c58f480d24 Addressed IdentityError changes (it's no longer a collection of string) 2020-05-04 18:49:06 +01:00
Scott Brady
04e9140486 Null checks and property uses 2020-05-04 18:32:57 +01:00
Scott Brady
57ec84cb47 Basic tests & refactor for PostUnlockUsers 2020-05-04 18:19:24 +01:00
Scott Brady
5815bfa15f Merge remote-tracking branch 'Umbraco/netcore/dev' into netcore/feature/users 2020-05-04 14:36:45 +01:00
Bjarke Berg
305ed42b48 Moved the sqlce db to root/App_Data/umbraco.sdf, instead of wwwroot/App_Data/umbraco.sdf 2020-05-04 14:40:11 +02:00
Shannon
d7469e6576 when we rebuild indexes in the back office we are actually calling index.CreateIndex() 2 times before populating 2020-05-04 09:24:07 +02:00
Bjarke Berg
03c68fa638 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core 2020-05-04 06:55:08 +02:00
Bjarke Berg
aa31a8b5dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
#	src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
#	src/Umbraco.Core/PublishedModelFactoryExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-05-01 14:13:15 +02:00
Niels Lyngsø
641332d28e Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB6057-segment-feature 2020-05-01 09:29:29 +02:00
Bjarke Berg
da1e83c0d1 AB#6233 - Added application url on IHostingEnvironment. Still need a way to figure out how to get this value 2020-05-01 08:26:05 +02:00
Scott Brady
f3f4537c58 Removed test settings 2020-04-30 15:50:19 +01:00
Scott Brady
077cf57abc PR recommendations: added null checks where FindByX was added, using the same exception as ASP.NET Identity 2 2020-04-30 15:48:32 +01:00
Scott Brady
643c249386 Moved ClaimsIdentityExtensions into Umbraco.Core 2020-04-30 09:28:46 +01:00
Scott Brady
2caab18d29 Reintroduced FindFirstValue extension method 2020-04-30 09:27:34 +01:00
Scott Brady
123b59506b Apply suggestions from code review 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2020-04-30 08:50:56 +01:00
Niels Lyngsø
d9f25d0841 do not showAllowSegmentationForDocumentTypes pr default 2020-04-29 16:36:40 +02:00
Warren Buckley
9bce66cb5f Adds AllowSegmentVariation on the Doctype to be peristed 2020-04-29 15:29:21 +01:00
Bjarke Berg
59501eba86 AB#6233 - Cleanup 2020-04-29 16:11:56 +02:00
Bjarke Berg
e45ffea207 Merge pull request #7983 from umbraco/v8/bugfix/models-builder-enable-flag 
ModelsBuilder enabled flag not respected
 2020-04-29 07:37:33 +02:00
Shannon
279329d682 removes code that shouldn't have been committed. 2020-04-29 10:32:05 +10:00
Elitsa Marinovska
450226a2c3 Marking classes as "Migrated" 2020-04-28 16:01:11 +02:00
Scott Brady
d08bb08f57 Cleanup 2020-04-28 13:05:40 +01:00
Scott Brady
3584aa9fa3 Fixed naming for login info wrapper 2020-04-28 13:00:02 +01:00
Scott Brady
1862bf033f Normalized int to string conversion 2020-04-28 12:20:04 +01:00
Bjarke Berg
bc4713a51c #6233- SqlCE stuff 2020-04-28 07:02:14 +02:00
Niels Lyngsø
678ceba1a8 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB6057-segment-feature 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
 2020-04-27 12:58:29 +02:00
Sebastiaan Janssen
d65041c250 Merge branch 'v8/dev' into v8/contrib 2020-04-27 11:03:32 +02:00
Scott Brady
0338c2fc4a Removed null checks from normalizer (breaks Umbraco bootstrap process) 2020-04-24 12:52:49 +01:00