merging 2.5.3 and 2.6.3 into develop #4338
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
…superdesk#4149)"" This reverts commit a3b16bb.
…ck alias (superdesk#4220) * [SDESK-6847] fix: Update moment and use newer timezone file for webpack alias * fix types after Moment changes
cherry pick and resolve conflicts for 505d424 - a part of it was lost - probably as a consequence of a bad merge
This reverts commit f8fa041.
* DST fix date calculations wrong * fix(ci): Use Node.js v14.x --------- Co-authored-by: Mark Pittaway <[email protected]>
when there is no editor instance, like from different instance or different window. SDNTB-814
…k#4300) * [TGA-45] Update IVocabulary interface with `selection_type` * fix(build): Update e2e/server/requirements.txt
* [SDAAP-92] Dynamicaly update the body_footer in editor3 * Add fireq.json
* fix auto tagging extension compile * fix labels * fix labels
|
seems like same test is failing on develop atm, so not an issue with those changes |
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.