yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,789 Commits 4 Branches 7 Tags
5c6b8fe2bc36a9348ac88b469fdb3e1ca8a2a42a
Commit Graph

37789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emma Garland
5c6b8fe2bc Added security logic previously added to PasswordChanger 2021-03-15 09:01:10 +00:00
Emma Garland
aa4947913e Merge branch 'netcore/dev' into netcore/members-passwordchange-temp 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs
 2021-03-12 14:29:35 +00:00
Bjarke Berg
57386c8fbc change table name prefix for LogViewerQuery 2021-03-12 13:33:38 +01:00
Bjarke Berg
fca6fb2a44 Merge pull request #9970 from umbraco/netcore/feature/reintroduce-friendly-bun-untestable-published-content-extensions 
Netcore: Reintroduce friendly bun untestable published content extensions
 2021-03-12 13:02:41 +01:00
Bjarke Berg
ba1ea34b4b Merge remote-tracking branch 'origin/netcore/feature/reintroduce-friendly-bun-untestable-published-content-extensions' into netcore/feature/reintroduce-friendly-bun-untestable-published-content-extensions 2021-03-12 11:58:08 +01:00
Bjarke Berg
8332b3219b bugfix in snippet 2021-03-12 11:57:56 +01:00
Bjarke Berg
9a180c1685 Update src/Umbraco.Web.Common/DependencyInjection/StaticServiceProvider.cs 
Co-authored-by: Andy Butland <abutland73@gmail.com>
 2021-03-12 11:48:23 +01:00
Bjarke Berg
aa34f32990 bugfix 2021-03-12 11:38:28 +01:00
Bjarke Berg
b71e469854 Added missing extensions 2021-03-12 11:25:58 +01:00
Bjarke Berg
1b7cc659aa Merge pull request #9942 from umbraco/netcore/feature/individual-nuget-pr-assembly 
Netcore: Individual nuget  packages for each assembly
 2021-03-11 14:19:24 +01:00
Bjarke Berg
d777d7dded Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 13:48:14 +01:00
Bjarke Berg
774ea529f5 Fxi version 2021-03-11 13:36:04 +01:00
Bjarke Berg
89cc2d31d5 Fix build script after removale of old nuspec files 2021-03-11 13:29:31 +01:00
Bjarke Berg
2b89839724 Netcore: Get rid of default files in config folder (#9966) 
* TourController now uses the core tours from embedded resources

* Moved tinyMceConfig.*.config to IOptions

* Embedded the default grid.editors.config.js

* Fixed issue when saving grid with an empty media cell

* Logviewer now uses sql as database instead of file.

* Remove config folder from build script and nuget pacakges.

* Removing auto-generated Id added to appsettings.json

* Update src/Umbraco.Web.BackOffice/Controllers/TourController.cs

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2021-03-11 13:20:46 +01:00
Bjarke Berg
77be21d2d9 Merge remote-tracking branch 'origin/netcore/feature/individual-nuget-pr-assembly' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 13:15:46 +01:00
Bjarke Berg
9ce475afa5 Do not reference System.Configuration.ConfigurationManager just because of an exception. And moved the reference to lucene to be safe 2021-03-11 13:14:28 +01:00
Mole
77fc623c9a Update src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-03-11 11:35:54 +01:00
Bjarke Berg
1b5eb1ec20 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/reintroduce-friendly-bun-untestable-published-content-extensions 2021-03-11 11:35:48 +01:00
Bjarke Berg
c9bd3ed653 Change namespace 2021-03-11 11:35:41 +01:00
Bjarke Berg
8d743cbe2c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 10:33:48 +01:00
Bjarke Berg
91e877cebe Merge pull request #9849 from kjac/netcore/bug/preview 
Preview does display draft versions
 2021-03-11 08:41:21 +01:00
Bjarke Berg
78d8f0bacf Fix Deserialization of defaultConfig from package.manifest 2021-03-10 21:13:13 +01:00
Bjarke Berg
88e92a0360 Fix Deserialization of defaultConfig from package.manifest 2021-03-10 19:32:56 +01:00
Bjarke Berg
5a8d3d167a Merge pull request #9965 from umbraco/netcore/bugfix/AB10799-fix-authorization-policies-bound-to-translation-section 
NetCore: Fix authorization policies bound to Translation section
 2021-03-10 15:32:32 +01:00
Elitsa Marinovska
63d7d23cd7 Revert changes to default appsettings.json 2021-03-10 14:42:31 +01:00
Elitsa Marinovska
1e480abfc8 Remove duplicated TreeAccessDocumentTypes policy and fixed the one for TreeAccessDictionary 2021-03-10 14:40:25 +01:00
Bjarke Berg
8bc637090e Error handling issue fix 
Add the option to configure some pipeline that executes before Umbraco in the StartupFilter. AB10786
 2021-03-10 12:50:27 +01:00
Bjarke Berg
d33bc12fd1 Merge pull request #9943 from umbraco/netcore/feature/merge-v8-05032021 
Netcore: Merge v8 05032021
 2021-03-10 08:07:53 +01:00
Bjarke Berg
bec0e09aed Update src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs 2021-03-10 07:26:46 +01:00
Shannon
87749b5078 Ensures claims continue to flow even after the security stamp validator executes. 2021-03-10 14:46:51 +11:00
Shannon
52182ebbf5 Fixes logging for PublishedRouter 2021-03-10 12:08:20 +11:00
Bjarke Berg
d5fb31b3a2 Reintroduce tests 2021-03-09 11:32:23 +01:00
Bjarke Berg
9153715432 Post merge fixes 2021-03-09 11:15:55 +01:00
Bjarke Berg
1aa8d3aa09 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-05032021 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/Editors/UserGroupsController.cs
 2021-03-09 10:08:53 +01:00
Bjarke Berg
d81874aee3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/merge-v8-05032021 
# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
 2021-03-09 09:31:55 +01:00
Bjarke Berg
5fee73f50d Merge pull request #9926 from umbraco/netcore/bugfix/10196-ambient-scope 
Fixes ExecutionContext flowing to child threads (Ambient Scope issues)
 2021-03-09 09:12:43 +01:00
Shannon
a40b754636 merge issue 2021-03-09 18:30:20 +11:00
Shannon
0b6d99c23a oops, forgot commit 2021-03-09 17:50:43 +11:00
Shannon
a668e9aa07 Fixup package refs and nuspecs, remove IDisposeOnRequestEnd 2021-03-09 13:12:52 +11:00
Shannon
6dd5714923 Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope 
# Conflicts:
#	src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
 2021-03-09 12:52:15 +11:00
Shannon Deminick
32d75b16af Merge pull request #9916 from umbraco/netcore/bugfix/AB10710_UmbracoContext_should_not_use_IBackOfficeSecurity 
Netcore: Fix coupling between IBackOfficeSecurity and IUmbracoContext
 2021-03-09 12:49:53 +11:00
Shannon Deminick
e8cc0fcac5 Update src/Umbraco.Web.Common/Cache/HttpContextRequestAppCache.cs 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-03-09 12:47:13 +11:00
Shannon
78f5b2f0d7 removes double httpcontextaccessor registration and updates test notes. 2021-03-09 12:45:51 +11:00
Bjarke Berg
6d293c6ffd Fixed null ref exception 2021-03-08 21:37:31 +01:00
Bjarke Berg
49bb5ee4b7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/AB10710_UmbracoContext_should_not_use_IBackOfficeSecurity 2021-03-08 21:27:40 +01:00
Bjarke Berg
745014a4c3 User manager related updates (#9935) 
* Only allow not-admins to assign groups they have themselves

* Only admins is allowed to change password of other admins

* Fixed issue with deep clone of UserGroup. The Allowed sections was not cloned. This resulted in the allowed sections of the object stored in cache was updated, everytime we changed the allowed sections on an object cloned from the cache. Even if we did not save it.

* Only Admins are allowed to add sections to a user group, that they don't have access to themselves

* Align backend code with UI. User managers that is are not admin, can only assign the same groups new users, that they have themselves.

* Make existingGroupAliases and empty array when creating a new user

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2021-03-08 13:26:52 +01:00
Sebastiaan Janssen
4a8a73f03d Merge branch 'v8/8.12' into v8/dev 2021-03-08 12:28:55 +01:00
Sebastiaan Janssen
49435708a5 Merge branch 'v8/8.11' into v8/8.12 2021-03-08 12:28:21 +01:00
Sebastiaan Janssen
8b04c32dff Merge branch 'v8/8.10' into v8/8.11 2021-03-08 12:27:42 +01:00
Lars-Erik Aabech
fc447bb101 Should allow grid editors to use hash based settings (#9837) 
* Should allow grid editors to use hash based settings

* Swap to using vm in grid config controller, as well as showing button when there's map settings

* Included keys for styles in empty state check for grid settings

* converted the code into more AngularJS performant code

* Remove rogue change to grid.editors.config

* use watchCollection instead

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 008827f785)
 2021-03-08 12:27:06 +01:00