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

33520 Commits

Author SHA1 Message Date
Shannon
48a2a0a357 remove httpcontext requirement from mapper 2021-03-26 15:54:45 +11:00
Shannon
db3dc01321 removes todos, reverts tree controller, fixes up review notes. 2021-03-26 14:18:41 +11:00
Shannon
33b5f402b4 reverts MemberGroupController and removes TODOs 2021-03-26 14:06:17 +11:00
Bjarke Berg
7193486b77 Fix unit tests 2021-03-18 08:38:57 +01:00
Bjarke Berg
6ce3a5f2a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/members-roles-save 
# Conflicts:
#	src/Umbraco.Infrastructure/Security/MemberUserStore.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
 2021-03-18 08:27:17 +01:00
Bjarke Berg
ed931a9629 Fix build 2021-03-18 08:26:28 +01:00
Shannon Deminick
8c66470d65 Merge pull request #9902 from emmagarland/netcore/members-passwordchange-temp 
Update to enable members to use the same password change as users
 2021-03-18 17:40:19 +11:00
Shannon
eccbb32f42 Fixes build and tests 2021-03-18 16:36:23 +11:00
Shannon
3350611b16 removes section check since it's already handled by authz policies 2021-03-18 16:03:04 +11:00
Shannon
36f911b66f Ensure IsApproved is persisted with MembersUserStore, Update member done in a trans and in specific steps, calls to SetLockoutEndDateAsync more safely with time before now. 2021-03-18 15:57:53 +11:00
Emma Garland
fa1499333f Merge branch 'netcore/dev' into netcore/members-roles-save 
# Conflicts:
#	.gitignore
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberIdentityUserManagerTests.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Security/MemberManager.cs
 2021-03-16 17:48:40 +00:00
Emma Garland
b1a955f444 Merge branch 'netcore/dev' into netcore/members-passwordchange-temp 
# Conflicts:
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
 2021-03-16 17:46:04 +00:00
Bjarke Berg
1a573fcb75 Review fixes https://github.com/umbraco/Umbraco-CMS/pull/9968 2021-03-16 10:44:55 +01:00
Bjarke Berg
836f4a9203 Merge branch 'netcore/dev' into netcore/feature/9623-external-login-token-store 2021-03-16 09:15:53 +01:00
Bjarke Berg
a356584eb6 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/9623-external-login-token-store 
# Conflicts:
#	src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
 2021-03-16 09:14:05 +01:00
Bjarke Berg
55de69b647 Merge pull request #9961 from umbraco/netcore/feature/appsettings-local 
Allow for having appsettings.local.json
 2021-03-16 09:12:13 +01:00
Bjarke Berg
375609bc6e Update src/Umbraco.Web.UI.NetCore/appsettings.json 2021-03-16 08:05:33 +01:00
Bjarke Berg
c30f5084d7 Merge pull request #9937 from kjac/netcore/feature/content-and-media-services-without-static-events 
Remove static events from ContentService and MediaService
 2021-03-16 07:48:57 +01:00
Shannon
bd08adf2c7 Merge branch 'netcore/dev' of https://github.com/umbraco/Umbraco-CMS into netcore/dev 2021-03-16 17:23:55 +11:00
Shannon
e993410d2c Merge branch 'netcore/bug/minify-plugins' of https://github.com/kjac/Umbraco-CMS into kjac-netcore/bug/minify-plugins 
# Conflicts:
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
 2021-03-16 17:22:25 +11:00
Kenn Jacobsen
7593ddfaa8 Explicitly typed notifications instead of generic ones 2021-03-16 06:55:55 +01:00
Bjarke Berg
604cf69275 Merge pull request #9974 from umbraco/netcore/feature/migrate-cache-refresher-events-to-event-aggregator-pattern 
Netcore: Migrate cache refresher events to IEventAggregator pattern
 2021-03-16 06:44:26 +01:00
Kenn Jacobsen
2e8f5fef6a Fix typo 2021-03-15 18:36:13 +01:00
Bjarke Berg
ed5fffac0c Merge pull request #9922 from kjac/netcore/feature/remove-backofficeusermanager-static-events 
Replace static backoffice user manager events with IEventAggregator notifications
 2021-03-15 15:49:09 +01:00
Bjarke Berg
d8c7193eef Fixed issue with multiple threads reading the appSettings file at the same time, by locking (Found when site has to upgrade) 2021-03-15 15:00:58 +01:00
Bjarke Berg
f47298d2db Removed unused code 2021-03-15 15:00:01 +01:00
Warren Buckley
fa11a812a0 Fix karma.conf JS test for folder names to make UNIX tests pass 2021-03-15 13:41:14 +00:00
Bjarke Berg
b82ea437b7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/remove-backofficeusermanager-static-events 2021-03-15 14:35:46 +01:00
Bjarke Berg
64131f3de4 Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2021-03-15 11:17:46 +01:00
Bjarke Berg
4ad48321b9 Remove debugger break/launch 2021-03-15 11:17:23 +01:00
Emma Garland
b863e3f21d Merge branch 'netcore/dev' into netcore/members-roles-save 2021-03-15 10:12:28 +00:00
Emma Garland
4ae086bf20 Merge branch 'netcore/dev' into netcore/members-passwordchange-temp 2021-03-15 10:12:08 +00:00
Emma Garland
5c6b8fe2bc Added security logic previously added to PasswordChanger 2021-03-15 09:01:10 +00:00
Bjarke Berg
0374f6c2f5 Update src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs 
Co-authored-by: Shannon Deminick <sdeminick@gmail.com>
 2021-03-15 06:32:40 +01:00
Shannon Deminick
ada5599a83 Merge pull request #9839 from kjac/netcore/feature/minify-js-resources 
Do not apply runtime optimization to core scripts and script libraries
 2021-03-15 15:08:35 +11:00
Shannon
db863b3250 missing namespace after file split. 2021-03-15 13:45:09 +11:00
Shannon
4071df322a Adds missing null check on tagHelperOutput.TagName which can be null 2021-03-15 13:40:00 +11:00
Shannon
f03fc25b4c Splits into files, adds ICacheRefresherNotificationFactory, removes Init method 2021-03-15 13:39:34 +11:00
emmagarland
dccce92cb3 Updated the user and roles to throw exceptions instead of being caught, as per PR feedback 2021-03-14 15:14:53 +00:00
Bjarke Berg
86eb87a885 Clean up 2021-03-12 22:09:51 +01:00
Bjarke Berg
e77d2d58c2 Clean up 2021-03-12 22:03:30 +01:00
Bjarke Berg
abf11c2d62 Fixed issue with BackOfficeIdentity. Previews did not work, because we did not check for multiple identities on the priciple, after the move the pure ClaimsIdentity 2021-03-12 21:50:47 +01:00
Bjarke Berg
06a202e30e Migrated CacheRefresher events to IEventAggregator pattern. 2021-03-12 21:49:42 +01:00
Emma Garland
8535a2915c Changed wording, PR feedback 2021-03-12 15:21:56 +00:00
Emma Garland
9e867eeeef Changes as per PR comments from Scott Brady 2021-03-12 15:05:50 +00:00
Emma Garland
8ed67aa14a Merge branch 'netcore/members-passwordchange-temp' into netcore/members-roles-save 2021-03-12 14:39:24 +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
e20f73ba71 post merge fix 2021-03-12 13:10:55 +01:00
Bjarke Berg
b94cc517fc Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/9623-external-login-token-store 
# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
 2021-03-12 13:04:46 +01:00