Merge pull request #10376 from RocketChat/develop-sync

Master into Develop Branch Sync

.circleci/config.yml

@@ -208,7 +208,7 @@ jobs:
   deploy:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8
+      - image: circleci/node:8
 
     steps:
       - attach_workspace:

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.63.0-develop
+ENV RC_VERSION 0.64.0-develop
 
 MAINTAINER [email protected]
 

.github/history.json

@@ -12107,7 +12107,36 @@
       ]
     }
   ],
-  "HEAD": [
+  "HEAD": [],
+  "0.63.0": [
+    {
+      "pr": "10303",
+      "title": "[FIX] Audio Message UI fixes",
+      "userLogin": "kb0304",
+      "contributors": [
+        "kb0304",
+        "ggazzo",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10319",
+      "title": "[NEW] Improve history generation",
+      "userLogin": "rodrigok",
+      "milestone": "0.63.0",
+      "contributors": [
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "10323",
+      "title": "Fix: Reaction endpoint/api only working with regular emojis",
+      "userLogin": "graywolf336",
+      "milestone": "0.63.0",
+      "contributors": [
+        "graywolf336"
+      ]
+    },
     {
       "pr": "10313",
       "title": "Bump snap version to include security fix",
@@ -12127,5 +12156,56 @@
         "rodrigok"
       ]
     }
+  ],
+  "0.63.1": [
+    {
+      "pr": "10348",
+      "title": "[FIX] Change deprecated Meteor._reload.reload method in favor of Reload._reload",
+      "userLogin": "tttt-conan",
+      "milestone": "0.63.1",
+      "contributors": [
+        "tttt-conan"
+      ]
+    },
+    {
+      "pr": "10351",
+      "title": "[FIX] Snaps crashing due to Node v8.11.1 Segfault",
+      "userLogin": "geekgonecrazy",
+      "milestone": "0.63.1",
+      "contributors": [
+        "geekgonecrazy",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10084",
+      "title": "[FIX] Add '.value' in the SAML package to fix TypeErrors on SAML token validation",
+      "userLogin": "TechyPeople",
+      "milestone": "0.63.1",
+      "contributors": [
+        "TechyPeople",
+        "web-flow",
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "10356",
+      "title": "[FIX] Incorrect german translation of user online status",
+      "userLogin": "kaiiiiiiiii",
+      "milestone": "0.63.1",
+      "contributors": [
+        "kaiiiiiiiii"
+      ]
+    },
+    {
+      "pr": "10355",
+      "title": "[FIX] Incorrect French language usage for Disabled",
+      "userLogin": "graywolf336",
+      "milestone": "0.63.1",
+      "contributors": [
+        "graywolf336",
+        "web-flow"
+      ]
+    }
   ]
 }

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.63.0-develop"),
+		appMarketingVersion = (defaultText = "0.64.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.63.0-develop
+    RC_VERSION=0.64.0-develop
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

HISTORY.md

@@ -1,69 +1,36 @@
+<a name="0.64.0-develop"></a>
+# 0.64.0-develop (2018-04-07)
 
-# Next
-`2018-04-03  ·  2 🔍`
 
-<details>
-<summary>🔍 Minor changes</summary>
-
-- Bump snap version to include security fix ([#10313](https://github.com/RocketChat/Rocket.Chat/pull/10313))
-- Update Meteor to 1.6.1.1 ([#10314](https://github.com/RocketChat/Rocket.Chat/pull/10314))
-
-</details>
 
-# 0.63.0 (Under Release Candidate Process)
 
-## 0.63.0-rc.2
-`2018-04-03  ·  5 🐛  ·  3 🔍  ·  1 👩‍💻👨‍💻`
+# 0.63.1
+`2018-04-07  ·  5 🐛  ·  3 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
-- Unable to mention after newline in message ([#10078](https://github.com/RocketChat/Rocket.Chat/pull/10078) by [@c0dzilla](https://github.com/c0dzilla))
-- Wrong pagination information on /api/v1/channels.members ([#10224](https://github.com/RocketChat/Rocket.Chat/pull/10224))
-- Inline code following a url leads to autolinking of code with url ([#10163](https://github.com/RocketChat/Rocket.Chat/pull/10163) by [@c0dzilla](https://github.com/c0dzilla))
-- Incoming Webhooks were missing the raw content ([#10258](https://github.com/RocketChat/Rocket.Chat/pull/10258))
-- Missing Translation Key on Reactions ([#10270](https://github.com/RocketChat/Rocket.Chat/pull/10270))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-- Fix: inputs for rocketchat apps ([#10274](https://github.com/RocketChat/Rocket.Chat/pull/10274))
-- Fix: chat.react api not accepting previous emojis ([#10290](https://github.com/RocketChat/Rocket.Chat/pull/10290))
-- Fix: Scroll on content page ([#10300](https://github.com/RocketChat/Rocket.Chat/pull/10300))
-
-</details>
+- Change deprecated Meteor._reload.reload method in favor of Reload._reload ([#10348](https://github.com/RocketChat/Rocket.Chat/pull/10348) by [@tttt-conan](https://github.com/tttt-conan))
+- Snaps crashing due to Node v8.11.1 Segfault ([#10351](https://github.com/RocketChat/Rocket.Chat/pull/10351))
+- Add '.value' in the SAML package to fix TypeErrors on SAML token validation ([#10084](https://github.com/RocketChat/Rocket.Chat/pull/10084) by [@TechyPeople](https://github.com/TechyPeople))
+- Incorrect german translation of user online status ([#10356](https://github.com/RocketChat/Rocket.Chat/pull/10356) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+- Incorrect French language usage for Disabled ([#10355](https://github.com/RocketChat/Rocket.Chat/pull/10355))
 
 ### 👩‍💻👨‍💻 Contributors 😍
 
-- [@c0dzilla](https://github.com/c0dzilla)
-
-## 0.63.0-rc.1
-`2018-03-29  ·  3 🐛  ·  4 🔍`
-
-### 🐛 Bug fixes
-
-- File had redirect delay when using external storage services and no option to proxy only avatars ([#10272](https://github.com/RocketChat/Rocket.Chat/pull/10272))
-- Missing pt-BR translations ([#10262](https://github.com/RocketChat/Rocket.Chat/pull/10262))
-- /me REST endpoint was missing user roles and preferences ([#10240](https://github.com/RocketChat/Rocket.Chat/pull/10240))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-- Fix: Renaming channels.notifications Get/Post endpoints ([#10257](https://github.com/RocketChat/Rocket.Chat/pull/10257))
-- Fix caddy download link to pull from github ([#10260](https://github.com/RocketChat/Rocket.Chat/pull/10260))
-- Fix: possible errors on rocket.chat side of the apps ([#10252](https://github.com/RocketChat/Rocket.Chat/pull/10252))
-- Fix snap install. Remove execstack from sharp, and bypass grpc error ([#10015](https://github.com/RocketChat/Rocket.Chat/pull/10015))
-
-</details>
+- [@TechyPeople](https://github.com/TechyPeople)
+- [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
+- [@tttt-conan](https://github.com/tttt-conan)
 
-## 0.63.0-rc.0
-`2018-03-27  ·  1 ️️️⚠️  ·  17 🎉  ·  35 🐛  ·  10 🔍  ·  12 👩‍💻👨‍💻`
+# 0.63.0
+`2018-04-04  ·  1 ️️️⚠️  ·  18 🎉  ·  44 🐛  ·  20 🔍  ·  13 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
 - Removed Private History Route ([#10103](https://github.com/RocketChat/Rocket.Chat/pull/10103))
 
 ### 🎉 New features
 
+- Improve history generation ([#10319](https://github.com/RocketChat/Rocket.Chat/pull/10319))
 - Interface to install and manage RocketChat Apps (alpha) ([#10246](https://github.com/RocketChat/Rocket.Chat/pull/10246))
 - Livechat messages rest APIs ([#10054](https://github.com/RocketChat/Rocket.Chat/pull/10054) by [@hmagarotto](https://github.com/hmagarotto))
 - Endpoint to retrieve message read receipts ([#9907](https://github.com/RocketChat/Rocket.Chat/pull/9907))
@@ -84,6 +51,7 @@
 
 ### 🐛 Bug fixes
 
+- Audio Message UI fixes ([#10303](https://github.com/RocketChat/Rocket.Chat/pull/10303) by [@kb0304](https://github.com/kb0304))
 - "View All Members" button inside channel's "User Info" is over sized ([#10012](https://github.com/RocketChat/Rocket.Chat/pull/10012))
 - Apostrophe-containing URL misparsed" ([#10242](https://github.com/RocketChat/Rocket.Chat/pull/10242))
 - user status on sidenav ([#10222](https://github.com/RocketChat/Rocket.Chat/pull/10222))
@@ -119,10 +87,21 @@
 - New channel page on medium size screens ([#9988](https://github.com/RocketChat/Rocket.Chat/pull/9988))
 - Empty sidenav when sorting by activity and there is a subscription without room ([#9960](https://github.com/RocketChat/Rocket.Chat/pull/9960))
 - Two factor authentication modal was not showing ([#9982](https://github.com/RocketChat/Rocket.Chat/pull/9982))
+- File had redirect delay when using external storage services and no option to proxy only avatars ([#10272](https://github.com/RocketChat/Rocket.Chat/pull/10272))
+- Missing pt-BR translations ([#10262](https://github.com/RocketChat/Rocket.Chat/pull/10262))
+- /me REST endpoint was missing user roles and preferences ([#10240](https://github.com/RocketChat/Rocket.Chat/pull/10240))
+- Unable to mention after newline in message ([#10078](https://github.com/RocketChat/Rocket.Chat/pull/10078) by [@c0dzilla](https://github.com/c0dzilla))
+- Wrong pagination information on /api/v1/channels.members ([#10224](https://github.com/RocketChat/Rocket.Chat/pull/10224))
+- Inline code following a url leads to autolinking of code with url ([#10163](https://github.com/RocketChat/Rocket.Chat/pull/10163) by [@c0dzilla](https://github.com/c0dzilla))
+- Incoming Webhooks were missing the raw content ([#10258](https://github.com/RocketChat/Rocket.Chat/pull/10258))
+- Missing Translation Key on Reactions ([#10270](https://github.com/RocketChat/Rocket.Chat/pull/10270))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+- Fix: Reaction endpoint/api only working with regular emojis ([#10323](https://github.com/RocketChat/Rocket.Chat/pull/10323))
+- Bump snap version to include security fix ([#10313](https://github.com/RocketChat/Rocket.Chat/pull/10313))
+- Update Meteor to 1.6.1.1 ([#10314](https://github.com/RocketChat/Rocket.Chat/pull/10314))
 - LingoHub based on develop ([#10243](https://github.com/RocketChat/Rocket.Chat/pull/10243))
 - Rename migration name on 108 to match file name ([#10237](https://github.com/RocketChat/Rocket.Chat/pull/10237))
 - Fix typo for Nextcloud login ([#10159](https://github.com/RocketChat/Rocket.Chat/pull/10159) by [@pierreozoux](https://github.com/pierreozoux))
@@ -133,13 +112,21 @@
 - [OTHER] Reactivate API tests ([#9844](https://github.com/RocketChat/Rocket.Chat/pull/9844))
 - Start 0.63.0-develop / develop sync from master ([#9985](https://github.com/RocketChat/Rocket.Chat/pull/9985))
 - Release 0.62.2 ([#10087](https://github.com/RocketChat/Rocket.Chat/pull/10087))
+- Fix: Renaming channels.notifications Get/Post endpoints ([#10257](https://github.com/RocketChat/Rocket.Chat/pull/10257))
+- Fix caddy download link to pull from github ([#10260](https://github.com/RocketChat/Rocket.Chat/pull/10260))
+- Fix: possible errors on rocket.chat side of the apps ([#10252](https://github.com/RocketChat/Rocket.Chat/pull/10252))
+- Fix snap install. Remove execstack from sharp, and bypass grpc error ([#10015](https://github.com/RocketChat/Rocket.Chat/pull/10015))
+- Fix: inputs for rocketchat apps ([#10274](https://github.com/RocketChat/Rocket.Chat/pull/10274))
+- Fix: chat.react api not accepting previous emojis ([#10290](https://github.com/RocketChat/Rocket.Chat/pull/10290))
+- Fix: Scroll on content page ([#10300](https://github.com/RocketChat/Rocket.Chat/pull/10300))
 
 </details>
 
 ### 👩‍💻👨‍💻 Contributors 😍
 
 - [@Joe-mcgee](https://github.com/Joe-mcgee)
 - [@TopHattedCat](https://github.com/TopHattedCat)
+- [@c0dzilla](https://github.com/c0dzilla)
 - [@cyclops24](https://github.com/cyclops24)
 - [@hmagarotto](https://github.com/hmagarotto)
 - [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.63.0-develop",
+	"version": "0.64.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

packages/rocketchat-lib/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "0.63.0-develop"
+	"version": "0.64.0-develop"
 }