Merge 4.1.0 into kopff #2724
Merged
Merge 4.1.0 into kopff #2724
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
…g, because they are applied templates and the parent tags win. (#2664) fixes xibosignageltd/xibo-private#811
…#2667) * XLR: Fixing slow preview caused by multiple unnecessary network calls relates to xibosigangeltd/xibo-private#816 * XLR: Fix for slow preview
relates to xibosignage/xibo#3458 * Added message in the Edit DataSet Form to inform users if it has no columns configured. * Added message in the Edit DataSet Form to inform users if it has no remote columns configured for Remote DataSets. * Prevented importing if the DataSet has no columns configured. * Prevented remote importing if the DataSet has no remote columns configured.
…e uploads (#2662) relates to xibosignage/xibo#3456
* XLR: Fix layout preview background relates to xibosignageltd/xibo-private#824 * XLR: Fix layout preview background relates to xibosignageltd/xibo-private#824
Ensure we record page/method as early as possible, adding in user/session later. fixes xibosignageltd/xibo-private#825
…mber values (#2696) relates to xibosignage/xibo#3404
…laced at runtime on the player (#2697) relates to xibosignage/xibo#3463
* XLR: Fixing elements render on android * Layout Preview: XLR Fix for rendering elements on android relates to xibosignageltd/xibo-private#810 * Layout Preview: XLR Fix - PR clean up * Layout Preview: XLR Fix - Hash update relates to xibosignageltd/xibo-private#810
…ignments on dynamic playlists (#2711)
…e_410 # Conflicts: # package-lock.json
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.
No description provided.