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

10553 Commits

Author SHA1 Message Date
Bjarke Berg
833ff5ab56 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-18 14:43:00 +02:00
Bjarke Berg
6d30f31134 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-18 14:41:40 +02:00
Warren Buckley
d4c464c123 Remove duplicate comment 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
 2020-06-17 13:38:24 +01:00
Warren Buckley
d7cd52161f Fix SkipStep in tour directive was looking at wrong DOM selector it needs to be skipStepIfVisible 2020-06-17 13:37:40 +01:00
Bjarke Berg
918e7f1be3 Merge branch 'netcore/dev' into netcore/netcore 2020-06-11 15:17:42 +02:00
Bjarke Berg
d77c3dc8dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-11 15:16:39 +02:00
Kenn Jacobsen
ae993519ce Fix radio button checked appearance 2020-06-10 21:14:07 +02:00
Bjarke Berg
9f17049582 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/websecurity 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2020-06-10 11:13:32 +02:00
Claus
c4e465ce1f Merge pull request #8175 from kjac/v8/fix/checkbox-background-glitch 
Fix glitch in umb-checkbox background
 2020-06-09 14:26:27 +02:00
Warren Buckley
e82f504658 Adds skipStepIfVisible property to JSON Tour Steps to allow skipping if DOM item is present (#8235) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2020-06-09 08:55:06 +02:00
Bjarke Berg
354225452a Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-05 08:14:23 +02:00
Bjarke Berg
58d7fc1817 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
 2020-06-05 08:05:50 +02:00
Shannon
7ac01fc02f Merge branch 'netcore/netcore' into netcore/feature/websecurity 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs
 2020-06-03 13:26:40 +10:00
Shannon Deminick
a7a463c7d4 Merge pull request #8183 from umbraco/netcore/feature/identity 
Back office identity changes and cookie authentication
 2020-06-03 12:55:57 +10:00
Shannon
6c59f26c83 Ensures the required ajax headers are sent up in the back office, adds notes. 2020-06-03 11:20:53 +10:00
Claus
c22f6f51d1 Merge pull request #8218 from umbraco/v8/bugfix/clipboard-typofix 
Fix up typo for clipboardService.registrerClearPropertyResolver & mark incorrect as deprecated
 2020-06-02 13:28:58 +02:00
Sebastiaan Janssen
9829d4abef Merge branch 'v8/dev' into v8/contrib 2020-06-02 11:41:09 +02:00
Warren Buckley
4d497053a3 Fix up typos & mark incorrect as deprecated 2020-06-02 09:08:43 +01: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
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
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
Sebastiaan Janssen
71fbf2769a Merge branch 'v8/dev' into v8/contrib 2020-05-29 09:03:35 +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
Niels Lyngsø
23fb9a2b58 inject LocalStorageModel 2020-05-27 11:14:30 +02:00
BatJan
30900c59ae Add disable-dirty-check option 2020-05-26 18:18:31 +02:00
BatJan
62b0886afe Fix label alignment 2020-05-26 18:17:01 +02:00
Jan Skovgaard
14ad2bd27c Convert span to button, add missing label, hide icons for screen readers (#8011) 2020-05-26 18:15:18 +02:00
Jan Skovgaard
cc04a1c8fe Content templates dashboard: Add translations and move styles external (#6888) 2020-05-26 18:01:17 +02:00
Jan Skovgaard
32a0c3b075 "Actions" drop down options do not give context to the user (#6301) 2020-05-26 17:45:39 +02:00
Sebastiaan Janssen
78a7785256 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2020-05-26 16:27:09 +02:00
Rachel Breeze
6da69f1e42 V8: Accessibility changes for login screen (#5800) 2020-05-26 15:34:30 +02:00
Rachel Breeze
e2604103a3 v8: Accessibility Create User Page Title (#7104) 2020-05-26 15:10:16 +02:00
Rachel Breeze
b80dfbf5fc Fix for tiny MCE when language is en-US (#8002) 2020-05-26 15:01:50 +02:00
Rachel Breeze
5541d13020 V8: Accessibility Changes For umbEditorHeader Directive (edit user) (#7102) 2020-05-26 14:59:33 +02:00
Rachel Breeze
c3c98e2621 v8: Fix for login screen title display (#7412) 2020-05-26 14:04:06 +02:00
Niels Lyngsø
220278a322 abstracting property clearing, so each property editor can registrer their own clear property resolvers. 2020-05-26 13:48:26 +02:00
Kenn Jacobsen
f1986c0f75 Fix glitch in umb-checkbox background 2020-05-26 12:29:14 +02:00
Niels Lyngsø
1227a3b4ae Merge remote-tracking branch 'origin/v8/dev' into v8/feature/7133-do-not-paste-keys-in-nested-content 2020-05-26 11:08:24 +02:00
Shannon
3c23561f00 moves image files to where they're supposed to be 2020-05-26 18:20:34 +10:00
Marc Goodson
41ac96d69d Fix HasValue and IsValue for Dropdown Property Types with no Values (#8154) 2020-05-26 09:45:57 +02:00
Lee Kelleher
4c16421cbb Update umb-button.html (#8145) 
Noticed the missing closing bracket on the `<button>`
 2020-05-23 17:15:42 +02:00
Daniël Knippers
392d74f80d Added support for segments to File Uploads (#8070) 2020-05-19 17:04:23 +02:00
Bjarke Berg
5e131ebafb Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-05-18 11:51:55 +02:00