merge develop into tmp2 (forward messages.new)

.docker-mongo/Dockerfile

@@ -6,8 +6,8 @@ ADD entrypoint.sh /app/bundle/
 MAINTAINER buildmaster@rocket.chat
 
 RUN set -x \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
- && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list \
+ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
+ && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
  && apt-get update \
  && apt-get install -y --force-yes pwgen mongodb-org \
  && echo "mongodb-org hold" | dpkg --set-selections \

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.73.0-develop
+ENV RC_VERSION 1.1.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

.eslintignore

@@ -2,23 +2,24 @@ node_modules
 packages/autoupdate/
 packages/meteor-streams/
 packages/meteor-timesync/
-packages/rocketchat-emoji-emojione/generateEmojiIndex.js
-packages/rocketchat-favico/favico.js
-packages/rocketchat-katex/client/katex/katex.min.js
+app/emoji-emojione/generateEmojiIndex.js
+app/favico/favico.js
+app/katex/client/katex/katex.min.js
 packages/rocketchat-livechat/.app/node_modules
 packages/rocketchat-livechat/.app/.meteor
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
-packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
-packages/rocketchat_theme/client/vendor/
-packages/rocketchat-ui/client/lib/customEventPolyfill.js
-packages/rocketchat-ui/client/lib/Modernizr.js
-packages/rocketchat-ui/client/lib/recorderjs/recorder.js
-packages/rocketchat-videobridge/client/public/external_api.js
+app/theme/client/minicolors/jquery.minicolors.js
+app/theme/client/vendor/
+app/ui/client/lib/customEventPolyfill.js
+app/ui/client/lib/Modernizr.js
+public/mp3-realtime-worker.js
+public/lame.min.js
+public/packages/rocketchat_videobridge/client/public/external_api.js
 packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
 private/moment-locales/
 public/livechat/
-public/mp3-realtime-worker.js
-public/lame.min.js
 !.scripts
 !packages/rocketchat-livechat/.app
+public/pdf.worker.min.js
+imports/client/

.eslintrc

@@ -2,46 +2,10 @@
 	"extends": ["@rocket.chat/eslint-config"],
 	"parser": "babel-eslint",
 	"globals": {
+		"__meteor_bootstrap__"        : false,
 		"__meteor_runtime_config__"   : false,
-		"AccountBox"                  : false,
-		"AgentUsers"                  : false,
-		"Apps"                        : false,
 		"Assets"                      : false,
-		"browser"                     : false,
-		"ChatMessage"                 : false,
-		"ChatMessages"                : false,
-		"ChatRoom"                    : false,
-		"ChatSubscription"            : false,
-		"Department"                  : false,
-		"FileUpload"                  : false,
-		"getNextAgent"                : false,
-		"handleError"                 : false,
-		"getAvatarUrlFromUsername"    : false,
-		"LivechatCustomField"         : false,
-		"LivechatDepartment"          : false,
-		"LivechatDepartmentAgents"    : false,
-		"livechatManagerRoutes"       : true,
-		"LivechatMonitoring"          : false,
-		"LivechatPageVisited"         : false,
-		"LivechatTrigger"             : false,
-		"Logger"                      : false,
-		"modal"                       : false,
-		"Npm"                         : false,
-		"Package"                     : false,
-		"parentCall"                  : false,
-		"RocketChat"                  : true,
-		"RoomHistoryManager"          : false,
-		"RoomManager"                 : false,
-		"ServiceConfiguration"        : false,
-		"Settings"                    : false,
-		"SideNav"                     : false,
-		"t"                           : false,
-		"TimeSync"                    : false,
-		"toastr"                      : false,
-		"Trigger"                     : false,
-		"Triggers"                    : false,
-		"visitor"                     : false,
-		"VideoRecorder"               : false,
-		"VRecDialog"                  : false
+		"chrome"                      : false,
+		"jscolor"                     : false
 	}
 }