Develop sync (#10815)

* add redhat dockerfile to master (#10408) * add redhat dockerfile to master * Add redhat dockerfile to set-version helper script * Release 0.63.2 (#10476) * [FIX] Even TypeErrors with SAML (#10475) * Bump version to 0.63.2 * Added one2mail.info to default blocked domain list (#10218) * [FIX] The 'channel.messages' REST API Endpoint error (#10485) * Bump version to 0.63.3 * Add the history of v0.63.3 * Bump version to 0.64.0-rc.0 * Bump version to 0.64.0-rc.1 * Bump version to 0.64.0-rc.2 * Bump version to 0.64.0-rc.3 * Bump version to 0.64.0-rc.4 * Bump version to 0.64.0 * Bump version to 0.64.1 * Bump version to 0.65.0-develop
7 years ago · a67ff581af
parent 107afcc3fc
commit a67ff581af
9 changed files with 1623 additions and 13 deletions
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@ -1,6 +1,6 @@
 FROM rocketchat/base:8

-ENV RC_VERSION 0.64.0-develop
+ENV RC_VERSION 0.65.0-develop

 MAINTAINER buildmaster@rocket.chat

--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

-ENV RC_VERSION 0.64.0-develop
+ENV RC_VERSION 0.65.0-develop

 MAINTAINER buildmaster@rocket.chat

--- a/.github/history.json
+++ b/.github/history.json
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (

 		appTitle = (defaultText = "Rocket.Chat"),

-		appVersion = 62,  # Increment this for every release.
+		appVersion = 65,  # Increment this for every release.

-		appMarketingVersion = (defaultText = "0.64.0-develop"),
+		appMarketingVersion = (defaultText = "0.65.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.

--- a/.scripts/set-version.js
+++ b/.scripts/set-version.js
@ -4,7 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const semver = require('semver');
 const inquirer = require('inquirer');
-const execSync = require('child_process').execSync;
+// const execSync = require('child_process').execSync;
 const git = require('simple-git/promise')(process.cwd());

 let pkgJson = {};
@ -92,7 +92,7 @@ git.status()
 		}));
 	})
 	.then(() => {
-		execSync('conventional-changelog --config .github/changelog.js -i HISTORY.md -s');
+		// execSync('conventional-changelog --config .github/changelog.js -i HISTORY.md -s');

 		return inquirer.prompt([{
 			type: 'confirm',
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
    RC_VERSION=$TRAVIS_TAG
 else
    CHANNEL=edge
-    RC_VERSION=0.64.0-develop
+    RC_VERSION=0.65.0-develop
 fi

 echo "Preparing to trigger a snap release for $CHANNEL channel"
--- a/HISTORY.md
+++ b/HISTORY.md
@ -1,6 +1,164 @@
-<a name="0.64.0-develop"></a>
-# 0.64.0-develop (2018-04-07)

+# 0.64.1
+`2018-05-03  ·  1 🎉  ·  2 🐛  ·  3 🔍  ·  1 👩‍💻👨‍💻`
+
+### 🎉 New features
+
+- Store the last sent message to show bellow the room's name by default ([#10597](https://github.com/RocketChat/Rocket.Chat/pull/10597))
+
+### 🐛 Bug fixes
+
+- E-mails were hidden some information ([#10615](https://github.com/RocketChat/Rocket.Chat/pull/10615))
+- Regression on 0.64.0 was freezing the application when posting some URLs ([#10627](https://github.com/RocketChat/Rocket.Chat/pull/10627))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Support passing extra connection options to the Mongo driver ([#10529](https://github.com/RocketChat/Rocket.Chat/pull/10529) by [@saplla](https://github.com/saplla))
+- Regression: Updating an App on multi-instance servers wasn't working ([#10611](https://github.com/RocketChat/Rocket.Chat/pull/10611))
+- Dependencies update ([#10648](https://github.com/RocketChat/Rocket.Chat/pull/10648))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@saplla](https://github.com/saplla)
+
+# 0.64.0
+`2018-04-28  ·  2 ️️️⚠️  ·  18 🎉  ·  44 🐛  ·  33 🔍  ·  18 👩‍💻👨‍💻`
+
+### ⚠️ BREAKING CHANGES
+
+- Validate incoming message schema ([#9922](https://github.com/RocketChat/Rocket.Chat/pull/9922))
+- The property "settings" is no longer available to regular users via rest api ([#10411](https://github.com/RocketChat/Rocket.Chat/pull/10411))
+
+### 🎉 New features
+
+- Option to mute group mentions (@all and @here) ([#10502](https://github.com/RocketChat/Rocket.Chat/pull/10502))
+- GDPR - Right to access and Data Portability ([#9906](https://github.com/RocketChat/Rocket.Chat/pull/9906))
+- Broadcast Channels ([#9950](https://github.com/RocketChat/Rocket.Chat/pull/9950))
+- Option to ignore users on channels ([#10517](https://github.com/RocketChat/Rocket.Chat/pull/10517))
+- Search Provider Framework ([#10110](https://github.com/RocketChat/Rocket.Chat/pull/10110) by [@tkurz](https://github.com/tkurz))
+- REST API endpoint `/directory` ([#10442](https://github.com/RocketChat/Rocket.Chat/pull/10442))
+- Body of the payload on an incoming webhook is included on the request object ([#10259](https://github.com/RocketChat/Rocket.Chat/pull/10259))
+- REST endpoint to recover forgotten password ([#10371](https://github.com/RocketChat/Rocket.Chat/pull/10371))
+- REST endpoint to report messages ([#10354](https://github.com/RocketChat/Rocket.Chat/pull/10354))
+- Livechat setting to customize ended conversation message ([#10108](https://github.com/RocketChat/Rocket.Chat/pull/10108))
+- Twilio MMS support for LiveChat integration ([#7964](https://github.com/RocketChat/Rocket.Chat/pull/7964) by [@t3hchipmunk](https://github.com/t3hchipmunk))
+- REST API endpoint `rooms.favorite` to favorite and unfavorite rooms ([#10342](https://github.com/RocketChat/Rocket.Chat/pull/10342))
+- Add internal API to handle room announcements ([#10396](https://github.com/RocketChat/Rocket.Chat/pull/10396))
+- Add message preview when quoting another message ([#10437](https://github.com/RocketChat/Rocket.Chat/pull/10437))
+- Prevent the browser to autocomplete some setting fields ([#10439](https://github.com/RocketChat/Rocket.Chat/pull/10439))
+- Shows user's real name on autocomplete popup ([#10444](https://github.com/RocketChat/Rocket.Chat/pull/10444))
+- Automatically trigger Redhat registry build when tagging new release ([#10414](https://github.com/RocketChat/Rocket.Chat/pull/10414))
+- Add information regarding Zapier and Bots to the integrations page ([#10574](https://github.com/RocketChat/Rocket.Chat/pull/10574))
+
+### 🐛 Bug fixes
+
+- Missing "Administration" menu for users with some administration permissions ([#10551](https://github.com/RocketChat/Rocket.Chat/pull/10551) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+- Member list search with no results ([#10599](https://github.com/RocketChat/Rocket.Chat/pull/10599))
+- Integrations with room data not having the usernames filled in ([#10576](https://github.com/RocketChat/Rocket.Chat/pull/10576))
+- Add user object to responses in /*.files Rest endpoints ([#10480](https://github.com/RocketChat/Rocket.Chat/pull/10480))
+- Missing user data on files uploaded through the API ([#10473](https://github.com/RocketChat/Rocket.Chat/pull/10473))
+- Rename method to clean history of messages ([#10498](https://github.com/RocketChat/Rocket.Chat/pull/10498))
+- REST spotlight API wasn't allowing searches with # and @ ([#10410](https://github.com/RocketChat/Rocket.Chat/pull/10410))
+- Dropdown elements were using old styles ([#10482](https://github.com/RocketChat/Rocket.Chat/pull/10482) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+- Directory sort and column sizes were wrong ([#10403](https://github.com/RocketChat/Rocket.Chat/pull/10403))
+- REST API OAuth services endpoint were missing fields and flag to indicate custom services ([#10299](https://github.com/RocketChat/Rocket.Chat/pull/10299))
+- Error messages weren't been displayed when email verification fails ([#10446](https://github.com/RocketChat/Rocket.Chat/pull/10446))
+- Wrong column positions in the directory search for users ([#10454](https://github.com/RocketChat/Rocket.Chat/pull/10454) by [@sumedh123](https://github.com/sumedh123))
+- Custom fields was misaligned in registration form ([#10463](https://github.com/RocketChat/Rocket.Chat/pull/10463) by [@dschuan](https://github.com/dschuan))
+- Unique identifier file not really being unique ([#10341](https://github.com/RocketChat/Rocket.Chat/pull/10341) by [@abernix](https://github.com/abernix))
+- Empty panel after changing a user's username ([#10404](https://github.com/RocketChat/Rocket.Chat/pull/10404))
+- Russian translation of "False" ([#10418](https://github.com/RocketChat/Rocket.Chat/pull/10418) by [@strangerintheq](https://github.com/strangerintheq))
+- Links being embedded inside of blockquotes ([#10496](https://github.com/RocketChat/Rocket.Chat/pull/10496))
+- The 'channel.messages' REST API Endpoint error ([#10485](https://github.com/RocketChat/Rocket.Chat/pull/10485))
+- Button on user info contextual bar scrolling with the content ([#10358](https://github.com/RocketChat/Rocket.Chat/pull/10358) by [@okaybroda](https://github.com/okaybroda))
+- "Idle Time Limit" using milliseconds instead of seconds ([#9824](https://github.com/RocketChat/Rocket.Chat/pull/9824) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+- Missing i18n translation key for "Unread" ([#10387](https://github.com/RocketChat/Rocket.Chat/pull/10387))
+- Owner unable to delete channel or group from APIs ([#9729](https://github.com/RocketChat/Rocket.Chat/pull/9729) by [@c0dzilla](https://github.com/c0dzilla))
+- Livechat translation files being ignored ([#10369](https://github.com/RocketChat/Rocket.Chat/pull/10369))
+- Missing page "not found" ([#6673](https://github.com/RocketChat/Rocket.Chat/pull/6673) by [@Prakharsvnit](https://github.com/Prakharsvnit))
+- "Highlight Words" wasn't working with more than one word ([#10083](https://github.com/RocketChat/Rocket.Chat/pull/10083) by [@nemaniarjun](https://github.com/nemaniarjun))
+- Missing "Administration" menu for user with manage-emoji permission ([#10171](https://github.com/RocketChat/Rocket.Chat/pull/10171) by [@c0dzilla](https://github.com/c0dzilla))
+- Message view mode setting was missing at user's preferences  ([#10395](https://github.com/RocketChat/Rocket.Chat/pull/10395) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+- Profile image was not being shown in user's directory search ([#10399](https://github.com/RocketChat/Rocket.Chat/pull/10399) by [@sumedh123](https://github.com/sumedh123))
+- Wrong positioning of popover when using RTL languages ([#10428](https://github.com/RocketChat/Rocket.Chat/pull/10428))
+- Messages was grouping wrong some times when server is slow ([#10472](https://github.com/RocketChat/Rocket.Chat/pull/10472))
+- GitLab authentication scope was too open, reduced to read only access ([#10225](https://github.com/RocketChat/Rocket.Chat/pull/10225))
+- Renaming agent's username within Livechat's department ([#10344](https://github.com/RocketChat/Rocket.Chat/pull/10344))
+- Missing RocketApps input types ([#10394](https://github.com/RocketChat/Rocket.Chat/pull/10394))
+- Livechat desktop notifications not being displayed ([#10221](https://github.com/RocketChat/Rocket.Chat/pull/10221))
+- Autocomplete list when inviting a user was partial hidden ([#10409](https://github.com/RocketChat/Rocket.Chat/pull/10409))
+- Remove a user from the user's list when creating a new channel removes the wrong user ([#10423](https://github.com/RocketChat/Rocket.Chat/pull/10423))
+- Room's name was cutting instead of having ellipses on sidebar ([#10430](https://github.com/RocketChat/Rocket.Chat/pull/10430))
+- Button to delete rooms by the owners wasn't appearing ([#10438](https://github.com/RocketChat/Rocket.Chat/pull/10438))
+- Updated OpenShift Template to take an Image as a Param ([#9946](https://github.com/RocketChat/Rocket.Chat/pull/9946) by [@christianh814](https://github.com/christianh814))
+- Incoming integrations being able to trigger an empty message with a GET ([#9576](https://github.com/RocketChat/Rocket.Chat/pull/9576))
+- Snaps installations are breaking on avatar requests ([#10390](https://github.com/RocketChat/Rocket.Chat/pull/10390))
+- Wordpress oAuth authentication wasn't behaving correctly ([#10550](https://github.com/RocketChat/Rocket.Chat/pull/10550) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+- Switch buttons were cutting in RTL mode ([#10558](https://github.com/RocketChat/Rocket.Chat/pull/10558))
+- Stop Firefox announcement overflowing viewport ([#10503](https://github.com/RocketChat/Rocket.Chat/pull/10503) by [@brendangadd](https://github.com/brendangadd))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: Various search provider fixes ([#10591](https://github.com/RocketChat/Rocket.Chat/pull/10591) by [@tkurz](https://github.com/tkurz))
+- Regression: /api/v1/settings.oauth not sending needed info for SAML & CAS ([#10596](https://github.com/RocketChat/Rocket.Chat/pull/10596) by [@cardoso](https://github.com/cardoso))
+- Regression: Apps and Livechats not getting along well with each other ([#10598](https://github.com/RocketChat/Rocket.Chat/pull/10598))
+- Development: Add Visual Studio Code debugging configuration ([#10586](https://github.com/RocketChat/Rocket.Chat/pull/10586))
+- Included missing lib for migrations ([#10532](https://github.com/RocketChat/Rocket.Chat/pull/10532))
+- Develop sync ([#10505](https://github.com/RocketChat/Rocket.Chat/pull/10505) by [@nsuchy](https://github.com/nsuchy))
+- Fix: Remove "secret" from REST endpoint /settings.oauth response ([#10513](https://github.com/RocketChat/Rocket.Chat/pull/10513))
+- [OTHER] More Listeners for Apps & Utilize Promises inside Apps ([#10335](https://github.com/RocketChat/Rocket.Chat/pull/10335))
+- [OTHER] Develop sync ([#10487](https://github.com/RocketChat/Rocket.Chat/pull/10487))
+- Change Docker-Compose to use mmapv1 storage engine for mongo ([#10336](https://github.com/RocketChat/Rocket.Chat/pull/10336))
+- Add some missing translations ([#10435](https://github.com/RocketChat/Rocket.Chat/pull/10435))
+- [OTHER] Removed the developer warning on the rest api ([#10441](https://github.com/RocketChat/Rocket.Chat/pull/10441))
+- Fix and improve vietnamese translation ([#10397](https://github.com/RocketChat/Rocket.Chat/pull/10397) by [@TDiNguyen](https://github.com/TDiNguyen) & [@tttt-conan](https://github.com/tttt-conan))
+- Use Node 8.9 for CI build ([#10405](https://github.com/RocketChat/Rocket.Chat/pull/10405))
+- Update allowed labels for bot ([#10360](https://github.com/RocketChat/Rocket.Chat/pull/10360) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
+- Remove @core team mention from Pull Request template ([#10384](https://github.com/RocketChat/Rocket.Chat/pull/10384))
+- New issue template for *Release Process* ([#10234](https://github.com/RocketChat/Rocket.Chat/pull/10234))
+- Master into Develop Branch Sync ([#10376](https://github.com/RocketChat/Rocket.Chat/pull/10376))
+- Release 0.63.3 ([#10504](https://github.com/RocketChat/Rocket.Chat/pull/10504))
+- Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
+- add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
+- LingoHub based on develop ([#10545](https://github.com/RocketChat/Rocket.Chat/pull/10545))
+- Regression: Revert announcement structure ([#10544](https://github.com/RocketChat/Rocket.Chat/pull/10544))
+- Regression: Upload was not working ([#10543](https://github.com/RocketChat/Rocket.Chat/pull/10543))
+- Deps update ([#10549](https://github.com/RocketChat/Rocket.Chat/pull/10549))
+- Regression: /api/v1/settings.oauth not returning clientId for Twitter ([#10560](https://github.com/RocketChat/Rocket.Chat/pull/10560) by [@cardoso](https://github.com/cardoso))
+- Regression: Webhooks breaking due to restricted test ([#10555](https://github.com/RocketChat/Rocket.Chat/pull/10555))
+- Regression: Rooms and Apps weren't playing nice with each other ([#10559](https://github.com/RocketChat/Rocket.Chat/pull/10559))
+- Regression: Fix announcement bar being displayed without content ([#10554](https://github.com/RocketChat/Rocket.Chat/pull/10554))
+- Regression: Inconsistent response of settings.oauth endpoint ([#10553](https://github.com/RocketChat/Rocket.Chat/pull/10553))
+- Regression: Remove added mentions on quote/reply ([#10571](https://github.com/RocketChat/Rocket.Chat/pull/10571))
+- Regression: Attachments and fields incorrectly failing on validation ([#10573](https://github.com/RocketChat/Rocket.Chat/pull/10573))
+- Regression: Rocket.Chat App author link opens in same window ([#10575](https://github.com/RocketChat/Rocket.Chat/pull/10575) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@Prakharsvnit](https://github.com/Prakharsvnit)
+- [@TDiNguyen](https://github.com/TDiNguyen)
+- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
+- [@abernix](https://github.com/abernix)
+- [@brendangadd](https://github.com/brendangadd)
+- [@c0dzilla](https://github.com/c0dzilla)
+- [@cardoso](https://github.com/cardoso)
+- [@christianh814](https://github.com/christianh814)
+- [@dschuan](https://github.com/dschuan)
+- [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
+- [@nemaniarjun](https://github.com/nemaniarjun)
+- [@nsuchy](https://github.com/nsuchy)
+- [@okaybroda](https://github.com/okaybroda)
+- [@strangerintheq](https://github.com/strangerintheq)
+- [@sumedh123](https://github.com/sumedh123)
+- [@t3hchipmunk](https://github.com/t3hchipmunk)
+- [@tkurz](https://github.com/tkurz)
+- [@tttt-conan](https://github.com/tttt-conan)

 # 0.63.3
 `2018-04-18  ·  2 🐛  ·  2 🔍  ·  1 👩‍💻👨‍💻`
@ -1957,4 +2115,4 @@
 - [@qge](https://github.com/qge)
 - [@sezinkarli](https://github.com/sezinkarli)
 - [@szluohua](https://github.com/szluohua)
- [@tgxn](https://github.com/tgxn)
+- [@tgxn](https://github.com/tgxn)
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.64.0-develop",
+	"version": "0.65.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@ -1,3 +1,3 @@
 {
-	"version": "0.64.0-develop"
+	"version": "0.65.0-develop"
 }