diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index a750c7beef7e..9d185e6608c2 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 +ENV RC_VERSION 1.1.1 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 0b2735654d9c..4dfe81f5022b 100644 --- a/.github/history.json +++ b/.github/history.json @@ -31802,6 +31802,45 @@ ] } ] + }, + "1.1.1": { + "node_version": "8.11.4", + "npm_version": "6.4.1", + "mongo_versions": [ + "3.2", + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "14686", + "title": "[FIX] SAML login error.", + "userLogin": "Hudell", + "milestone": "1.1.1", + "contributors": [ + "Hudell" + ] + }, + { + "pr": "14668", + "title": "[FIX] Load messages after disconnect and message box scroll missing", + "userLogin": "ggazzo", + "milestone": "1.1.1", + "contributors": [ + "ggazzo" + ] + }, + { + "pr": "14674", + "title": "Removing unnecesary federation configs", + "userLogin": "alansikora", + "milestone": "1.1.1", + "contributors": [ + "alansikora" + ] + } + ] } } } \ No newline at end of file diff --git a/.travis/snap.sh b/.travis/snap.sh index fcb998faa2e9..96277f38c676 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_VERSION=1.1.1 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index 255ad9ac2bf9..68c7b201f8e7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,30 @@ +# 1.1.1 +`2019-05-30 ยท 2 ๐Ÿ› ยท 1 ๐Ÿ” ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `8.11.4` +- NPM: `6.4.1` +- MongoDB: `3.2, 3.4, 3.6, 4.0` + +### ๐Ÿ› Bug fixes + +- SAML login error. ([#14686](https://github.com/RocketChat/Rocket.Chat/pull/14686)) +- Load messages after disconnect and message box scroll missing ([#14668](https://github.com/RocketChat/Rocket.Chat/pull/14668)) + +
+๐Ÿ” Minor changes + +- Removing unnecesary federation configs ([#14674](https://github.com/RocketChat/Rocket.Chat/pull/14674)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@Hudell](https://github.com/Hudell) +- [@alansikora](https://github.com/alansikora) +- [@ggazzo](https://github.com/ggazzo) + # 1.1.0 `2019-05-27 ยท 5 ๐ŸŽ‰ ยท 10 ๐Ÿš€ ยท 52 ๐Ÿ› ยท 35 ๐Ÿ” ยท 27 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js index f212f5afb5a2..eedb919bd69e 100644 --- a/app/meteor-accounts-saml/server/saml_server.js +++ b/app/meteor-accounts-saml/server/saml_server.js @@ -119,14 +119,17 @@ Accounts.registerLoginHandler(function(loginRequest) { const fullName = loginResult.profile.cn || loginResult.profile.username || loginResult.profile.displayName; let eppnMatch = false; + let user = null; // Check eppn - let user = Meteor.users.findOne({ - eppn: eduPersonPrincipalName, - }); + if (eduPersonPrincipalName) { + user = Meteor.users.findOne({ + eppn: eduPersonPrincipalName, + }); - if (user) { - eppnMatch = true; + if (user) { + eppnMatch = true; + } } // If eppn is not exist diff --git a/app/ui-message/client/messageBox/messageBoxAutogrow.js b/app/ui-message/client/messageBox/messageBoxAutogrow.js index 99e6cf8006a2..06348dc729b7 100644 --- a/app/ui-message/client/messageBox/messageBoxAutogrow.js +++ b/app/ui-message/client/messageBox/messageBoxAutogrow.js @@ -34,7 +34,7 @@ export const setupAutogrow = (textarea: HTMLTextAreaElement, shadow: HTMLDivElem return true; } - const shadowText = text.replace(//g, '>') .replace(/&/g, '&') .replace(/\n$/, '
 ') @@ -56,7 +56,7 @@ export const setupAutogrow = (textarea: HTMLTextAreaElement, shadow: HTMLDivElem lastHeight = height; - const overflow = height === maxHeight ? 'hidden' : ''; + const overflow = height < maxHeight ? 'hidden' : ''; if (height < maxHeight) { textLenght = text.length; diff --git a/app/ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js index da0baff35596..30bcda015e99 100644 --- a/app/ui-utils/client/lib/RoomManager.js +++ b/app/ui-utils/client/lib/RoomManager.js @@ -10,13 +10,14 @@ import { fireGlobalEvent } from './fireGlobalEvent'; import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager'; import { mainReady } from './mainReady'; import { roomTypes } from '../../../utils'; -import { call } from '../..'; import { callbacks } from '../../../callbacks'; import { Notifications } from '../../../notifications'; import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models'; import { CachedCollectionManager } from '../../../ui-cached-collection'; import { getConfig } from '../config'; +import { call } from '..'; + const maxRoomsOpen = parseInt(getConfig('maxRoomsOpen')) || 5; diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 4f228d2b49b6..41621c16db81 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "1.1.0" + "version": "1.1.1" } diff --git a/package.json b/package.json index 51a9d81be7b8..6a7382cc05e9 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", + "version": "1.1.1", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js index 9b4975b73426..2dc6efd4e316 100644 --- a/server/startup/migrations/index.js +++ b/server/startup/migrations/index.js @@ -143,4 +143,6 @@ import './v142'; import './v143'; import './v144'; import './v145'; +import './v146'; +import './v147'; import './xrun'; diff --git a/server/startup/migrations/v147.js b/server/startup/migrations/v147.js new file mode 100644 index 000000000000..cb2bcc44f1e3 --- /dev/null +++ b/server/startup/migrations/v147.js @@ -0,0 +1,22 @@ +import { Migrations } from '../../../app/migrations/server'; +import { Settings } from '../../../app/models'; + +const validSettings = [ + 'FEDERATION_Discovery_Method', + 'FEDERATION_Domain', + 'FEDERATION_Enabled', + 'FEDERATION_Hub_URL', + 'FEDERATION_Public_Key', + 'FEDERATION_Status', + 'FEDERATION_Test_Setup', +]; + +Migrations.add({ + version: 147, + up() { + Settings.remove({ $and: [{ _id: /FEDERATION/ }, { _id: { $nin: validSettings } }] }); + }, + down() { + // Down migration does not apply in this case + }, +});