yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,039 Commits 4 Branches 7 Tags
2b412f337c44fc0a6159593b2a807d01e194cecb
Commit Graph

34039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
1d11b78c32 fixing tests 2020-06-01 15:42:57 +10:00
Lee Kelleher
717bbf1e2e umb-notifications.html - refactored switch logic (#8207) 
* umb-notifications.html - refactored switch logic

I couldn't get the `url` property to render, so I've swapped out
the `ng-switch` statement with a couple of `ng-if` conditions.

* umb-notifications.html - changed quotes from single to double

For consistency.
 2020-05-30 22:02:26 +02:00
Warren Buckley
49c438b55f Merge pull request #7166 from umbraco/v8/feature/7133-do-not-paste-keys-in-nested-content 
NC keys: Do not copy keys for Nested Content (Fix for #7133)
 2020-05-29 15:18:46 +00:00
Warren Buckley
9713da5e92 Merge pull request #8177 from umbraco/v8/bugfix/nested-content-keys 
Adds in NC Property Component to deal with keys that were duplicated
 2020-05-29 14:45:34 +00:00
rbottema
f7cbac30b1 Fix HTML markup of umb-list-view-settings.html 
I've noticed this file was missing a closing div tag, so I added it.
 2020-05-29 14:43:23 +02:00
rbottema
c23b813036 Fix HTML markup of includeproperties.prevalues.html 
I've noticed this span was missing a closing >, so I added it.
 2020-05-29 14:42:20 +02:00
Jan Skovgaard
74a4d76983 umb-lightbox improvements (#8191) 2020-05-29 14:41:20 +02:00
BatJan
208df92fe0 Hide icons and add missing screen reader friendly texts 2020-05-29 14:40:18 +02:00
Steve Megson
33850b13d0 If GetControllerTypeInternal falls back to creating an instance, it should also release it (#8196) 2020-05-29 14:39:14 +02:00
Niels Lyngsø
180b858ff5 V8/bugfix/gulp update inline views on watch (#8200) 2020-05-29 14:09:20 +02:00
Bjarke Berg
58c70c3a90 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
 2020-05-29 13:02:27 +02:00
Bjarke Berg
dca04b3dd7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web/Models/Trees/MenuItemList.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Trees/RelationTypeTreeController.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2020-05-29 12:59:42 +02:00
Warren Buckley
b1d0cbf1d0 Remove the CSProj reference to missing test file in repo - until we get a chance to add it back in #8199 2020-05-29 09:30:34 +01:00
Bjarke Berg
441b83dae8 Merge pull request #8184 from umbraco/netcore/feature/move-more-controllers 
Netcore: Move more controllers
 2020-05-29 09:10:32 +02:00
Sebastiaan Janssen
71fbf2769a Merge branch 'v8/dev' into v8/contrib 2020-05-29 09:03:35 +02:00
Bjarke Berg
95e2262eb1 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Bugfix for ModelState.AddValidationError. Now using correct extension method 2020-05-29 08:29:39 +02:00
Bjarke Berg
878e5056b5 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Cleanup when using typefilters 2020-05-29 08:05:45 +02:00
Shannon
90e6dc0ad0 Merge branch 'netcore/feature/identity-temp' into netcore/feature/identity 2020-05-29 15:25:00 +10:00
Shannon
2565a626cb Fixes NC key replacement and adds tests 2020-05-29 13:01:56 +10:00
Warren Buckley
732d574ec2 Tidy up & better checking for NC JSON with JSONPath & SelectTokens() 
Less code duplication.
No need for Publishing event as Saving event is called before publishing
 2020-05-28 21:35:39 +01:00
Bjarke Berg
a7a9b8204e https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Build fix 2020-05-28 20:01:18 +02:00
Shannon
be84969ad7 removes comments/notes 2020-05-28 23:35:09 +10:00
Shannon
a9bf0572eb remove unneeded file 2020-05-28 23:31:48 +10:00
Shannon
0ed9d1bd91 renames to LegacyPasswordSecurity 2020-05-28 23:24:32 +10:00
Bjarke Berg
c3606b31ce https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Clean up and fixed issue with Ambiguous actions 2020-05-28 15:20:02 +02:00
Shannon
c1e891400d adds antiforgery tests 2020-05-28 23:19:31 +10:00
Warren Buckley
c81268995c Remove code duplication 2020-05-28 12:06:04 +01:00
Warren Buckley
c9ab2ca9ef Use InvariantEquals 2020-05-28 11:45:43 +01:00
Shannon
b456ed08f1 Fixes tests 2020-05-28 18:45:52 +10:00
Shannon
9904dc6cc2 Merge commit '6dcaa986cda8c8bbca06df8030299d5901d31ceb' into netcore/feature/identity-temp 2020-05-28 17:29:35 +10:00
Claus
ff30a27697 adding missing nullchecks. 2020-05-28 08:41:32 +02:00
Bjarke Berg
1034e980b5 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved TemplateController 2020-05-28 07:59:36 +02:00
Bjarke Berg
956252f82d https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved StylesheetController 2020-05-28 07:50:56 +02:00
Bjarke Berg
49923cef5e https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved RelationTypeController 2020-05-28 07:28:46 +02:00
Bjarke Berg
b67bff94a5 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved RelationController 2020-05-28 07:20:06 +02:00
Bjarke Berg
0dbf182d97 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved PublishedStatusController amd RedirectUrlManagementController 2020-05-28 07:19:45 +02:00
Warren Buckley
9df6a8bd6a Bugfix: Adds new confirmation email marketing step (#8091) 2020-05-27 16:59:15 +02:00
Enkel Media
f2ad7bb631 Fixes #8004 umbnodepreview setting contentType alias to null (#8109) 2020-05-27 14:39:03 +02:00
Bjarke Berg
00b7c2d13b https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved PublishedSnapshotCacheStatusController 2020-05-27 14:14:32 +02:00
Bjarke Berg
0108db553c https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Removed OnlyLocalRequestsAttribute from Umbraco.Web 2020-05-27 13:31:18 +02:00
Bjarke Berg
3e238e92da Merge remote-tracking branch 'origin/netcore/feature/move-more-controllers' into netcore/feature/move-more-controllers 
# Conflicts:
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2020-05-27 12:39:29 +02:00
Bjarke Berg
bfff08e98e https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Build fix 2020-05-27 12:38:53 +02:00
Bjarke Berg
10e66f04f2 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved PackageInstallController + Handled the fileupload in a new (aspnet core) way. So no need to clean up from a temp location anymore as we read from the stream. 2020-05-27 12:17:46 +02:00
Warren Buckley
16a8a08df9 Merge remote-tracking branch 'origin/v8/feature/7133-do-not-paste-keys-in-nested-content' into v8/bugfix/nested-content-keys 2020-05-27 10:41:39 +01:00
Niels Lyngsø
23fb9a2b58 inject LocalStorageModel 2020-05-27 11:14:30 +02:00
Shannon
f323c67dff remove note 2020-05-27 18:51:47 +10:00
Shannon
1cfc490751 More signinmanager, signin now works and we set the user principal in the correct place on login 2020-05-27 18:27:49 +10:00
Bjarke Berg
31dc9b079b https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved PackageController and added VersionConverter on AngularJsonMediaTypeFormatter, instead of having single attribute only used for PackageController 2020-05-27 08:30:00 +02:00
Bjarke Berg
8de3551166 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved KeepAliveController to backoffice url 2020-05-27 08:19:48 +02:00
Shannon
e47f81efdc Gettting password formats and hashing sorted, ensuring the password format on the user is used 2020-05-27 13:48:26 +10:00