diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index f9056ace94a6..892f79e6f977 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 -ENV RC_VERSION 3.3.0 +ENV RC_VERSION 3.3.1 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index cabb2bee4a24..ce82d2eca0bc 100644 --- a/.github/history.json +++ b/.github/history.json @@ -44998,6 +44998,121 @@ ] } ] + }, + "3.3.1": { + "node_version": "12.16.1", + "npm_version": "6.14.0", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "17860", + "title": "[FIX] SAML LogoutRequest sending wrong NameID", + "userLogin": "pierre-lehnen-rc", + "milestone": "3.3.1", + "contributors": [ + "pierre-lehnen-rc" + ] + }, + { + "pr": "17853", + "title": "[FIX] Logic for room type was inverted on Admin panel (#17851)", + "userLogin": "cking-vonix", + "description": "Fixed logic for public/private room types on room edit panel", + "milestone": "3.3.1", + "contributors": [ + "cking-vonix" + ] + }, + { + "pr": "17843", + "title": "[FIX] Omnichannel message link is broken in email notifications", + "userLogin": "renatobecker", + "milestone": "3.3.1", + "contributors": [ + "renatobecker" + ] + }, + { + "pr": "17836", + "title": "[FIX] Administration User page blank opening users without email", + "userLogin": "mariaeduardacunha", + "milestone": "3.3.1", + "contributors": [ + "mariaeduardacunha" + ] + }, + { + "pr": "17827", + "title": "[FIX] Apps room events losing data", + "userLogin": "d-gubert", + "milestone": "3.3.1", + "contributors": [ + "d-gubert" + ] + }, + { + "pr": "17826", + "title": "[REGRESSION] Omnichannel visitor forward was applying wrong restrictions", + "userLogin": "MarcosSpessatto", + "milestone": "3.3.1", + "contributors": [ + "MarcosSpessatto", + "web-flow" + ] + }, + { + "pr": "17809", + "title": "Fix the update check not working", + "userLogin": "graywolf336", + "milestone": "3.3.1", + "contributors": [ + "graywolf336", + "geekgonecrazy", + "web-flow" + ] + }, + { + "pr": "17804", + "title": "Update Apps-Engine version", + "userLogin": "d-gubert", + "description": "Update Apps-Engine version", + "milestone": "3.3.1", + "contributors": [ + "d-gubert" + ] + }, + { + "pr": "17803", + "title": "[FIX] Email link \"go to message\" being incorrectly escaped", + "userLogin": "sampaiodiego", + "milestone": "3.3.1", + "contributors": [ + "sampaiodiego" + ] + }, + { + "pr": "17789", + "title": "[FIX] Error when re-installing an App", + "userLogin": "d-gubert", + "milestone": "3.3.1", + "contributors": [ + "d-gubert" + ] + }, + { + "pr": "17776", + "title": "[FIX] Slack importer settings object", + "userLogin": "lpilz", + "milestone": "3.3.1", + "contributors": [ + "lpilz" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index 3e66b3f64ce1..2d2d4bfcf20e 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.3.0/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.3.1/download/" -o rocket.chat.tgz tar xf rocket.chat.tgz --strip 1 diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml index 56a25a036453..3c64c47226c9 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.3.0 +version: 3.3.1 summary: Rocket.Chat server description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/ confinement: strict diff --git a/HISTORY.md b/HISTORY.md index 040ce3485de7..d2cedaf9b90c 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,63 @@ +# 3.3.1 +`2020-06-10 ยท 8 ๐Ÿ› ยท 3 ๐Ÿ” ยท 10 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `12.16.1` +- NPM: `6.14.0` +- MongoDB: `3.4, 3.6, 4.0` + +### ๐Ÿ› Bug fixes + + +- SAML LogoutRequest sending wrong NameID ([#17860](https://github.com/RocketChat/Rocket.Chat/pull/17860)) + +- Logic for room type was inverted on Admin panel (#17851) ([#17853](https://github.com/RocketChat/Rocket.Chat/pull/17853) by [@cking-vonix](https://github.com/cking-vonix)) + + Fixed logic for public/private room types on room edit panel + +- Omnichannel message link is broken in email notifications ([#17843](https://github.com/RocketChat/Rocket.Chat/pull/17843)) + +- Administration User page blank opening users without email ([#17836](https://github.com/RocketChat/Rocket.Chat/pull/17836)) + +- Apps room events losing data ([#17827](https://github.com/RocketChat/Rocket.Chat/pull/17827)) + +- Email link "go to message" being incorrectly escaped ([#17803](https://github.com/RocketChat/Rocket.Chat/pull/17803)) + +- Error when re-installing an App ([#17789](https://github.com/RocketChat/Rocket.Chat/pull/17789)) + +- Slack importer settings object ([#17776](https://github.com/RocketChat/Rocket.Chat/pull/17776) by [@lpilz](https://github.com/lpilz)) + +
+๐Ÿ” Minor changes + + +- [REGRESSION] Omnichannel visitor forward was applying wrong restrictions ([#17826](https://github.com/RocketChat/Rocket.Chat/pull/17826)) + +- Fix the update check not working ([#17809](https://github.com/RocketChat/Rocket.Chat/pull/17809)) + +- Update Apps-Engine version ([#17804](https://github.com/RocketChat/Rocket.Chat/pull/17804)) + + Update Apps-Engine version + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ + +- [@cking-vonix](https://github.com/cking-vonix) +- [@lpilz](https://github.com/lpilz) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@MarcosSpessatto](https://github.com/MarcosSpessatto) +- [@d-gubert](https://github.com/d-gubert) +- [@geekgonecrazy](https://github.com/geekgonecrazy) +- [@graywolf336](https://github.com/graywolf336) +- [@mariaeduardacunha](https://github.com/mariaeduardacunha) +- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) +- [@renatobecker](https://github.com/renatobecker) +- [@sampaiodiego](https://github.com/sampaiodiego) + # 3.3.0 `2020-05-27 ยท 20 ๐ŸŽ‰ ยท 8 ๐Ÿš€ ยท 41 ๐Ÿ› ยท 45 ๐Ÿ” ยท 37 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` @@ -51,7 +110,7 @@ - Screen Lock settings - mobile client ([#17523](https://github.com/RocketChat/Rocket.Chat/pull/17523)) -- Rewrite admin pages ([#17388](https://github.com/RocketChat/Rocket.Chat/pull/17388) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Rewrite admin pages ([#17388](https://github.com/RocketChat/Rocket.Chat/pull/17388)) - Allow filtering Omnichannel analytics dashboards by department ([#17463](https://github.com/RocketChat/Rocket.Chat/pull/17463)) @@ -85,7 +144,7 @@ - Missing dropdown to select custom status color on user's profile ([#16537](https://github.com/RocketChat/Rocket.Chat/pull/16537) by [@ritwizsinha](https://github.com/ritwizsinha)) -- Password reset/change accepting current password as new password ([#16331](https://github.com/RocketChat/Rocket.Chat/pull/16331) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Password reset/change accepting current password as new password ([#16331](https://github.com/RocketChat/Rocket.Chat/pull/16331)) - Can't click on room's actions menu of sidebar list when in search mode ([#16548](https://github.com/RocketChat/Rocket.Chat/pull/16548) by [@ritvikjain99](https://github.com/ritvikjain99)) @@ -93,7 +152,7 @@ - Elements of "Personal Access Tokens" section out of alignment and unusable on very small screens ([#17129](https://github.com/RocketChat/Rocket.Chat/pull/17129) by [@Nikhil713](https://github.com/Nikhil713)) -- Allow owners to react inside broadcast channels ([#17687](https://github.com/RocketChat/Rocket.Chat/pull/17687) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Allow owners to react inside broadcast channels ([#17687](https://github.com/RocketChat/Rocket.Chat/pull/17687)) - Default filters on Omnichannel Current Chats screen not showing on first load ([#17522](https://github.com/RocketChat/Rocket.Chat/pull/17522)) @@ -150,7 +209,7 @@ - Replace postcss Meteor package ([#15929](https://github.com/RocketChat/Rocket.Chat/pull/15929)) -- Increasing highlight time in 3 seconds ([#17540](https://github.com/RocketChat/Rocket.Chat/pull/17540) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Increasing highlight time in 3 seconds ([#17540](https://github.com/RocketChat/Rocket.Chat/pull/17540)) - Remove deprecated Omnichannel Knowledge Base feature ([#17387](https://github.com/RocketChat/Rocket.Chat/pull/17387)) @@ -180,7 +239,7 @@ - Update Fuselage version ([#17708](https://github.com/RocketChat/Rocket.Chat/pull/17708)) -- Regression: Status presence color ([#17707](https://github.com/RocketChat/Rocket.Chat/pull/17707) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Regression: Status presence color ([#17707](https://github.com/RocketChat/Rocket.Chat/pull/17707)) - Improve: Remove index files from action-links, accounts and assets ([#17607](https://github.com/RocketChat/Rocket.Chat/pull/17607)) @@ -256,13 +315,13 @@ - Regression: Scroll on admin user info ([#17711](https://github.com/RocketChat/Rocket.Chat/pull/17711)) -- Regression: Removed status border on mentions list ([#17741](https://github.com/RocketChat/Rocket.Chat/pull/17741) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Regression: Removed status border on mentions list ([#17741](https://github.com/RocketChat/Rocket.Chat/pull/17741)) -- Regression: Force unread-rooms bar to appears over the room list ([#17728](https://github.com/RocketChat/Rocket.Chat/pull/17728) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Regression: Force unread-rooms bar to appears over the room list ([#17728](https://github.com/RocketChat/Rocket.Chat/pull/17728)) -- Regression: Fix Unread bar design ([#17750](https://github.com/RocketChat/Rocket.Chat/pull/17750)) +- Regression: Fix Unread bar design ([#17750](https://github.com/RocketChat/Rocket.Chat/pull/17750) by [@dudizilla](https://github.com/dudizilla)) -- Regression: Adjusting spaces between OAuth login buttons ([#17745](https://github.com/RocketChat/Rocket.Chat/pull/17745)) +- Regression: Adjusting spaces between OAuth login buttons ([#17745](https://github.com/RocketChat/Rocket.Chat/pull/17745) by [@dudizilla](https://github.com/dudizilla)) @@ -270,15 +329,14 @@ - [@Nikhil713](https://github.com/Nikhil713) - [@TaimurAzhar](https://github.com/TaimurAzhar) -- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@dependabot[bot]](https://github.com/dependabot[bot]) +- [@dudizilla](https://github.com/dudizilla) - [@fbartels](https://github.com/fbartels) - [@huzaifahj](https://github.com/huzaifahj) - [@juzser](https://github.com/juzser) - [@kolorafa](https://github.com/kolorafa) - [@lpilz](https://github.com/lpilz) - [@machester4](https://github.com/machester4) -- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@ocanema](https://github.com/ocanema) - [@qwertiko](https://github.com/qwertiko) - [@regalstreak](https://github.com/regalstreak) @@ -293,14 +351,15 @@ - [@MarcosSpessatto](https://github.com/MarcosSpessatto) - [@MartinSchoeler](https://github.com/MartinSchoeler) +- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@d-gubert](https://github.com/d-gubert) - [@djorkaeffalexandre](https://github.com/djorkaeffalexandre) -- [@dudizilla](https://github.com/dudizilla) - [@engelgabriel](https://github.com/engelgabriel) - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) - [@lolimay](https://github.com/lolimay) +- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@mtmr0x](https://github.com/mtmr0x) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) @@ -447,7 +506,7 @@ - Filter markdown in notifications ([#9995](https://github.com/RocketChat/Rocket.Chat/pull/9995) by [@c0dzilla](https://github.com/c0dzilla)) -- User gets UI feedback when message is pinned or unpinned ([#16056](https://github.com/RocketChat/Rocket.Chat/pull/16056) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- User gets UI feedback when message is pinned or unpinned ([#16056](https://github.com/RocketChat/Rocket.Chat/pull/16056)) - Add `file-title` and `file-desc` as new filter tag options on message search ([#16858](https://github.com/RocketChat/Rocket.Chat/pull/16858) by [@subham103](https://github.com/subham103)) @@ -484,7 +543,7 @@ - "Invalid Invite" message when registration is disabled ([#17226](https://github.com/RocketChat/Rocket.Chat/pull/17226)) -- Red color error outline is not removed after password update on profile details ([#16536](https://github.com/RocketChat/Rocket.Chat/pull/16536) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Red color error outline is not removed after password update on profile details ([#16536](https://github.com/RocketChat/Rocket.Chat/pull/16536)) - Change wording to start DM from info panel ([#8799](https://github.com/RocketChat/Rocket.Chat/pull/8799)) @@ -502,17 +561,17 @@ - Variable rendering problem on Import recent history page ([#15997](https://github.com/RocketChat/Rocket.Chat/pull/15997) by [@ritwizsinha](https://github.com/ritwizsinha)) -- Admin panel custom sounds, multiple sound playback fix and added single play/pause button ([#16215](https://github.com/RocketChat/Rocket.Chat/pull/16215) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Admin panel custom sounds, multiple sound playback fix and added single play/pause button ([#16215](https://github.com/RocketChat/Rocket.Chat/pull/16215)) - Discussions created from inside DMs were not working and some errors accessing recently created rooms ([#17282](https://github.com/RocketChat/Rocket.Chat/pull/17282)) - Translation for nl ([#16742](https://github.com/RocketChat/Rocket.Chat/pull/16742) by [@CC007](https://github.com/CC007)) -- No maxlength(120) defined for custom user status ([#16534](https://github.com/RocketChat/Rocket.Chat/pull/16534) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- No maxlength(120) defined for custom user status ([#16534](https://github.com/RocketChat/Rocket.Chat/pull/16534)) -- Fixed email sort button in directory -> users ([#16606](https://github.com/RocketChat/Rocket.Chat/pull/16606) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Fixed email sort button in directory -> users ([#16606](https://github.com/RocketChat/Rocket.Chat/pull/16606)) -- In Create a New Channel, input should be focused on channel name instead of invite users ([#16405](https://github.com/RocketChat/Rocket.Chat/pull/16405) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- In Create a New Channel, input should be focused on channel name instead of invite users ([#16405](https://github.com/RocketChat/Rocket.Chat/pull/16405)) - Email not verified message ([#16236](https://github.com/RocketChat/Rocket.Chat/pull/16236)) @@ -586,7 +645,6 @@ - [@Nikhil713](https://github.com/Nikhil713) - [@RavenSystem](https://github.com/RavenSystem) - [@aKn1ghtOut](https://github.com/aKn1ghtOut) -- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@benkroeger](https://github.com/benkroeger) - [@c0dzilla](https://github.com/c0dzilla) - [@dependabot[bot]](https://github.com/dependabot[bot]) @@ -607,6 +665,7 @@ - [@MarcosSpessatto](https://github.com/MarcosSpessatto) - [@MartinSchoeler](https://github.com/MartinSchoeler) - [@alansikora](https://github.com/alansikora) +- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@d-gubert](https://github.com/d-gubert) - [@gabriellsh](https://github.com/gabriellsh) - [@ggazzo](https://github.com/ggazzo) @@ -748,7 +807,7 @@ - Synchronize saml roles to local user (#16152) ([#16158](https://github.com/RocketChat/Rocket.Chat/pull/16158) by [@col-panic](https://github.com/col-panic)) -- Route to get updated roles after a date ([#16610](https://github.com/RocketChat/Rocket.Chat/pull/16610) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Route to get updated roles after a date ([#16610](https://github.com/RocketChat/Rocket.Chat/pull/16610)) - Enterprise Edition ([#16944](https://github.com/RocketChat/Rocket.Chat/pull/16944)) @@ -808,7 +867,7 @@ - Add option to require authentication on user's shield endpoint ([#16845](https://github.com/RocketChat/Rocket.Chat/pull/16845)) -- Displays `Nothing found` on admin sidebar when search returns nothing ([#16255](https://github.com/RocketChat/Rocket.Chat/pull/16255) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Displays `Nothing found` on admin sidebar when search returns nothing ([#16255](https://github.com/RocketChat/Rocket.Chat/pull/16255)) - Fallback content-type as application/octet-stream for FileSystem uploads ([#16776](https://github.com/RocketChat/Rocket.Chat/pull/16776) by [@georgmu](https://github.com/georgmu)) @@ -818,11 +877,11 @@ - Send files over REST API ([#16617](https://github.com/RocketChat/Rocket.Chat/pull/16617)) -- Added autofocus to Directory ([#16217](https://github.com/RocketChat/Rocket.Chat/pull/16217) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Added autofocus to Directory ([#16217](https://github.com/RocketChat/Rocket.Chat/pull/16217)) -- Added timer in video message recorder ([#16221](https://github.com/RocketChat/Rocket.Chat/pull/16221) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Added timer in video message recorder ([#16221](https://github.com/RocketChat/Rocket.Chat/pull/16221)) -- Use `rocket.cat` as default bot If `InternalHubot_Username` is undefined ([#16371](https://github.com/RocketChat/Rocket.Chat/pull/16371) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Use `rocket.cat` as default bot If `InternalHubot_Username` is undefined ([#16371](https://github.com/RocketChat/Rocket.Chat/pull/16371)) - Removed the 'reply in thread' from thread replies ([#16630](https://github.com/RocketChat/Rocket.Chat/pull/16630) by [@ritwizsinha](https://github.com/ritwizsinha)) @@ -859,7 +918,7 @@ - Messages doesn't send to Slack via SlackBridge after renaming channel ([#16565](https://github.com/RocketChat/Rocket.Chat/pull/16565) by [@antkaz](https://github.com/antkaz)) -- Remove Reply in DM from Omnichannel rooms ([#16957](https://github.com/RocketChat/Rocket.Chat/pull/16957) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Remove Reply in DM from Omnichannel rooms ([#16957](https://github.com/RocketChat/Rocket.Chat/pull/16957)) - Login with LinkedIn not mapping name and picture correctly ([#16955](https://github.com/RocketChat/Rocket.Chat/pull/16955)) @@ -869,7 +928,7 @@ - Real-time data rendering on Omnichannel room info panel ([#16783](https://github.com/RocketChat/Rocket.Chat/pull/16783)) -- Show error message if password and confirm password not equal ([#16247](https://github.com/RocketChat/Rocket.Chat/pull/16247) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Show error message if password and confirm password not equal ([#16247](https://github.com/RocketChat/Rocket.Chat/pull/16247)) - When trying to quote messages inside threads the quote would be sent to room instead to the thread ([#16925](https://github.com/RocketChat/Rocket.Chat/pull/16925)) @@ -879,9 +938,9 @@ - Wrong thread messages display in contextual bar ([#16835](https://github.com/RocketChat/Rocket.Chat/pull/16835) by [@ritwizsinha](https://github.com/ritwizsinha)) -- Public channel cannot be accessed via URL when 'Allow Anonymous Read' is active ([#16914](https://github.com/RocketChat/Rocket.Chat/pull/16914) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Public channel cannot be accessed via URL when 'Allow Anonymous Read' is active ([#16914](https://github.com/RocketChat/Rocket.Chat/pull/16914)) -- Custom OAuth Bug ([#16811](https://github.com/RocketChat/Rocket.Chat/pull/16811) by [@PrajvalRaval](https://github.com/PrajvalRaval)) +- Custom OAuth Bug ([#16811](https://github.com/RocketChat/Rocket.Chat/pull/16811)) - Integrations page pagination ([#16838](https://github.com/RocketChat/Rocket.Chat/pull/16838)) @@ -899,7 +958,7 @@ - SlackBridge: Get all channels from Slack via REST API ([#16767](https://github.com/RocketChat/Rocket.Chat/pull/16767) by [@antkaz](https://github.com/antkaz)) -- Flextab information is not working when clicking on visitor or agent username in Omnichannel messages ([#16797](https://github.com/RocketChat/Rocket.Chat/pull/16797) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Flextab information is not working when clicking on visitor or agent username in Omnichannel messages ([#16797](https://github.com/RocketChat/Rocket.Chat/pull/16797)) - Slackbridge-import command doesn't work ([#16645](https://github.com/RocketChat/Rocket.Chat/pull/16645) by [@antkaz](https://github.com/antkaz)) @@ -923,13 +982,13 @@ - Prune message saying `files deleted` and `messages deleted` even when singular message or file in prune ([#16322](https://github.com/RocketChat/Rocket.Chat/pull/16322) by [@ritwizsinha](https://github.com/ritwizsinha)) -- "Jump to message" is rendered twice when message is starred. ([#16170](https://github.com/RocketChat/Rocket.Chat/pull/16170) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- "Jump to message" is rendered twice when message is starred. ([#16170](https://github.com/RocketChat/Rocket.Chat/pull/16170)) - Pressing Cancel while 'deleting by edit' message blocks sending messages ([#16315](https://github.com/RocketChat/Rocket.Chat/pull/16315) by [@ritwizsinha](https://github.com/ritwizsinha)) -- File uploads out of threads are not visible in regular message view ([#16416](https://github.com/RocketChat/Rocket.Chat/pull/16416) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- File uploads out of threads are not visible in regular message view ([#16416](https://github.com/RocketChat/Rocket.Chat/pull/16416)) -- There is no option to pin a thread message by admin ([#16457](https://github.com/RocketChat/Rocket.Chat/pull/16457) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- There is no option to pin a thread message by admin ([#16457](https://github.com/RocketChat/Rocket.Chat/pull/16457)) - LDAP sync admin action was not syncing existent users ([#16671](https://github.com/RocketChat/Rocket.Chat/pull/16671)) @@ -1009,9 +1068,9 @@ - Fix: Adding margin to click to load text ([#16210](https://github.com/RocketChat/Rocket.Chat/pull/16210) by [@ritwizsinha](https://github.com/ritwizsinha)) -- Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room ([#16227](https://github.com/RocketChat/Rocket.Chat/pull/16227) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room ([#16227](https://github.com/RocketChat/Rocket.Chat/pull/16227)) -- Fixed translate variable in UnarchiveRoom Modal ([#16310](https://github.com/RocketChat/Rocket.Chat/pull/16310) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Fixed translate variable in UnarchiveRoom Modal ([#16310](https://github.com/RocketChat/Rocket.Chat/pull/16310)) - Update cypress to version 4.0.2 ([#16685](https://github.com/RocketChat/Rocket.Chat/pull/16685)) @@ -1035,7 +1094,7 @@ - Improve room types usage ([#16753](https://github.com/RocketChat/Rocket.Chat/pull/16753)) -- Fix: Removed some hardcoded texts ([#16304](https://github.com/RocketChat/Rocket.Chat/pull/16304) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Fix: Removed some hardcoded texts ([#16304](https://github.com/RocketChat/Rocket.Chat/pull/16304)) - Add Enterprise Edition license ([#16801](https://github.com/RocketChat/Rocket.Chat/pull/16801)) @@ -1061,7 +1120,7 @@ - Regression: Show upload errors ([#16681](https://github.com/RocketChat/Rocket.Chat/pull/16681)) -- Fix: Correctly aligned input element of custom user status component ([#16151](https://github.com/RocketChat/Rocket.Chat/pull/16151) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Fix: Correctly aligned input element of custom user status component ([#16151](https://github.com/RocketChat/Rocket.Chat/pull/16151)) - [CHORE] Look for Storybook stories on `app/` too ([#16595](https://github.com/RocketChat/Rocket.Chat/pull/16595)) @@ -1168,12 +1227,10 @@ - [@1rV1N-git](https://github.com/1rV1N-git) - [@GOVINDDIXIT](https://github.com/GOVINDDIXIT) - [@Nikhil713](https://github.com/Nikhil713) -- [@PrajvalRaval](https://github.com/PrajvalRaval) - [@Rodriq](https://github.com/Rodriq) - [@aKn1ghtOut](https://github.com/aKn1ghtOut) - [@antkaz](https://github.com/antkaz) - [@aryamanpuri](https://github.com/aryamanpuri) -- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@col-panic](https://github.com/col-panic) - [@dependabot[bot]](https://github.com/dependabot[bot]) - [@fliptrail](https://github.com/fliptrail) @@ -1195,7 +1252,9 @@ ### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ - [@MarcosSpessatto](https://github.com/MarcosSpessatto) +- [@PrajvalRaval](https://github.com/PrajvalRaval) - [@Sing-Li](https://github.com/Sing-Li) +- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@d-gubert](https://github.com/d-gubert) - [@djorkaeffalexandre](https://github.com/djorkaeffalexandre) - [@engelgabriel](https://github.com/engelgabriel) @@ -1571,11 +1630,11 @@ ### โš ๏ธ BREAKING CHANGES -- Filter System messages per room ([#16369](https://github.com/RocketChat/Rocket.Chat/pull/16369) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Filter System messages per room ([#16369](https://github.com/RocketChat/Rocket.Chat/pull/16369)) - Remove deprecated publications ([#16351](https://github.com/RocketChat/Rocket.Chat/pull/16351)) -- Hide system messages ([#16243](https://github.com/RocketChat/Rocket.Chat/pull/16243) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Hide system messages ([#16243](https://github.com/RocketChat/Rocket.Chat/pull/16243)) - Upgrade to Meteor 1.9 and NodeJS 12 ([#16252](https://github.com/RocketChat/Rocket.Chat/pull/16252)) @@ -1646,15 +1705,15 @@ - Container heights ([#16388](https://github.com/RocketChat/Rocket.Chat/pull/16388)) -- Mail Msg Cancel button not closing the flexbar ([#16263](https://github.com/RocketChat/Rocket.Chat/pull/16263) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Mail Msg Cancel button not closing the flexbar ([#16263](https://github.com/RocketChat/Rocket.Chat/pull/16263)) - Highlight freezing the UI ([#16378](https://github.com/RocketChat/Rocket.Chat/pull/16378)) -- Adding 'lang' tag ([#16375](https://github.com/RocketChat/Rocket.Chat/pull/16375) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Adding 'lang' tag ([#16375](https://github.com/RocketChat/Rocket.Chat/pull/16375)) - App removal was moving logs to the trash collection ([#16362](https://github.com/RocketChat/Rocket.Chat/pull/16362)) -- Role tags missing - Description field explanation ([#16356](https://github.com/RocketChat/Rocket.Chat/pull/16356) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Role tags missing - Description field explanation ([#16356](https://github.com/RocketChat/Rocket.Chat/pull/16356)) - Invite links usage by channel owners/moderators ([#16176](https://github.com/RocketChat/Rocket.Chat/pull/16176)) @@ -1662,7 +1721,7 @@ - Slack CSV User Importer ([#16253](https://github.com/RocketChat/Rocket.Chat/pull/16253)) -- The "click to load" text is hard-coded and not translated. ([#16142](https://github.com/RocketChat/Rocket.Chat/pull/16142) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- The "click to load" text is hard-coded and not translated. ([#16142](https://github.com/RocketChat/Rocket.Chat/pull/16142)) - Integrations list without pagination and outgoing integration creation ([#16233](https://github.com/RocketChat/Rocket.Chat/pull/16233)) @@ -1678,13 +1737,13 @@ - auto translate cache ([#15768](https://github.com/RocketChat/Rocket.Chat/pull/15768) by [@vickyokrm](https://github.com/vickyokrm)) -- Save password without confirmation ([#16060](https://github.com/RocketChat/Rocket.Chat/pull/16060) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Save password without confirmation ([#16060](https://github.com/RocketChat/Rocket.Chat/pull/16060)) - Break message-attachment text to the next line ([#16039](https://github.com/RocketChat/Rocket.Chat/pull/16039) by [@ritwizsinha](https://github.com/ritwizsinha)) - SafePorts: Ports 80, 8080 & 443 linked to respective protocols (#16108) ([#16108](https://github.com/RocketChat/Rocket.Chat/pull/16108)) -- Drag and drop disabled when file upload is disabled ([#16049](https://github.com/RocketChat/Rocket.Chat/pull/16049) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Drag and drop disabled when file upload is disabled ([#16049](https://github.com/RocketChat/Rocket.Chat/pull/16049)) - Video message sent to wrong room ([#16113](https://github.com/RocketChat/Rocket.Chat/pull/16113)) @@ -1694,7 +1753,7 @@ - Thread message icon overlapping text ([#16083](https://github.com/RocketChat/Rocket.Chat/pull/16083)) -- Login change language button ([#16085](https://github.com/RocketChat/Rocket.Chat/pull/16085) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Login change language button ([#16085](https://github.com/RocketChat/Rocket.Chat/pull/16085)) - api-bypass-rate-limiter permission was not working ([#16080](https://github.com/RocketChat/Rocket.Chat/pull/16080)) @@ -1826,9 +1885,7 @@ - [@Cool-fire](https://github.com/Cool-fire) - [@antkaz](https://github.com/antkaz) -- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@aviral243](https://github.com/aviral243) -- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@mrsimpson](https://github.com/mrsimpson) - [@ritwizsinha](https://github.com/ritwizsinha) - [@vickyokrm](https://github.com/vickyokrm) @@ -1838,11 +1895,13 @@ - [@LuluGO](https://github.com/LuluGO) - [@MarcosSpessatto](https://github.com/MarcosSpessatto) - [@MartinSchoeler](https://github.com/MartinSchoeler) +- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@d-gubert](https://github.com/d-gubert) - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) - [@lolimay](https://github.com/lolimay) +- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -2108,23 +2167,20 @@ - Add missing password field back to administration area ([#16171](https://github.com/RocketChat/Rocket.Chat/pull/16171)) -- JS errors on Administration page ([#16139](https://github.com/RocketChat/Rocket.Chat/pull/16139) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- JS errors on Administration page ([#16139](https://github.com/RocketChat/Rocket.Chat/pull/16139))
๐Ÿ” Minor changes -- Release 2.4.1 ([#16195](https://github.com/RocketChat/Rocket.Chat/pull/16195) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Release 2.4.1 ([#16195](https://github.com/RocketChat/Rocket.Chat/pull/16195))
-### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ - -- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - ### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ - [@d-gubert](https://github.com/d-gubert) +- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@rodrigok](https://github.com/rodrigok) - [@sampaiodiego](https://github.com/sampaiodiego) @@ -2209,23 +2265,23 @@ ### ๐Ÿ› Bug fixes -- Importer: Variable name appearing instead of it's value ([#16010](https://github.com/RocketChat/Rocket.Chat/pull/16010) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Importer: Variable name appearing instead of it's value ([#16010](https://github.com/RocketChat/Rocket.Chat/pull/16010)) - Add time format for latest message on the sidebar ([#15930](https://github.com/RocketChat/Rocket.Chat/pull/15930) by [@ritwizsinha](https://github.com/ritwizsinha)) - Admin Setting descriptions and Storybook ([#15994](https://github.com/RocketChat/Rocket.Chat/pull/15994)) -- width of upload-progress-text ([#16023](https://github.com/RocketChat/Rocket.Chat/pull/16023) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- width of upload-progress-text ([#16023](https://github.com/RocketChat/Rocket.Chat/pull/16023)) -- Message list scrolling to bottom on reactions ([#16018](https://github.com/RocketChat/Rocket.Chat/pull/16018) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Message list scrolling to bottom on reactions ([#16018](https://github.com/RocketChat/Rocket.Chat/pull/16018)) - SAML logout error ([#15978](https://github.com/RocketChat/Rocket.Chat/pull/15978)) - Added Join button to Read Only rooms. ([#16016](https://github.com/RocketChat/Rocket.Chat/pull/16016)) -- z-index of new message button ([#16013](https://github.com/RocketChat/Rocket.Chat/pull/16013) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- z-index of new message button ([#16013](https://github.com/RocketChat/Rocket.Chat/pull/16013)) -- new message popup ([#16017](https://github.com/RocketChat/Rocket.Chat/pull/16017) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- new message popup ([#16017](https://github.com/RocketChat/Rocket.Chat/pull/16017)) - Changed renderMessage priority, fixed Katex on/off setting ([#16012](https://github.com/RocketChat/Rocket.Chat/pull/16012)) @@ -2314,11 +2370,9 @@ ### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ - [@antkaz](https://github.com/antkaz) -- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@breaking-let](https://github.com/breaking-let) - [@iannuzzelli](https://github.com/iannuzzelli) - [@localguru](https://github.com/localguru) -- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@n-se](https://github.com/n-se) - [@ritwizsinha](https://github.com/ritwizsinha) - [@wreiske](https://github.com/wreiske) @@ -2328,11 +2382,13 @@ - [@MarcosSpessatto](https://github.com/MarcosSpessatto) - [@MartinSchoeler](https://github.com/MartinSchoeler) +- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@d-gubert](https://github.com/d-gubert) - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) - [@lolimay](https://github.com/lolimay) +- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -2506,7 +2562,7 @@ - Mentions before blockquote ([#15774](https://github.com/RocketChat/Rocket.Chat/pull/15774)) -- Sidebar font color was not respecting theming ([#15745](https://github.com/RocketChat/Rocket.Chat/pull/15745) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) +- Sidebar font color was not respecting theming ([#15745](https://github.com/RocketChat/Rocket.Chat/pull/15745)) - Add livechat agents into departments ([#15732](https://github.com/RocketChat/Rocket.Chat/pull/15732)) @@ -2581,7 +2637,6 @@ ### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ - [@Exordian](https://github.com/Exordian) -- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@mpdbl](https://github.com/mpdbl) - [@nstseek](https://github.com/nstseek) - [@rajvaibhavdubey](https://github.com/rajvaibhavdubey) @@ -2595,6 +2650,7 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) +- [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -3741,7 +3797,7 @@ - Add tmid property to outgoing integration ([#14699](https://github.com/RocketChat/Rocket.Chat/pull/14699)) -- Endpoint to anonymously read channel's messages ([#14714](https://github.com/RocketChat/Rocket.Chat/pull/14714) by [@PrajvalRaval](https://github.com/PrajvalRaval)) +- Endpoint to anonymously read channel's messages ([#14714](https://github.com/RocketChat/Rocket.Chat/pull/14714)) - Add Livechat inquiries endpoints ([#14779](https://github.com/RocketChat/Rocket.Chat/pull/14779)) @@ -3817,7 +3873,6 @@ - [@AnBo83](https://github.com/AnBo83) - [@Hudell](https://github.com/Hudell) -- [@PrajvalRaval](https://github.com/PrajvalRaval) - [@knrt10](https://github.com/knrt10) - [@mohamedar97](https://github.com/mohamedar97) - [@ruKurz](https://github.com/ruKurz) @@ -3830,6 +3885,7 @@ - [@LuluGO](https://github.com/LuluGO) - [@MarcosSpessatto](https://github.com/MarcosSpessatto) +- [@PrajvalRaval](https://github.com/PrajvalRaval) - [@alansikora](https://github.com/alansikora) - [@engelgabriel](https://github.com/engelgabriel) - [@ggazzo](https://github.com/ggazzo) @@ -4157,7 +4213,7 @@ - Google Plus account is no longer accessible ([#14503](https://github.com/RocketChat/Rocket.Chat/pull/14503) by [@zdumitru](https://github.com/zdumitru)) -- [IMPROVEMENT] Add tooltip to to notify user the purpose of back button in discussion ([#13872](https://github.com/RocketChat/Rocket.Chat/pull/13872) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- [IMPROVEMENT] Add tooltip to to notify user the purpose of back button in discussion ([#13872](https://github.com/RocketChat/Rocket.Chat/pull/13872)) - eslint errors currently on develop ([#14518](https://github.com/RocketChat/Rocket.Chat/pull/14518) by [@Hudell](https://github.com/Hudell)) @@ -4219,7 +4275,6 @@ - [@Hudell](https://github.com/Hudell) - [@Kailash0311](https://github.com/Kailash0311) - [@arminfelder](https://github.com/arminfelder) -- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@bhardwajaditya](https://github.com/bhardwajaditya) - [@gsunit](https://github.com/gsunit) - [@jaredmoody](https://github.com/jaredmoody) @@ -4238,6 +4293,7 @@ - [@MarcosSpessatto](https://github.com/MarcosSpessatto) - [@alansikora](https://github.com/alansikora) +- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@d-gubert](https://github.com/d-gubert) - [@engelgabriel](https://github.com/engelgabriel) - [@geekgonecrazy](https://github.com/geekgonecrazy) @@ -4613,7 +4669,7 @@ - Fixed grammatical error. ([#13559](https://github.com/RocketChat/Rocket.Chat/pull/13559) by [@gsunit](https://github.com/gsunit)) -- In home screen Rocket.Chat+ is dispalyed as Rocket.Chat ([#13784](https://github.com/RocketChat/Rocket.Chat/pull/13784) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- In home screen Rocket.Chat+ is dispalyed as Rocket.Chat ([#13784](https://github.com/RocketChat/Rocket.Chat/pull/13784)) - No new room created when conversation is closed ([#13753](https://github.com/RocketChat/Rocket.Chat/pull/13753) by [@knrt10](https://github.com/knrt10)) @@ -4809,7 +4865,7 @@ - Improve: Support search and adding federated users through regular endpoints ([#13936](https://github.com/RocketChat/Rocket.Chat/pull/13936)) -- Remove bitcoin link in Readme.md since the link is broken ([#13935](https://github.com/RocketChat/Rocket.Chat/pull/13935) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Remove bitcoin link in Readme.md since the link is broken ([#13935](https://github.com/RocketChat/Rocket.Chat/pull/13935)) - Fix missing dependencies on stretch CI image ([#13910](https://github.com/RocketChat/Rocket.Chat/pull/13910)) @@ -4837,7 +4893,7 @@ - Fix: addRoomAccessValidator method created for Threads ([#13789](https://github.com/RocketChat/Rocket.Chat/pull/13789)) -- Adds French translation of Personal Access Token ([#13779](https://github.com/RocketChat/Rocket.Chat/pull/13779) by [@ashwaniYDV](https://github.com/ashwaniYDV)) +- Adds French translation of Personal Access Token ([#13779](https://github.com/RocketChat/Rocket.Chat/pull/13779)) - Remove Sandstorm support ([#13773](https://github.com/RocketChat/Rocket.Chat/pull/13773)) @@ -5158,7 +5214,6 @@ - [@Peym4n](https://github.com/Peym4n) - [@TkTech](https://github.com/TkTech) - [@algomaster99](https://github.com/algomaster99) -- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@bhardwajaditya](https://github.com/bhardwajaditya) - [@bsharrow](https://github.com/bsharrow) - [@fliptrail](https://github.com/fliptrail) @@ -5202,6 +5257,7 @@ - [@LuluGO](https://github.com/LuluGO) - [@MarcosSpessatto](https://github.com/MarcosSpessatto) - [@alansikora](https://github.com/alansikora) +- [@ashwaniYDV](https://github.com/ashwaniYDV) - [@d-gubert](https://github.com/d-gubert) - [@engelgabriel](https://github.com/engelgabriel) - [@geekgonecrazy](https://github.com/geekgonecrazy) diff --git a/app/apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js index daf10f0dd176..34550cf9b1b1 100644 --- a/app/apps/client/admin/appManage.js +++ b/app/apps/client/admin/appManage.js @@ -405,7 +405,8 @@ Template.appManage.events({ _app.set('working', true); try { - const { status } = await Apps.updateApp(appId, _app.get('marketplaceVersion')); + const method = _app.get('installed') ? 'updateApp' : 'installApp'; + const { status } = await Apps[method](appId, _app.get('marketplaceVersion')); warnStatusChange(_app.get('name'), status); } catch (error) { handleAPIError(error); diff --git a/app/apps/client/admin/helpers.js b/app/apps/client/admin/helpers.js index a1b0b2cdf9c5..3ae7f805a483 100644 --- a/app/apps/client/admin/helpers.js +++ b/app/apps/client/admin/helpers.js @@ -19,6 +19,11 @@ const appErroredStatuses = [ AppStatus.INVALID_LICENSE_DISABLED, ]; +const subscriptionActiveStatuses = [ + 'trialing', + 'active', +]; + export const handleAPIError = (error) => { console.error(error); const message = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message; @@ -298,7 +303,7 @@ export const appButtonProps = ({ }; } - const canTrial = purchaseType === 'subscription' && !subscriptionInfo.status; + const canTrial = purchaseType === 'subscription' && !subscriptionActiveStatuses.includes(subscriptionInfo.status); if (canTrial) { return { action: 'purchase', diff --git a/app/apps/server/converters/rooms.js b/app/apps/server/converters/rooms.js index 1fac2d4d6b60..04eeba2098fd 100644 --- a/app/apps/server/converters/rooms.js +++ b/app/apps/server/converters/rooms.js @@ -92,6 +92,7 @@ export class AppRoomsConverter { lm: room.lastModifiedAt, customFields: room.customFields, prid: typeof room.parentRoom === 'undefined' ? undefined : room.parentRoom.id, + ...room._USERNAMES && { _USERNAMES: room._USERNAMES }, }; return Object.assign(newRoom, room._unmappedProperties_); diff --git a/app/importer-slack/server/importer.js b/app/importer-slack/server/importer.js index a596bc6e79a8..258af97b076a 100644 --- a/app/importer-slack/server/importer.js +++ b/app/importer-slack/server/importer.js @@ -15,7 +15,7 @@ import { getUserAvatarURL } from '../../utils/lib/getUserAvatarURL'; import { Users, Rooms, Messages } from '../../models'; import { insertMessage, createDirectRoom } from '../../lib'; import { getValidRoomName } from '../../utils'; -import { settings } from '../../settings/lib/settings'; +import { settings } from '../../settings/server'; export class SlackImporter extends Base { constructor(info, importRecord) { diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js index 0ebf3c2501cb..ce64d65a9203 100644 --- a/app/lib/server/lib/sendNotificationsOnMessage.js +++ b/app/lib/server/lib/sendNotificationsOnMessage.js @@ -180,6 +180,7 @@ const project = { mobilePushNotifications: 1, muteGroupMentions: 1, name: 1, + rid: 1, userHighlights: 1, 'u._id': 1, 'receiver.active': 1, diff --git a/app/livechat/server/methods/getDepartmentForwardRestrictions.js b/app/livechat/server/methods/getDepartmentForwardRestrictions.js index e08adc9792ba..ffb1788bd150 100644 --- a/app/livechat/server/methods/getDepartmentForwardRestrictions.js +++ b/app/livechat/server/methods/getDepartmentForwardRestrictions.js @@ -8,6 +8,9 @@ Meteor.methods({ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:getDepartmentForwardRestrictions' }); } - return callbacks.run('livechat.onLoadForwardDepartmentRestrictions', departmentId); + const options = callbacks.run('livechat.onLoadForwardDepartmentRestrictions', { departmentId }); + const { restrictions } = options; + + return restrictions; }, }); diff --git a/app/mailer/server/api.js b/app/mailer/server/api.js index 38bb11418273..da22acc8208a 100644 --- a/app/mailer/server/api.js +++ b/app/mailer/server/api.js @@ -6,7 +6,7 @@ import s from 'underscore.string'; import juice from 'juice'; import stripHtml from 'string-strip-html'; -import { settings } from '../../settings'; +import { settings } from '../../settings/server'; let contentHeader; let contentFooter; @@ -42,11 +42,13 @@ export const replace = function replace(str, data = {}) { return Object.entries(options).reduce((ret, [key, value]) => replacekey(ret, key, value), translate(str)); }; +const nonEscapeKeys = ['room_path']; + export const replaceEscaped = (str, data = {}) => replace(str, { Site_Name: s.escapeHTML(settings.get('Site_Name')), Site_Url: s.escapeHTML(settings.get('Site_Url')), ...Object.entries(data).reduce((ret, [key, value]) => { - ret[key] = s.escapeHTML(value); + ret[key] = nonEscapeKeys.includes(key) ? value : s.escapeHTML(value); return ret; }, {}), }); @@ -116,7 +118,18 @@ export const sendNoWrap = ({ to, from, replyTo, subject, html, text, headers }) Meteor.defer(() => Email.send({ to, from, replyTo, subject, html, text, headers })); }; -export const send = ({ to, from, replyTo, subject, html, text, data, headers }) => sendNoWrap({ to, from, replyTo, subject: replace(subject, data), text: text ? replace(text, data) : stripHtml(replace(html, data)), html: wrap(html, data), headers }); +export const send = ({ to, from, replyTo, subject, html, text, data, headers }) => + sendNoWrap({ + to, + from, + replyTo, + subject: replace(subject, data), + text: text + ? replace(text, data) + : stripHtml(replace(html, data)), + html: wrap(html, data), + headers, + }); export const checkAddressFormatAndThrow = (from, func) => { if (checkAddressFormat(from)) { diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js index 15768ca68c34..eb89fd9fb68a 100644 --- a/app/meteor-accounts-saml/server/saml_server.js +++ b/app/meteor-accounts-saml/server/saml_server.js @@ -61,9 +61,9 @@ Meteor.methods({ return; } - let { nameID } = user.services.saml; + const { nameID } = user.services.saml; const sessionIndex = user.services.saml.idpSession; - nameID = sessionIndex; + if (Accounts.saml.settings.debug) { console.log(`NameID for user ${ Meteor.userId() } found: ${ JSON.stringify(nameID) }`); } diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 61d70c69f2e7..dd63ae1be430 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.3.0" + "version": "3.3.1" } diff --git a/app/version-check/server/functions/checkVersionUpdate.js b/app/version-check/server/functions/checkVersionUpdate.js index 0c6ab86de956..1ea0e8b9c924 100644 --- a/app/version-check/server/functions/checkVersionUpdate.js +++ b/app/version-check/server/functions/checkVersionUpdate.js @@ -44,7 +44,7 @@ export default () => { sendMessagesToAdmins({ msgs: ({ adminUser }) => [{ msg: `*${ TAPi18n.__('Update_your_RocketChat', adminUser.language) }*\n${ TAPi18n.__('New_version_available_(s)', update.lastestVersion.version, adminUser.language) }\n${ update.lastestVersion.infoUrl }` }], banners: [{ - id: 'versionUpdate', + id: `versionUpdate-${ update.lastestVersion.version }`.replace(/\./g, '_'), priority: 10, title: 'Update_your_RocketChat', text: 'New_version_available_(s)', @@ -62,7 +62,7 @@ export default () => { msg: `*${ TAPi18n.__('Rocket_Chat_Alert', adminUser.language) }:*\n\n*${ TAPi18n.__(alert.title, adminUser.language) }*\n${ TAPi18n.__(alert.text, ...alert.textArguments || [], adminUser.language) }\n${ alert.infoUrl }`, })), banners: alerts.map((alert) => ({ - id: `alert-${ alert.id }`, + id: `alert-${ alert.id }`.replace(/\./g, '_'), priority: 10, title: alert.title, text: alert.text, diff --git a/app/version-check/server/functions/getNewUpdates.js b/app/version-check/server/functions/getNewUpdates.js index f2f35cb622e6..45baffb0b33d 100644 --- a/app/version-check/server/functions/getNewUpdates.js +++ b/app/version-check/server/functions/getNewUpdates.js @@ -2,7 +2,6 @@ import os from 'os'; import { HTTP } from 'meteor/http'; import { check, Match } from 'meteor/check'; -import { MongoInternals } from 'meteor/mongo'; import { Settings } from '../../../models'; import { Info } from '../../../utils'; @@ -11,14 +10,11 @@ import { getWorkspaceAccessToken } from '../../../cloud/server'; export default () => { try { const uniqueID = Settings.findOne('uniqueID'); - const { _oplogHandle } = MongoInternals.defaultRemoteCollectionDriver().mongo; - const oplogEnabled = _oplogHandle && _oplogHandle.onOplogEntry; const params = { uniqueId: uniqueID.value, - installedAt: uniqueID.createdAt, + installedAt: uniqueID.createdAt.toJSON(), version: Info.version, - oplogEnabled, osType: os.type(), osPlatform: os.platform(), osArch: os.arch(), @@ -40,7 +36,11 @@ export default () => { }); check(data, Match.ObjectIncluding({ - versions: [String], + versions: [Match.ObjectIncluding({ + version: Match.Optional(String), + security: Match.Optional(Boolean), + infoUrl: Match.Optional(String), + })], alerts: Match.Optional([Match.ObjectIncluding({ id: Match.Optional(String), title: Match.Optional(String), diff --git a/client/admin/rooms/EditRoom.js b/client/admin/rooms/EditRoom.js index b258dc7668c2..06ad356d9828 100644 --- a/client/admin/rooms/EditRoom.js +++ b/client/admin/rooms/EditRoom.js @@ -108,7 +108,7 @@ function EditRoom({ room, onChange }) { {t('Public')} - + @@ -116,7 +116,7 @@ function EditRoom({ room, onChange }) { {t('Private')} - + diff --git a/client/admin/users/UsersTable.js b/client/admin/users/UsersTable.js index 72bb1972fec8..715fcff77ff7 100644 --- a/client/admin/users/UsersTable.js +++ b/client/admin/users/UsersTable.js @@ -96,7 +96,7 @@ export function UsersTable() { {mediaQuery && { username } } - {emails && emails[0].address} + {emails && emails.length && emails[0].address} {mediaQuery && {roles && roles.join(', ')}} {status} ; diff --git a/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js b/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js index 538ce151b30c..baae278009b7 100644 --- a/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js +++ b/ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js @@ -1,17 +1,18 @@ import { callbacks } from '../../../../../app/callbacks'; import { LivechatDepartment } from '../../../../../app/models/server'; -callbacks.add('livechat.onLoadForwardDepartmentRestrictions', (departmentId) => { +callbacks.add('livechat.onLoadForwardDepartmentRestrictions', (options = {}) => { + const { departmentId } = options; if (!departmentId) { - return {}; + return options; } const department = LivechatDepartment.findOneById(departmentId, { fields: { departmentsAllowedToForward: 1 } }); if (!department) { - return {}; + return options; } const { departmentsAllowedToForward } = department; if (!departmentsAllowedToForward) { - return {}; + return options; } - return { _id: { $in: departmentsAllowedToForward } }; + return Object.assign({ restrictions: { _id: { $in: departmentsAllowedToForward } } }, options); }, callbacks.priority.MEDIUM, 'livechat-on-load-forward-department-restrictions'); diff --git a/package-lock.json b/package-lock.json index 22bdfd1cca4d..f459526fe962 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.3.0", + "version": "3.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2797,9 +2797,9 @@ } }, "@rocket.chat/apps-engine": { - "version": "1.15.0-beta.3411", - "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.15.0-beta.3411.tgz", - "integrity": "sha512-e1ddaAfjWXWGyb2tlW8eZHgg6sBHN73n52i8b62GfqSJtf1cIM9VhLA4igq8Anaai5UtcxmmhdAQgmt0xhnNuw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.15.0.tgz", + "integrity": "sha512-gwsHa/zTYMmoSG3PP3sZfmVRDRBmIDacOAdCv1FsgJog89ZBCICeoab3VyYAdOMliV5XoygygduYFtc6rinFHQ==", "requires": { "adm-zip": "^0.4.9", "cryptiles": "^4.1.3", @@ -2810,11 +2810,6 @@ "uuid": "^3.2.1" }, "dependencies": { - "adm-zip": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz", - "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==" - }, "typescript": { "version": "2.9.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", diff --git a/package.json b/package.json index 42c5580c2739..c49d8f27269a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.3.0", + "version": "3.3.1", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" @@ -125,7 +125,7 @@ "@nivo/heatmap": "^0.61.0", "@nivo/line": "^0.61.1", "@nivo/pie": "^0.61.1", - "@rocket.chat/apps-engine": "1.15.0-beta.3411", + "@rocket.chat/apps-engine": "1.15.0", "@rocket.chat/fuselage": "^0.9.0", "@rocket.chat/fuselage-hooks": "^0.9.0", "@rocket.chat/fuselage-polyfills": "^0.9.0",