Merge master into develop & Set version to 1.2.0-develop #14656
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
…hread (#14311) [FIX] Remove reference to inexistent field when deleting message in thread
* removed quote option from message options * modifications to show discussion name instead of the id when removing the user * Revert "removed quote option from message options" This reverts commit 2078abd. * modifications for implementing * liniting fixes
i18n: Update German strings
* fix * renamed method
Release 1.0.2
* [FIX] New day separator overlapping above system message (#14362) * Improve German translations (#14351) * Use the plural for discussions-section in side panel * Formal and informal translations for 1.0 * fix german typos * [FIX] Main thread title on replies (#14372) * fix * fix test * fix setting * Update tests/pageobjects/main-content.page.js Co-Authored-By: ggazzo <guilhermegazzo@gmail.com> * Update app/ui-utils/client/lib/RoomHistoryManager.js Co-Authored-By: ggazzo <guilhermegazzo@gmail.com> * [FIX] Bell was too small on threads (#14394) * [FIX] Messages on threads disappearing (#14393) * fix subscription-changed updating all messages(#14391) * Fix: Message body was not being updated when user disabled nrr message (#14390) * [NEW] Allow change Discussion's properties (#14389) * [FIX] Unnecessary meteor.defer on openRoom (#14396) * [FIX] more message actions to threads context(follow, unfollow, copy, delete) (#14387) * added more message actions to threads context * more actions * change token name (#14379) * [FIX] Pressing Enter in User Search field at channel causes reload (#14388) * Prevent default on enter in User search * Prevent form submission in membersList * If using subpath make sure streams use that also for multi-instance. Fixes #13200 (#14376) * Revert "[IMPROVE] Use SessionId for credential token in SAML request (#13791)" (#14345) This reverts commit 3967a74. * Add fallback to mongo version that doesn't require clusterMonitor role (#14403) * [FIX] Users actions in administration were returning error (#14400) * Fix actions collapse into popup in userInfo * Refactor userActions * [FIX] Error 400 on send a reply to an old thread (#14402) * fix error 400 on send a reply to an old thread * ignoring properly hidden messages * [FIX] Messages on thread panel were receiving wrong context/subscription (#14404) * [FIX] preview pdf its not working (#14419) * [FIX] renderMessageBody was caching messages in wrong scenarios #14420 * LingoHub Update 🚀 (#14426) Manual push by LingoHub User: Diego Sampaio. Project: Rocket.Chat Made with ❤️ by https://lingohub.com * [FIX] Mentions message missing 'jump to message' action (#14430) * fixed context * threads context * [FIX] Escape unrecognized slash command message (#14432) * Add missing german translations (#14386) * [FIX] IE11 support (#14422) * Add symlinks to ES6 node_modules imports * Add URL polyfill for IE11 * Fix thread replies for IE11 * [IMPROVE] allow users to skip activeUsers to be ready (#14431) * allow users to skip activeUsers to be ready * Update main.js * Update app/ui-master/client/main.js Co-Authored-By: ggazzo <guilhermegazzo@gmail.com> * [IMPROVE] Don't use regex to find users (#14397) * Don't use regex to find users * Invert logic on model methods * Escape username regex * Find users in batch * Use only normalizeMessagesForUser * Don't ignore username case to get owners on graphql * Fixes on DAU and MAU aggregations (#14418) * Fixes on SAU and MAU aggregations * Report new data from DAU/MAU * Run tests agains a mongodb container in CI * Try to run CI correctly * Fix drop database * Parse desktop app User Agent correctly * Fix aggregation of past sessions * Return past month today * Fix bug * Add migration * Fixed migration * Migration improvements * Fix crowd sync by using correct logging method (#14405) * Fix room names in user info dialogs (#14415) * Fix discussion name being invalid (#14442) Closes #14378 * Fix i18n files keys sort (#14433) * Add script to normalize i18n files * Fix i18n files * Set as official script * Update package-lock.json * fix (#14443) * Update threads.css * Bump version to 1.0.3 * regen changelog
ggazzo
approved these changes
May 28, 2019
Merged
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.