Merging latest version to my repo #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit af63c6f)
* Change a to button * Fix styling issues after button conversion
[SpecialDbType(SpecialDbTypes.NVARCHARMAX)]
(cherry picked from commit ed59b22)
This reverts commit 47dc631.
# Conflicts: # src/SolutionInfo.cs # src/Umbraco.Web.UI.Client/package.json # src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js # src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js # src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html # src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js # src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html # src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js # src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html # src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html # src/Umbraco.Web.UI.Client/src/views/logviewer/search.html # src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js # src/Umbraco.Web.UI.Client/src/views/packages/edit.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# Conflicts: # src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
(cherry picked from commit a542bd4)
…here two properties on each culture has same alias
…here two properties on each culture has same alias (cherry picked from commit 124415e)
Merge pull request #8803 from BatJan/feature/itempicker-fix-semantics
Adding `display: none;` prevents `ng-show` from working
…utomatically (cherry picked from commit 59f90bd)
(cherry picked from commit 4ecbb7a)
…ut-description fixes 8924, Always clear both
…abelblock use block.edit()
…s-sign Review 8839 use icon for plus sign
* Add polling function to logviewer * float the sub buttons right
I'm not sure you need to restate the version here, having got it specified in the list above, but if you do, then a vanilla 2017 won't build the source because of the c#8 stuff introduced recently.
…k-value-for-umb-button-type' into v8/8.9
… of umb-icon (cherry picked from commit 1107e5d)
# Conflicts: # src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
# Conflicts: # src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prerequisites
If there's an existing issue for this PR then this fixes
Description