Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes into OwainJ fork #1

Merged
merged 120 commits into from
Oct 19, 2020
Merged

Conversation

OwainJ
Copy link
Owner

@OwainJ OwainJ commented Oct 19, 2020

Prerequisites

  • I have added steps to test this contribution in the description below

If there's an existing issue for this PR then this fixes

Description

Shazwazza and others added 30 commits May 6, 2020 18:53
…lidates some logic into ext methods and constants
…upport external href, streamlines external login provider configs
…n external logout get redirect for external logins.
…e must do that due to the user groups being pre-determined.
…tore additional user data with the provider info and adds tests.
… default behavior including what is rendered in the back office, this is for max flexibility
Brynjólfur Gunnarsson and others added 29 commits October 6, 2020 07:45
* Conver i to new umb-icon directive

* Extend directive to accept css class modifiers

* Add "scoped" styling for the directive to avoid issues with CSS modifiers when used in other contexts
* Change search to use umb-search-filter

* Fix minor issues in main directive and styling issues with width
* feat: add svg icons to umb-tree-item and umb-tree-search-box

* refactor: remove unnessesary aria-hidden from umb-tree-icon

* refactor: remove aria hidden from umb-tree-search-box icon
)

* Switch to the umb-search-filter directive

* Add css class

* Fix styling after directive changes have been merged
Remove references to the deprecated TemplateUtilities.
* Show badge in user state filter similar to loglevel filter

* Add icons for user group filter
…address accessibility issues (#8198)"

This reverts commit 1cd79d8.

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
…ed a UDI. Trying to convert to an int will fail for Udis with an InvalidCastException.
* Added documentation for umbControlGroup directive

* Adding period to each umbControlGroup param description
@OwainJ OwainJ merged commit 12a97d0 into OwainJ:v8/contrib Oct 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.