Merge upstream changes from 4.0 #2384
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
* API : Fix issues with access and refresh tokens cache. xibosignage/xibo#3231 * Schedule : Fix autofocus on layout / campaign select2 dropdown. * Dashboards : Fix permissions check on Media Manager page. xibosignage/xibo#3263
* Layout import : Fix importing elements with images. xibosignage/xibo#3262 * Image : use upsize constraint
* Layout: improve thumbnails for Canvas regions. Ensure thumbnail is taken on publish. xibosignage/xibo#3248 * Menu board: always format fractional digits xibosignageltd/xibo-private#542 * Bump to 4.0.6 * User: fix null homepage error xibosignage/xibo#3264 * XMDS: fault should trim too long reason xibosignage/xibo#3230 * Ad Campaign: impressions target type too long xibosignage/xibo#3235
* MediaManager : Fix PHP warning * MediaManager : Fix typo in unused media datatable when no records are returned * Media Factory : Exclude formula columns with library image from the unused media filter.
* Rich text paste not working relates to xibosignage/xibo#3265 * Schedule: Agenda view time box appears over event form relates to xibosignage/xibo#3227 * Schedule: Agenda view does not update without a manual refresh relates to xibosignage/xibo#3228
…ibosignage#2276) * Stocks Symbol: Fix stock symbol autosuggestion for elements and static relates to xibosignageltd/xibo-private#572 * Stocks Symbol: Fix returned stock results data when from cache relates to xibosignageltd/xibo-private#572 * Stocks Symbol: PR refactor with fix on individual stock symbol cacheKey and autosuggestion relates to xibosignageltd/xibo-private#572
* Display : Cannot change selected versionMediaId if download window override is set relates to xibosignage/xibo#3258 * Countdown text template: Text colour label corrected relates to xibosignage/xibo#3226 * Layer Control: Show multi-selected items relates to xibosignageltd/xibo-private#579 * Editor viewer Info bar: Elements and regions names not updating relates to xibosignage/xibo#3282
* Elements Data message stays on element even after data is returned relates to xibosignage/xibo#3285 * Element group - Delete is broken relates to xibosignage/xibo#3287
…#2287) * PlayerJS: Refactor with access to widget for each canvas relates to xibosignageltd/xibo-private#567 * PlayerJS: Replace player.js with xibo-player.js relates to xibosignageltd/xibo-private#567
* SSP: always send isAdspaceEnabled in register. xibosignage/xibo#3267 * Widget Sync: library images were not correctly added to the display_media table. DataSet static: missing calls to xiboImageRender. Xibo Image Render: only refreshes once. fixes xibosignage/xibo#3272
relates to xibosignage/xibo#3277 - Schedule duplicated cog also fixed
* Remove console.log from xiboIC relates to xibosignageltd/xibo-private#608 * Package Lock with node 12
* Percentage replacements in code editor break CSS rules relates to xibosignageltd/xibo-private#613 * Marquee templates: No Data message doesn't show relates to xibosignageltd/xibo-private#612
* JavaScript: ignore [0] references as they cannot be library references. * Widget: calculatedDuration incorrect for currencies and stocks. * Widget: HTML should contain the duration according to whether use duration is set. relates to xibosignageltd/xibo-private#615
…nts, and dataset date column format (xibosignage#2363) relates to xibosignageltd/xibo-private#606
PlayerJS: fix for duration for xiboElementsRender (not being set on elements) PlayerJS: fix for lock interactions not being called.
…sed correctly (xibosignage#2366) * PlayerJS: remove onTemplateData load as unnecessary. * Modules: remove old onDataError * PlayerJS: call expire now on static widgets where data is not ready relates to xibosignageltd/xibo-private#611
… a playlist (xibosignage#2367) relates to xibosignage/xibo#3333
xibosignage#2368) * PlayerJS: delay the expiry by 1500ms to prevent race conditions. relates to xibosignageltd/xibo-private#611 * Layout Editor: undefined variables in main.js.
* Turn No Data message into a rich text input relates to xibosignageltd/xibo-private#612 * Add to Groups fails for stencil groups relates to xibosignageltd/xibo-private#618 * Removal of rougue variable relates to xibosignageltd/xibo-private#618
* Release prep: 4.0.7 - bump version - update POT file - update swagger.json - import translations
…ons if we resize the widget after configuring it. (xibosignage#2371)
* PlayerJS: Fix pin slot relates to xibosignageltd/xibo-private#606 * PlayerJS: Fix non-pinned slots for repeat data filling relates to xibosignageltd/xibo-private#606
* Elements: Run animations through onTemplateVisible when window is visible relates to xibosignage/xibo#3339 * Elements: PR clean up relates to xibosignage/xibo-cms#3339
relates to xibosignageltd/xibo-private#627 - Updated select2 - Add common method to clear container - Clear flatpickr, colorpicker, select2, masonry and CKEditor - ESLint new line tidying
* Analogue World Clock: Mini digital clock text overflow relates to xibosignageltd/xibo-private#625 * Layout Editor: Paste on code input doesn't trigger save relates to xibosignage/xibo#3338 * Monthly calendar template: Broken header on resize relates to xibosignageltd/xibo-private#632 * Grouping Element: elements shown as detached from the group relates to xibosignageltd/xibo-private#622 * Widget: PDF widget starts before its visible relates to xibosignage/xibo#3340 * Select2 UI is broken after upgrade relates to xibosignageltd/xibo-private#633
* Sync Schedule : Fix duplicate button. Fixes xibosignage/xibo#3337 * Required Files : Fix issue with emptyLayout modifiedDt. Fixes xibosignage/xibo#3346 * Commands : Fix name and code filtering. Fixes xibosignage/xibo#3335 * Schedule : Additional validation when changing event type on edit form. Fixes xibosignage/xibo#3334 * Schedule : Fix deprecation notice on Carbon createFromTimestamp with null value.
…develop # Conflicts: # lib/Helper/Environment.php # modules/src/player-bundle.js # package-lock.json # package.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.