yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,588 Commits 4 Branches 7 Tags
3d2dae075d2bd61ee73064caac6fb097f6f422de
Commit Graph

5513 Commits

Author SHA1 Message Date
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
aac35698a1 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 10:07:04 +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
Niels Lyngsø
aa06051418 Update da.xml 2020-11-02 15:16:25 +01:00
Niels Lyngsø
e145a4cf1f implement widely on BlockList Prevalue Editor 2020-11-02 09:05:37 +01:00
Paul Johnson
4ae329589a NetCore: MSDI refactor remove IFactory & IRegister (#9308) 
* Replace IFactory with IServiceProvider

* Replace IRegister with IServiceCollection

* Fix Rte.cshtml so the view can service locate.

* Replace Composing Lifetime with MSDI ServiceLifetime

* Remove ServiceProvider AddMultipleUnique extension

* Remove Umbraco.Web.Composing.Current.Reset and any calls

* Remove LightInject from net framework projects

* Brought back a helper for setting MediaFileSystem underlying IFileSystem
 2020-10-30 12:16:17 +01:00
Rachel Breeze
f41a132323 Now sets the culture of the page umbraco page based on the localisation selected on the profile (#9108) 2020-10-30 10:54:26 +10:00
Niels Lyngsø
1f5c61fe67 New text as UI has changed 2020-10-28 14:20:18 +01:00
Paul Johnson
ec66990e72 NetCore: MSDI refactor phase 2 (#9280) 
* Moved adapters from Infra -> Core

* Allow Composition to accept a service collection instead of an IRegister

* Composition no longer takes IRegister as constructor arg

all tests passing

* Composition no longer implements IRegister

* Lose _uniques in Composition

* lose Composition OnCreatingFactory actions

* Clean up UmbracoCoreServiceCollectionExtensions & Composition

Less IFactory

* LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1

* Resolve dead code issues

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later.

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued)

Thought the counts were low, it's mostly extension method usage
 2020-10-27 11:53:01 +01:00
Shannon
64d8b56eca It builds! 2020-10-23 14:18:53 +11:00
Shannon
1400a02798 Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
#	src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-10-23 10:10:02 +11:00
Sebastiaan Janssen
297671b631 Merge branch 'v8/8.8' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Packaging/PackageDataInstallation.cs
 2020-10-22 14:21:25 +02:00
Sebastiaan Janssen
afa754067b Merge branch 'v8/8.7' into v8/dev 2020-10-22 14:18:53 +02:00
Sebastiaan Janssen
befa23190b Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2020-10-22 14:18:21 +02:00
Sebastiaan Janssen
e368607a4d Bump version to 8.8.1 2020-10-22 14:15:57 +02:00
Sebastiaan Janssen
b69e65ab3b Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
 2020-10-22 14:15:10 +02:00
Sebastiaan Janssen
3bb01e9418 Bump version to 8.7.1 2020-10-22 14:10:19 +02:00
Sebastiaan Janssen
2aefe899e4 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2020-10-22 14:08:05 +02:00
Sebastiaan Janssen
843ea1d854 Bump version to 8.6.6 2020-10-22 13:56:15 +02:00
Claus
a3c40e0356 adding missing deliveryMethod to smtp comment in web.config. 2020-10-19 13:27:58 +02:00
Owain Jones
0c619b02d3 Added a Welsh backoffice language file (#9114) 2020-10-14 11:21:51 +01:00
Mike Chambers
8b653a4cfb Update Rte.cshtml 
Remove references to the deprecated TemplateUtilities.
 2020-10-13 11:28:25 +01:00
Kenn Jacobsen
6c5b6567de Formlulate the block list delete confirmation as a question (#9139) 2020-10-12 16:34:49 +01:00
Niels Lyngsø
20f2917a0c Exit PreviewMode when all Preview Session are closed + translation 2020-10-09 16:05:53 +02:00
Niels Lyngsø
6009acdfbf updated wording 2020-10-09 10:46:36 +02:00
Niels Lyngsø
dc072293f9 New dialogs for asking about Preview mode 2020-10-08 16:36:25 +02:00
Bjarke Berg
c7cdfaa775 Update nuget packages 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-08 14:49:24 +02:00
Niels Lyngsø
f380c221a5 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/confirm-website-preview-mode 2020-10-08 09:46:40 +02:00
Bjarke Berg
c4cedceda1 Merge 2020-10-07 08:49:37 +02:00
Sebastiaan Janssen
29a6b7a5c0 Merge branch 'v8/8.8' into v8/8.9 2020-10-06 09:13:54 +02:00
Sebastiaan Janssen
cfd20833c7 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
 2020-10-06 09:12:35 +02:00
Brynjólfur Gunnarsson
a5639a70c9 fixed publish variants dialog translation 2020-10-06 07:45:08 +10:00
Sebastiaan Janssen
e9627f2ee9 Merge branch 'v8/dev' into v8/contrib 2020-10-05 21:12:51 +02:00
Sebastiaan Janssen
ed24a695e4 Merge branch 'v8/8.9' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-10-05 20:58:47 +02:00
Sebastiaan Janssen
e41fdc3cce Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
 2020-10-05 20:57:57 +02:00
Bjarke Berg
ad4834cc68 Updated tour skip-step condition to the new format after introduction of umb-icon 
(cherry picked from commit 1107e5d0fd)
 2020-10-05 20:50:52 +02:00
Ronald Barendse
2bfef74191 Fix casing of 'URL' (#9080) 2020-10-05 20:48:38 +02:00
Bjarke Berg
1107e5d0fd Updated tour skip-step condition to the new format after introduction of umb-icon 2020-10-05 10:45:02 +02:00
Bjarke Berg
586c61f282 moved getting-started.json from old to new project 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-05 07:50:55 +02:00
Niels Lyngsø
f20e322ff5 apply functionality to modal. 2020-10-02 20:46:54 +02:00
Bjarke Berg
2b7980fcb9 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Services/IIconService.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Services/IconService.cs
 2020-10-02 16:38:12 +02:00
Niels Lyngsø
a7db158894 ask user wether they like to stay in preview mode 2020-10-02 16:12:24 +02:00
Søren Kottal
c608d95087 Adds polling function to the Logviewer (#9023) 
* Add polling function to logviewer

* float the sub buttons right
 2020-10-02 14:48:47 +02:00
Niels Lyngsø
c264cc9691 configure label position on Property level 2020-10-01 17:30:03 +02:00
Bjarne Fyrstenborg
0b5c039a93 Show only settings and styles boxes when each of them has configuration (#8827) 2020-09-30 20:11:26 +02:00
Niels Lyngsø
80ab69edd7 Highlight blocks that are not available anymore 2020-09-30 14:31:15 +02:00
Warren Buckley
1868c215d9 Merge pull request #8850 from umbraco/v8/feature/umb-property-info-button 
Review Feature: umb-property-info-button
 2020-09-28 11:49:24 +01:00
Claus
f24c54acad bump version to 8.6.5 2020-09-24 11:38:08 +02:00
Shannon
0e44acc45e Merge remote-tracking branch 'origin/v8/8.8' into v8/8.9 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-09-24 14:19:58 +10:00