diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 169eeed44a8..046e8f96caa 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 1.1.0-rc.0
+ENV RC_VERSION 1.1.0-rc.1
MAINTAINER buildmaster@rocket.chat
diff --git a/.github/history.json b/.github/history.json
index d0f42c8bd18..c92277e37ed 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -29970,6 +29970,205 @@
}
]
},
+ "1.0.2": {
+ "node_version": "8.11.4",
+ "npm_version": "6.4.1",
+ "mongo_versions": [
+ "3.2",
+ "3.4",
+ "3.6",
+ "4.0"
+ ],
+ "pull_requests": [
+ {
+ "pr": "14339",
+ "title": "Release 1.0.2",
+ "userLogin": "rodrigok",
+ "contributors": [
+ "tassoevan",
+ "rodrigok",
+ "mohamedar97",
+ "ggazzo",
+ "thaiphv",
+ "knrt10",
+ "lolimay",
+ "AnBo83",
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "14338",
+ "title": "[FIX] Unread line and new day separator were not aligned ",
+ "userLogin": "ggazzo",
+ "milestone": "1.0.2",
+ "contributors": [
+ "ggazzo",
+ "tassoevan",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14336",
+ "title": "[FIX] Audio notification for messages on DM",
+ "userLogin": "sampaiodiego",
+ "milestone": "1.0.2",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "14334",
+ "title": "[IMPROVE] i18n of threads and discussion buttons",
+ "userLogin": "sampaiodiego",
+ "milestone": "1.0.2",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "14330",
+ "title": "[FIX] Duplicate thread message after editing",
+ "userLogin": "ggazzo",
+ "milestone": "1.0.2",
+ "contributors": [
+ "ggazzo"
+ ]
+ },
+ {
+ "pr": "14328",
+ "title": "[FIX] New day separator rendered over thread reply",
+ "userLogin": "rodrigok",
+ "milestone": "1.0.2",
+ "contributors": [
+ "rodrigok"
+ ]
+ },
+ {
+ "pr": "14320",
+ "title": "[IMPROVE] Better error message when not able to get MongoDB Version",
+ "userLogin": "rodrigok",
+ "milestone": "1.0.2",
+ "contributors": [
+ "rodrigok",
+ "d-gubert",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14318",
+ "title": "Add cross-browser select arrow positioning",
+ "userLogin": "tassoevan",
+ "milestone": "1.0.2",
+ "contributors": [
+ "tassoevan"
+ ]
+ },
+ {
+ "pr": "14182",
+ "title": "i18n: Update German strings",
+ "userLogin": "AnBo83",
+ "milestone": "1.0.2",
+ "contributors": [
+ "AnBo83",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14011",
+ "title": "[FIX] Missing i18n for some new Permissions",
+ "userLogin": "lolimay",
+ "milestone": "1.0.2",
+ "contributors": [
+ "lolimay",
+ "tassoevan",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14316",
+ "title": "[FIX] View Logs admin page was broken and not rendering color logs",
+ "userLogin": "tassoevan",
+ "milestone": "1.0.2",
+ "contributors": [
+ "tassoevan",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14301",
+ "title": "[Regression] Anonymous user fix",
+ "userLogin": "knrt10",
+ "milestone": "1.0.2",
+ "contributors": [
+ "knrt10"
+ ]
+ },
+ {
+ "pr": "14299",
+ "title": "Coerces the MongoDB version string",
+ "userLogin": "thaiphv",
+ "milestone": "1.0.2",
+ "contributors": [
+ "thaiphv"
+ ]
+ },
+ {
+ "pr": "14313",
+ "title": "[FIX] show roles on message",
+ "userLogin": "ggazzo",
+ "milestone": "1.0.2",
+ "contributors": [
+ "ggazzo"
+ ]
+ },
+ {
+ "pr": "14075",
+ "title": "[Fix] group name appears instead of the room id",
+ "userLogin": "mohamedar97",
+ "milestone": "1.0.2",
+ "contributors": [
+ "mohamedar97"
+ ]
+ },
+ {
+ "pr": "14311",
+ "title": "[FIX] Remove reference to inexistent field when deleting message in thread",
+ "userLogin": "tassoevan",
+ "milestone": "1.0.2",
+ "contributors": [
+ "tassoevan"
+ ]
+ }
+ ]
+ },
+ "1.0.3": {
+ "node_version": "8.11.4",
+ "npm_version": "6.4.1",
+ "mongo_versions": [
+ "3.2",
+ "3.4",
+ "3.6",
+ "4.0"
+ ],
+ "pull_requests": [
+ {
+ "pr": "14446",
+ "title": "Release 1.0.3",
+ "userLogin": "rodrigok",
+ "milestone": "1.0.3",
+ "contributors": [
+ "rodrigok",
+ "mrsimpson",
+ "ggazzo",
+ "MarcosSpessatto",
+ "geekgonecrazy",
+ "tassoevan",
+ "engelgabriel",
+ "sampaiodiego"
+ ]
+ }
+ ]
+ },
"1.1.0-rc.0": {
"node_version": "8.11.4",
"npm_version": "6.4.1",
@@ -31013,6 +31212,202 @@
"d-gubert",
"web-flow"
]
+ },
+ {
+ "pr": "14446",
+ "title": "Release 1.0.3",
+ "userLogin": "rodrigok",
+ "milestone": "1.0.3",
+ "contributors": [
+ "rodrigok",
+ "mrsimpson",
+ "ggazzo",
+ "MarcosSpessatto",
+ "geekgonecrazy",
+ "tassoevan",
+ "engelgabriel",
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "14339",
+ "title": "Release 1.0.2",
+ "userLogin": "rodrigok",
+ "contributors": [
+ "tassoevan",
+ "rodrigok",
+ "mohamedar97",
+ "ggazzo",
+ "thaiphv",
+ "knrt10",
+ "lolimay",
+ "AnBo83",
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "14338",
+ "title": "[FIX] Unread line and new day separator were not aligned ",
+ "userLogin": "ggazzo",
+ "milestone": "1.0.2",
+ "contributors": [
+ "ggazzo",
+ "tassoevan",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14336",
+ "title": "[FIX] Audio notification for messages on DM",
+ "userLogin": "sampaiodiego",
+ "milestone": "1.0.2",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "14334",
+ "title": "[IMPROVE] i18n of threads and discussion buttons",
+ "userLogin": "sampaiodiego",
+ "milestone": "1.0.2",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "14330",
+ "title": "[FIX] Duplicate thread message after editing",
+ "userLogin": "ggazzo",
+ "milestone": "1.0.2",
+ "contributors": [
+ "ggazzo"
+ ]
+ },
+ {
+ "pr": "14328",
+ "title": "[FIX] New day separator rendered over thread reply",
+ "userLogin": "rodrigok",
+ "milestone": "1.0.2",
+ "contributors": [
+ "rodrigok"
+ ]
+ },
+ {
+ "pr": "14320",
+ "title": "[IMPROVE] Better error message when not able to get MongoDB Version",
+ "userLogin": "rodrigok",
+ "milestone": "1.0.2",
+ "contributors": [
+ "rodrigok",
+ "d-gubert",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14318",
+ "title": "Add cross-browser select arrow positioning",
+ "userLogin": "tassoevan",
+ "milestone": "1.0.2",
+ "contributors": [
+ "tassoevan"
+ ]
+ },
+ {
+ "pr": "14182",
+ "title": "i18n: Update German strings",
+ "userLogin": "AnBo83",
+ "milestone": "1.0.2",
+ "contributors": [
+ "AnBo83",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14011",
+ "title": "[FIX] Missing i18n for some new Permissions",
+ "userLogin": "lolimay",
+ "milestone": "1.0.2",
+ "contributors": [
+ "lolimay",
+ "tassoevan",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14316",
+ "title": "[FIX] View Logs admin page was broken and not rendering color logs",
+ "userLogin": "tassoevan",
+ "milestone": "1.0.2",
+ "contributors": [
+ "tassoevan",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "14301",
+ "title": "[Regression] Anonymous user fix",
+ "userLogin": "knrt10",
+ "milestone": "1.0.2",
+ "contributors": [
+ "knrt10"
+ ]
+ },
+ {
+ "pr": "14299",
+ "title": "Coerces the MongoDB version string",
+ "userLogin": "thaiphv",
+ "milestone": "1.0.2",
+ "contributors": [
+ "thaiphv"
+ ]
+ },
+ {
+ "pr": "14313",
+ "title": "[FIX] show roles on message",
+ "userLogin": "ggazzo",
+ "milestone": "1.0.2",
+ "contributors": [
+ "ggazzo"
+ ]
+ },
+ {
+ "pr": "14075",
+ "title": "[Fix] group name appears instead of the room id",
+ "userLogin": "mohamedar97",
+ "milestone": "1.0.2",
+ "contributors": [
+ "mohamedar97"
+ ]
+ },
+ {
+ "pr": "14311",
+ "title": "[FIX] Remove reference to inexistent field when deleting message in thread",
+ "userLogin": "tassoevan",
+ "milestone": "1.0.2",
+ "contributors": [
+ "tassoevan"
+ ]
+ }
+ ]
+ },
+ "1.1.0-rc.1": {
+ "node_version": "8.11.4",
+ "npm_version": "6.4.1",
+ "mongo_versions": [
+ "3.2",
+ "3.4",
+ "3.6",
+ "4.0"
+ ],
+ "pull_requests": [
+ {
+ "pr": "14576",
+ "title": "Fix: Add emoji shortnames to emoji's list",
+ "userLogin": "sampaiodiego",
+ "milestone": "1.1.0",
+ "contributors": [
+ "sampaiodiego"
+ ]
}
]
}
diff --git a/.travis/snap.sh b/.travis/snap.sh
index f232c34c4df..00d32118152 100755
--- 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=1.1.0-rc.0
+ RC_VERSION=1.1.0-rc.1
fi
echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index a83cc768f19..5e8897a44c6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,8 +1,22 @@
# 1.1.0 (Under Release Candidate Process)
+## 1.1.0-rc.1
+`2019-05-21 ยท 1 ๐ ยท 1 ๐ฉโ๐ป๐จโ๐ป`
+
+
+๐ Minor changes
+
+- Fix: Add emoji shortnames to emoji's list ([#14576](https://github.com/RocketChat/Rocket.Chat/pull/14576))
+
+
+
+### ๐ฉโ๐ป๐จโ๐ป Core Team ๐ค
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
## 1.1.0-rc.0
-`2019-05-20 ยท 5 ๐ ยท 12 ๐ ยท 53 ๐ ยท 29 ๐ ยท 28 ๐ฉโ๐ป๐จโ๐ป`
+`2019-05-20 ยท 5 ๐ ยท 10 ๐ ยท 45 ๐ ยท 24 ๐ ยท 24 ๐ฉโ๐ป๐จโ๐ป`
### ๐ New features
@@ -24,8 +38,6 @@
- Added flag `skipActiveUsersToBeReady` to not wait the load of `active users` to present the Web interface ([#14431](https://github.com/RocketChat/Rocket.Chat/pull/14431))
- SAML login process refactoring ([#12891](https://github.com/RocketChat/Rocket.Chat/pull/12891) by [@kukkjanos](https://github.com/kukkjanos))
- Allow change Discussion's properties ([#14389](https://github.com/RocketChat/Rocket.Chat/pull/14389))
-- i18n of threads and discussion buttons ([#14334](https://github.com/RocketChat/Rocket.Chat/pull/14334))
-- Better error message when not able to get MongoDB Version ([#14320](https://github.com/RocketChat/Rocket.Chat/pull/14320))
### ๐ Bug fixes
@@ -74,14 +86,6 @@
- Bell was too small on threads ([#14394](https://github.com/RocketChat/Rocket.Chat/pull/14394))
- Main thread title on replies ([#14372](https://github.com/RocketChat/Rocket.Chat/pull/14372))
- New day separator overlapping above system message ([#14362](https://github.com/RocketChat/Rocket.Chat/pull/14362))
-- Unread line and new day separator were not aligned ([#14338](https://github.com/RocketChat/Rocket.Chat/pull/14338))
-- Audio notification for messages on DM ([#14336](https://github.com/RocketChat/Rocket.Chat/pull/14336))
-- Duplicate thread message after editing ([#14330](https://github.com/RocketChat/Rocket.Chat/pull/14330))
-- New day separator rendered over thread reply ([#14328](https://github.com/RocketChat/Rocket.Chat/pull/14328))
-- Missing i18n for some new Permissions ([#14011](https://github.com/RocketChat/Rocket.Chat/pull/14011) by [@lolimay](https://github.com/lolimay))
-- View Logs admin page was broken and not rendering color logs ([#14316](https://github.com/RocketChat/Rocket.Chat/pull/14316))
-- show roles on message ([#14313](https://github.com/RocketChat/Rocket.Chat/pull/14313))
-- Remove reference to inexistent field when deleting message in thread ([#14311](https://github.com/RocketChat/Rocket.Chat/pull/14311))
๐ Minor changes
@@ -108,12 +112,7 @@
- fix discussions: remove restriction for editing room info, server side ([#14039](https://github.com/RocketChat/Rocket.Chat/pull/14039))
- Fix: Message body was not being updated when user disabled nrr message ([#14390](https://github.com/RocketChat/Rocket.Chat/pull/14390))
- Improve German translations ([#14351](https://github.com/RocketChat/Rocket.Chat/pull/14351))
-- Add cross-browser select arrow positioning ([#14318](https://github.com/RocketChat/Rocket.Chat/pull/14318))
-- i18n: Update German strings ([#14182](https://github.com/RocketChat/Rocket.Chat/pull/14182) by [@AnBo83](https://github.com/AnBo83))
- Merge master into develop & Set version to 1.1.0-develop ([#14317](https://github.com/RocketChat/Rocket.Chat/pull/14317) by [@wreiske](https://github.com/wreiske))
-- [Regression] Anonymous user fix ([#14301](https://github.com/RocketChat/Rocket.Chat/pull/14301) by [@knrt10](https://github.com/knrt10))
-- Coerces the MongoDB version string ([#14299](https://github.com/RocketChat/Rocket.Chat/pull/14299) by [@thaiphv](https://github.com/thaiphv))
-- [Fix] group name appears instead of the room id ([#14075](https://github.com/RocketChat/Rocket.Chat/pull/14075) by [@mohamedar97](https://github.com/mohamedar97))
- Merge master into develop & Set version to 1.1.0-develop ([#14294](https://github.com/RocketChat/Rocket.Chat/pull/14294))
@@ -128,13 +127,10 @@
- [@jungeonkim](https://github.com/jungeonkim)
- [@knrt10](https://github.com/knrt10)
- [@kukkjanos](https://github.com/kukkjanos)
-- [@lolimay](https://github.com/lolimay)
- [@miolane](https://github.com/miolane)
- [@mjovanovic0](https://github.com/mjovanovic0)
-- [@mohamedar97](https://github.com/mohamedar97)
- [@mushroomgenie](https://github.com/mushroomgenie)
- [@supra08](https://github.com/supra08)
-- [@thaiphv](https://github.com/thaiphv)
- [@wreiske](https://github.com/wreiske)
- [@zdumitru](https://github.com/zdumitru)
@@ -142,7 +138,6 @@
- [@Hudell](https://github.com/Hudell)
- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
-- [@d-gubert](https://github.com/d-gubert)
- [@engelgabriel](https://github.com/engelgabriel)
- [@geekgonecrazy](https://github.com/geekgonecrazy)
- [@ggazzo](https://github.com/ggazzo)
@@ -152,6 +147,84 @@
- [@sampaiodiego](https://github.com/sampaiodiego)
- [@tassoevan](https://github.com/tassoevan)
+# 1.0.3
+`2019-05-09 ยท 1 ๐ ยท 8 ๐ฉโ๐ป๐จโ๐ป`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+
+๐ Minor changes
+
+- Release 1.0.3 ([#14446](https://github.com/RocketChat/Rocket.Chat/pull/14446))
+
+
+
+### ๐ฉโ๐ป๐จโ๐ป Core Team ๐ค
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@mrsimpson](https://github.com/mrsimpson)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 1.0.2
+`2019-04-30 ยท 2 ๐ ยท 8 ๐ ยท 6 ๐ ยท 10 ๐ฉโ๐ป๐จโ๐ป`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+### ๐ Improvements
+
+- i18n of threads and discussion buttons ([#14334](https://github.com/RocketChat/Rocket.Chat/pull/14334))
+- Better error message when not able to get MongoDB Version ([#14320](https://github.com/RocketChat/Rocket.Chat/pull/14320))
+
+### ๐ Bug fixes
+
+- Unread line and new day separator were not aligned ([#14338](https://github.com/RocketChat/Rocket.Chat/pull/14338))
+- Audio notification for messages on DM ([#14336](https://github.com/RocketChat/Rocket.Chat/pull/14336))
+- Duplicate thread message after editing ([#14330](https://github.com/RocketChat/Rocket.Chat/pull/14330))
+- New day separator rendered over thread reply ([#14328](https://github.com/RocketChat/Rocket.Chat/pull/14328))
+- Missing i18n for some new Permissions ([#14011](https://github.com/RocketChat/Rocket.Chat/pull/14011) by [@lolimay](https://github.com/lolimay))
+- View Logs admin page was broken and not rendering color logs ([#14316](https://github.com/RocketChat/Rocket.Chat/pull/14316))
+- show roles on message ([#14313](https://github.com/RocketChat/Rocket.Chat/pull/14313))
+- Remove reference to inexistent field when deleting message in thread ([#14311](https://github.com/RocketChat/Rocket.Chat/pull/14311))
+
+
+๐ Minor changes
+
+- Release 1.0.2 ([#14339](https://github.com/RocketChat/Rocket.Chat/pull/14339) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@lolimay](https://github.com/lolimay) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv))
+- Add cross-browser select arrow positioning ([#14318](https://github.com/RocketChat/Rocket.Chat/pull/14318))
+- i18n: Update German strings ([#14182](https://github.com/RocketChat/Rocket.Chat/pull/14182) by [@AnBo83](https://github.com/AnBo83))
+- [Regression] Anonymous user fix ([#14301](https://github.com/RocketChat/Rocket.Chat/pull/14301) by [@knrt10](https://github.com/knrt10))
+- Coerces the MongoDB version string ([#14299](https://github.com/RocketChat/Rocket.Chat/pull/14299) by [@thaiphv](https://github.com/thaiphv))
+- [Fix] group name appears instead of the room id ([#14075](https://github.com/RocketChat/Rocket.Chat/pull/14075) by [@mohamedar97](https://github.com/mohamedar97))
+
+
+
+### ๐ฉโ๐ป๐จโ๐ป Contributors ๐
+
+- [@AnBo83](https://github.com/AnBo83)
+- [@knrt10](https://github.com/knrt10)
+- [@lolimay](https://github.com/lolimay)
+- [@mohamedar97](https://github.com/mohamedar97)
+- [@thaiphv](https://github.com/thaiphv)
+
+### ๐ฉโ๐ป๐จโ๐ป Core Team ๐ค
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
# 1.0.1
`2019-04-28 ยท 7 ๐ ยท 4 ๐ฉโ๐ป๐จโ๐ป`
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index a6bfedb5e44..283cf62f6dd 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "1.1.0-rc.0"
+ "version": "1.1.0-rc.1"
}
diff --git a/package.json b/package.json
index 1198072b826..b0694513b60 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "1.1.0-rc.0",
+ "version": "1.1.0-rc.1",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"