Merge pull request #9796 from RocketChat/master

Sync from Master

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.61.0-develop
+ENV RC_VERSION 0.61.2
 
 MAINTAINER buildmaster@rocket.chat
 

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.61.0-develop"),
+		appMarketingVersion = (defaultText = "0.61.2"),
 		# 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.61.0-develop
+    RC_VERSION=0.61.2
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

package.json

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

packages/rocketchat-cors/cors.js

@@ -3,6 +3,11 @@ import _ from 'underscore';
 
 import url from 'url';
 
+import tls from 'tls';
+// FIX For TLS error see more here https://github.com/RocketChat/Rocket.Chat/issues/9316
+// TODO: Remove after NodeJS fix it, more information https://github.com/nodejs/node/issues/16196 https://github.com/nodejs/node/pull/16853
+tls.DEFAULT_ECDH_CURVE = 'auto';
+
 WebApp.rawConnectHandlers.use(Meteor.bindEnvironment(function(req, res, next) {
 	if (req._body) {
 		return next();

packages/rocketchat-i18n/i18n/de.i18n.json

@@ -1796,6 +1796,7 @@
   "theme-custom-css": "Benutzerdefiniertes CSS",
   "theme-font-body-font-family": "Schrift-Familie für den Textkörper",
   "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt",
+  "There_are_no_applications": "Bisher wurden keine oAuth Anwendungen hinzugefügt.",
   "There_are_no_integrations": "Es sind keine Integrationen vorhanden",
   "There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet",
   "This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet",
@@ -2065,4 +2066,4 @@
   "your_message_optional": "Ihre optionale Nachricht",
   "Your_password_is_wrong": "Falsches Passwort",
   "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
-}
+}

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -1390,8 +1390,8 @@
   "Notification_Duration": "Notification Duration",
   "Notification_Mobile_Default_For": "Push Mobile Notifications For",
   "Notifications": "Notifications",
-  "Notifications_Always_Notify_Mobile" : "Always notify mobile",
-  "Notifications_Always_Notify_Mobile_Description" : "Choose to always notify mobile device regardless of presence status.",
+  "Notifications_Always_Notify_Mobile": "Always notify mobile",
+  "Notifications_Always_Notify_Mobile_Description": "Choose to always notify mobile device regardless of presence status.",
   "Notifications_Duration": "Notifications_Duration",
   "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
   "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
@@ -1647,7 +1647,7 @@
   "run-migration_description": "Permission to run the migrations",
   "Running_Instances": "Running Instances",
   "S_new_messages_since_s": "%s new messages since %s",
-  "Same_As_Token_Sent_Via" : "Same as \"Token Sent Via\"",
+  "Same_As_Token_Sent_Via": "Same as \"Token Sent Via\"",
   "Same_Style_For_Mentions": "Same style for mentions",
   "SAML": "SAML",
   "SAML_Custom_Cert": "Custom Certificate",
@@ -1918,6 +1918,7 @@
   "theme-custom-css": "Custom CSS",
   "theme-font-body-font-family": "Body Font Family",
   "There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.",
+  "There_are_no_applications": "No oAuth Applications have been added yet.",
   "There_are_no_integrations": "There are no integrations",
   "There_are_no_users_in_this_role": "There are no users in this role.",
   "This_conversation_is_already_closed": "This conversation is already closed.",
@@ -2215,4 +2216,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
+}

packages/rocketchat-i18n/i18n/pt-BR.i18n.json

@@ -1323,4 +1323,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
+}

packages/rocketchat-i18n/i18n/pt.i18n.json

@@ -1348,4 +1348,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
+}

packages/rocketchat-lib/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "0.61.0-develop"
+	"version": "0.61.2"
 }