yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,510 Commits 4 Branches 7 Tags
60424dd54f462cdfaeffad6746f2cb1aeba5e87a
Commit Graph

35510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
60424dd54f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/reset_password 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
 2020-09-22 19:35:49 +02:00
Bjarke Berg
0ea251945b Netcore: migrate more unittests (#8939) 
* Migrated unit tests

* Migrated CoreThings tests

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

* Migrated Property Editor unit tests

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

* Migrated CoreXml tests

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

* Moved more tests

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

* revert some IsSZArray test code

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

* Renamed bad named test

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

* removed unnecessary file mentions in csproj file

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

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 15:59:37 +02:00
Bjarke Berg
0c908a7bbb Introduced interface on BackOfficeUserManager (#8913) 
* Introduced IBackOfficeUserManager

* Fixed test

* Moved class into own file

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 14:44:41 +02:00
Bjarke Berg
e6fba11279 Merge pull request #8932 from umbraco/netcore/feature/AB8239-nuget-updates 
NetCore: Update NuGet packages to latest versions
 2020-09-22 14:35:34 +02:00
Bjarke Berg
6fdf7082a0 Fixed issue models builder config and changed default mode to nothing 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 14:16:00 +02:00
Bjarke Berg
3533c6a959 Fixed issue with template using alpha001 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 14:14:27 +02:00
Bjarke Berg
35c39623a6 fix merge issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 13:45:20 +02:00
Bjarke Berg
69668abc18 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-22 13:32:21 +02:00
Bjarke Berg
c2f343b17d Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore 2020-09-22 13:28:50 +02:00
Bjarke Berg
a28168667b Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Core/Models/IconModel.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-09-22 13:28:03 +02:00
Bjarke Berg
a80de91031 Netcore: Handle tree authentication (#8866) 
* Added helper methods to invoke the authorization filters of the other controller action

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

* Implemented Tree Auth

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

* cleanup

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

* Throw forbidden if user has no access instead of InternalServerError

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

* EnsureBackofficeSecurity for background jobs

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

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 13:19:54 +02:00
Bjarke Berg
8e9889d269 Post merge 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 12:44:36 +02:00
Bjarke Berg
bd534d340e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/IIconService.cs
#	src/Umbraco.Infrastructure/Services/Implement/IconService.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-09-22 12:38:36 +02:00
Claus
b12fad75da Merge remote-tracking branch 'origin/v8/8.8' into v8/dev 2020-09-22 10:38:25 +02:00
Claus
ab4d830626 Merge pull request #8930 from umbraco/v8/bug/8919-cache-icons-used-in-login-screen 
Inject icons used in login screen to the runtime icon cache
 2020-09-22 10:33:56 +02:00
Bjarke Berg
1badb69481 #8919 - Clean up obsolete ctor 2020-09-22 10:14:34 +02:00
Bjarke Berg
164fa24ef3 #8919 - Fix issue with wrong casing of variable name 2020-09-22 10:04:55 +02:00
Bjarke Berg
96facc4d35 Netcore: Introduce BackofficeSecurityAccessor (#8871) 
* Introduced IWebSecurityAccessor

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

* Fixed tests

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

* Renamed WebSecurity to BackofficeSecurity and all related names

* Fixes typos

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 10:01:00 +02:00
Bjarke Berg
5df3e051d3 Merge remote-tracking branch 'origin/v8/bug/8919-cache-icons-used-in-login-screen' into v8/bug/8919-cache-icons-used-in-login-screen 
# Conflicts:
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Services/IIconService.cs
#	src/Umbraco.Web/Services/IconService.cs
 2020-09-22 09:21:45 +02:00
Bjarke Berg
ccc0e82579 #8919 - Avoid having fat controller and do not new up a controller in a model 2020-09-22 08:58:16 +02:00
Claus
6e56b16342 adding IconService 2020-09-22 08:57:48 +02:00
Claus
b327399cd2 adding icon svg data from IconController. 2020-09-22 08:11:58 +02:00
Bjarke Berg
525ca95acf uncomment SMTP info by default 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 08:01:04 +02:00
Bjarke Berg
d7ab7d3d2e Removed test code 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-18 08:30:48 +02:00
Bjarke Berg
81f670f10a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-18 08:24:29 +02:00
Bjarke Berg
9cfae2c935 Merge pull request #8891 from umbraco/netcore/feature/8651-config-options-pattern-refactor 
Netcore: Replace configurations with IOptions pattern
 2020-09-18 08:20:03 +02:00
Bjarke Berg
380bec0e2f Fixed wrong config file path 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-18 07:05:40 +02:00
Elitsa Marinovska
66f35f428d Updates nuspec files with new nuget packages version 2020-09-17 18:47:24 +02:00
Elitsa Marinovska
0f9595a5b1 Updates nuget packages versions to latest 2020-09-17 17:58:11 +02:00
Niels Lyngsø
d3db24e705 Merge remote-tracking branch 'origin/v8/8.8' into v8/bug/8919-cache-icons-used-in-login-screen 2020-09-17 15:00:02 +02:00
Niels Lyngsø
e2957bb715 inject icons to iconHelper to avoid making requests to the icon controller 2020-09-17 14:59:49 +02:00
Niels Lyngsø
0506c8c555 defineIcon method 2020-09-17 14:59:12 +02:00
Sebastiaan Janssen
6b0539fefc Set version to RC 2020-09-17 12:19:07 +02:00
Lars-Erik Aabech
6d15a2fce3 Eliminates error/no-preview when grid media picker have no crop set (#8620) 
(cherry picked from commit deb03e4d82)
 2020-09-17 11:35:17 +02:00
Lars-Erik Aabech
deb03e4d82 Eliminates error/no-preview when grid media picker have no crop set (#8620) 2020-09-17 11:32:52 +02:00
Niels Swimberghe
6d2135edd5 Change wrong URL in KeepAlive XML Comments 
The XML comments for KeepAlive mention the URL for the KeepAlive.Ping action but incorrectly omits 'umbraco' from the path.
The change adds the 'umbraco' section to the path.

(cherry picked from commit 312dc1d9a7)
 2020-09-17 09:19:09 +02:00
Warren Buckley
5a37854dd5 Merge pull request #7599 from umbraco/v8/feature/ui-media-create-button-style 
UI: corrected button style to match new style
(cherry picked from commit 2e055ca146)
 2020-09-17 09:18:55 +02:00
Niels Swimberghe
312dc1d9a7 Change wrong URL in KeepAlive XML Comments 
The XML comments for KeepAlive mention the URL for the KeepAlive.Ping action but incorrectly omits 'umbraco' from the path.
The change adds the 'umbraco' section to the path.
 2020-09-17 12:25:09 +10:00
Bjarke Berg
1334fd0c5e Typo 2020-09-16 11:47:37 +02:00
Bjarke Berg
af59a7a0b9 Do not login after install. This currently leads to issues due to the restart. 2020-09-15 13:47:54 +02:00
Bjarke Berg
b7a48686f0 Updates based on review feedback 2020-09-15 13:18:01 +02:00
Bjarke Berg
9c91dd5994 Fixed test 2020-09-15 12:23:41 +02:00
Bjarke Berg
5836ca3da4 Bugfix - Imagesharp cache folder is not relative to root but to the wwwroot. "~" is not replaced with root 2020-09-15 10:27:23 +02:00
Bjarke Berg
9d91e629c6 Bugfix in CheckIfUserTicketDataIsStaleAttribute 2020-09-15 10:13:05 +02:00
Bjarke Berg
4918841154 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/8651-config-options-pattern-refactor 2020-09-15 09:36:29 +02:00
Bjarke Berg
7d8c9ee4c9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-09-15 09:35:57 +02:00
Bjarke Berg
c9243d9d61 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-09-15 09:35:05 +02:00
Bjarke Berg
b4353585c3 Simplifyed the ConnectionStrings config 2020-09-15 09:11:36 +02:00
Bjarke Berg
4a4b57ef87 bugfixes related to no umbraco connection string 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-14 21:53:56 +02:00
Bjarke Berg
ce2da18304 Fixed based on review comments 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-14 21:27:31 +02:00