From f0017692a356f8b5d8aba896aa7b26104a66c498 Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@gmail.com>
Date: Fri, 24 Mar 2017 09:00:24 -0300
Subject: [PATCH] no message
---
HISTORY.md | 14 +++++++++++---
.../client/lib/autotranslate.js | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/HISTORY.md b/HISTORY.md
index af7537c30ca..cc61672d602 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,6 +2,14 @@
## NEXT
+- [NEW] Permission `join-without-join-code` assigned to admins and bots by default (#6139)
+- [NEW] Integrations, both incoming and outgoing, now have access to the models. Example: `Users.findOneById(id)` (#6336)
+- [FIX] Incoming integrations would break when trying to use the `Store` feature.
+
+## 0.54.2 - 2017-Mar-24
+
+- [FIX] Auto Translate bug on Room Preview (#6355)
+
## 0.54.1 - 2017-Mar-23
- [FIX] Images on attachments were not loading except for uploaded files.
@@ -329,7 +337,7 @@
### Now uses NodeJS 4.7.0
-- Fix integration payload JSON.parse
+- Fix integration payload JSON.parse
## 0.48.0 - 2016-Dec-12
@@ -1059,7 +1067,7 @@
- Removing presence status computation from new room sound tracker
- Right sidebar animation cancelled on tab button clicked
- Save room's name as the livechat visitor name
-- Use HTML emails instead of Text-
+- Use HTML emails instead of Text-
## 0.30.0 - 2016-May-09
@@ -1308,7 +1316,7 @@
- Fix ROOT_URL_PATH_PREFIX and add tab base
- Fix text selection for cordova
- Fix to package file/versions: - Do not depend on specific version of ostrio:cookies to use newer versions with fixes - Update all packages with latest versions
-- Improve the unread mark calculator
+- Improve the unread mark calculator
- Misc fixes to allow running from subdirectory rather than root (/)
- Move i18n files to inside the lib package
- Prevent to open message menu for long press in links on mobile
diff --git a/packages/rocketchat-autotranslate/client/lib/autotranslate.js b/packages/rocketchat-autotranslate/client/lib/autotranslate.js
index fed98027850..1301993914f 100644
--- a/packages/rocketchat-autotranslate/client/lib/autotranslate.js
+++ b/packages/rocketchat-autotranslate/client/lib/autotranslate.js
@@ -7,7 +7,7 @@ RocketChat.AutoTranslate = {
if (rid) {
subscription = RocketChat.models.Subscriptions.findOne({ rid: rid }, { fields: { autoTranslateLanguage: 1 } });
}
- const language = subscription.autoTranslateLanguage || Meteor.user().language || window.defaultUserLanguage();
+ const language = subscription && subscription.autoTranslateLanguage || Meteor.user().language || window.defaultUserLanguage();
if (language.indexOf('-') !== -1) {
if (!_.findWhere(this.supportedLanguages, { language })) {
return language.substr(0, 2);
--
GitLab