Merge remote-tracking branch 'origin/develop' into saml-logout

# Conflicts:
#	package-lock.json

.meteor/packages

@@ -5,41 +5,42 @@
 
 rocketchat:cors
 
-[email protected].0
-[email protected].0
-[email protected].0
-[email protected].0
+[email protected].1
+[email protected].1
+[email protected].1
+[email protected].1
 [email protected]
-[email protected].0
+[email protected].1
 blaze-html-templates
-check@1.2.5
+check@1.3.0
 [email protected]
-ddp-common@1.3.0
-dynamic-import@0.2.0
-ecmascript@0.9.0
+ddp-common@1.4.0
+dynamic-import@0.3.0
+ecmascript@0.10.0
 [email protected]
 [email protected]
 [email protected]
-http@1.3.0
+http@1.4.0
 [email protected]
 [email protected]
-meteor-base@1.2.0
+meteor-base@1.3.0
 [email protected]
-mongo@1.3.1
-random@1.0.10
+mongo@1.4.2
+random@1.1.0
 [email protected]
 [email protected]
 [email protected]
-reload@1.1.11
+reload@1.2.0
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 spacebars
-standard-minifier-js@2.2.0
+standard-minifier-js@2.3.1
 [email protected]
 
 rocketchat:2fa
 rocketchat:action-links
+rocketchat:accounts
 rocketchat:analytics
 rocketchat:api
 rocketchat:assets
@@ -67,6 +68,11 @@ rocketchat:github-enterprise
 rocketchat:gitlab
 #rocketchat:google-natural-language
 rocketchat:google-vision
+rocketchat:grant
+rocketchat:grant-facebook
+rocketchat:grant-github
+rocketchat:grant-google
+rocketchat:graphql
 rocketchat:highlight-words
 rocketchat:iframe-login
 rocketchat:importer
@@ -83,6 +89,7 @@ rocketchat:katex
 rocketchat:ldap
 rocketchat:lib
 rocketchat:livechat
+rocketchat:livestream
 rocketchat:logger
 rocketchat:login-token
 rocketchat:mailer

.meteor/release

@@ -1 +1 @@
-[email protected].0.1
+[email protected]

.meteor/versions

@@ -8,41 +8,41 @@ [email protected]
 [email protected]
 aldeed:[email protected]
 [email protected]
-autoupdate@1.3.12
-babel-compiler@6.24.7
-babel-runtime@1.1.1
-[email protected].10
+autoupdate@1.4.0
+babel-compiler@7.0.4
+babel-runtime@1.2.2
+[email protected].11
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-boilerplate-generator@1.3.1
-[email protected].9
+boilerplate-generator@1.4.0
+[email protected].11
 [email protected]
-callback-hook@1.0.10
+callback-hook@1.1.0
 cfs:[email protected]
-[email protected]
-[email protected]_3
-[email protected]_3
+[email protected]
+[email protected]
 dandv:[email protected]
 [email protected]
-ddp-client@2.2.0
-ddp-common@1.3.0
+ddp-client@2.3.1
+ddp-common@1.4.0
 [email protected]
-[email protected].1
+[email protected].2
 deepwell:[email protected]
 [email protected]
-diff-sequence@1.0.7
+diff-sequence@1.1.0
 dispatch:[email protected]
-dynamic-import@0.2.1
-ecmascript@0.9.0
+dynamic-import@0.3.0
+ecmascript@0.10.4
 [email protected]
-ecmascript-runtime-client@0.5.0
+ecmascript-runtime-client@0.6.2
 [email protected]
 edgee:[email protected]
 [email protected]
 [email protected]
 emojione:[email protected]
+[email protected]
 [email protected]
 [email protected]
 francocatena:[email protected]
@@ -52,15 +52,15 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-http@1.3.0
-id-map@1.0.9
+http@1.4.0
+id-map@1.1.0
 jalik:[email protected]_1
 jalik:[email protected]
 jalik:[email protected]
 jparker:[email protected]
 jparker:[email protected]
 jparker:[email protected]
-[email protected].10
+[email protected].11
 kadira:[email protected]
 kadira:[email protected]
 keepnox:[email protected]
@@ -72,28 +72,28 @@ konecty:[email protected]
 konecty:[email protected]
 konecty:[email protected]
 [email protected]
-[email protected].11
+[email protected].12
 [email protected]
 [email protected]
 [email protected]
 matb33:[email protected]
 mdg:[email protected]
 [email protected]
-meteor-base@1.2.0
+meteor-base@1.3.0
 [email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 meteorspark:[email protected]
-minifier-css@1.2.16
-minifier-js@2.2.2
+minifier-css@1.3.1
+minifier-js@2.3.2
 [email protected]
 mizzao:[email protected]
 mizzao:[email protected]
 [email protected]
 [email protected]
-[email protected].2
-[email protected].1
-mongo@1.3.1
+[email protected].4
+[email protected].2
+mongo@1.4.3
 [email protected]
 [email protected]
 [email protected]
@@ -102,29 +102,30 @@ mystor:[email protected]
 nimble:[email protected]
 nooitaf:[email protected]_1
 [email protected]
-[email protected].33
+[email protected].34
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-ordered-dict@1.0.9
+ordered-dict@1.1.0
 ostrio:[email protected]
 pauli:[email protected]
 pauli:[email protected]
 percolate:[email protected]
-[email protected].1
+[email protected].2
 raix:[email protected]
 raix:[email protected]
 raix:[email protected]
 raix:[email protected]
 raix:[email protected]
-random@1.0.10
-[email protected].8
+random@1.1.0
+[email protected].9
 [email protected]
 [email protected]
-reload@1.1.11
-retry@1.0.9
+reload@1.2.0
+retry@1.1.0
 rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
@@ -153,6 +154,11 @@ rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
@@ -170,6 +176,7 @@ rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
@@ -232,16 +239,20 @@ rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
 simple:[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
-standard-minifier-js@2.2.3
+standard-minifier-js@2.3.2
 steffo:[email protected]
+swydo:[email protected]
 tap:[email protected]
 [email protected]
 [email protected]
@@ -252,8 +263,8 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-url@1.1.0
-webapp@1.4.0
+url@1.2.0
+webapp@1.5.0
 [email protected]
 yasaricli:[email protected]
 yasinuslu:[email protected]

README.md

@@ -297,6 +297,7 @@ It is a great solution for communities and companies wanting to privately host t
 - File Upload / Sharing
 - Scalable file sharing - S3 uploads with CDN downloads
 - Full text search
+- Global search (from all channels/rooms at once)
 - Live chat / Messaging call center
 - LDAP Authentication
 - CAS 1.0, 2.0 support for educational institutions and hosting providers worldwide

client/notifications/notification.js

@@ -29,6 +29,7 @@ Meteor.startup(function() {
 				// This logic is duplicated in /client/startup/unread.coffee.
 				const hasFocus = readMessage.isEnable();
 				const messageIsInOpenedRoom = openedRoomId === notification.payload.rid;
+				const muteFocusedConversations = RocketChat.getUserPreference(Meteor.user(), 'muteFocusedConversations');
 
 				fireGlobalEvent('notification', {
 					notification,
@@ -42,10 +43,13 @@ Meteor.startup(function() {
 						KonchatNotification.newMessage(notification.payload.rid);
 						KonchatNotification.showDesktop(notification);
 					}
-				} else if (!(hasFocus && messageIsInOpenedRoom)) {
+				} else if (!hasFocus || !messageIsInOpenedRoom) {
 					// Play a sound and show a notification.
 					KonchatNotification.newMessage(notification.payload.rid);
 					KonchatNotification.showDesktop(notification);
+				} else if (!muteFocusedConversations) {
+					// Play a notification sound
+					KonchatNotification.newMessage(notification.payload.rid);
 				}
 			});
 
@@ -56,14 +60,15 @@ Meteor.startup(function() {
 				// This logic is duplicated in /client/startup/unread.coffee.
 				const hasFocus = readMessage.isEnable();
 				const messageIsInOpenedRoom = openedRoomId === notification.payload.rid;
+				const muteFocusedConversations = RocketChat.getUserPreference(Meteor.user(), 'muteFocusedConversations');
 
 				if (RocketChat.Layout.isEmbedded()) {
 					if (!hasFocus && messageIsInOpenedRoom) {
-						// Play a sound and show a notification.
+						// Play a notification sound
 						KonchatNotification.newMessage(notification.payload.rid);
 					}
-				} else if (!(hasFocus && messageIsInOpenedRoom)) {
-					// Play a sound and show a notification.
+				} else if (!hasFocus || !messageIsInOpenedRoom || !muteFocusedConversations) {
+					// Play a notification sound
 					KonchatNotification.newMessage(notification.payload.rid);
 				}
 			});

graphql.config.json

@@ -0,0 +1,9 @@
+{
+  "schema": {
+    "request": {
+      "url" : "http://localhost:3000/api/graphql",
+      "method" : "POST",
+      "postIntrospectionQuery" : true
+    }
+  }
+}