Merge pull request RocketChat#539 from assistify/merge/0.70.0

Merge Rocket.Chat 0.70.0

.circleci/config.yml

@@ -60,7 +60,6 @@ jobs:
           name: Lint
           command: |
             meteor npm run lint
-            meteor npm run stylelint
 
       - run:
           name: Unit Test

.docker-mongo/entrypoint.sh

@@ -1,5 +1,35 @@
 #!/bin/bash
 
+echo """
+
+               
+                      
+                      
+                                
+                                             
+                                                          
+                                                         
+                                                         
+                                                    
+                                                    
+                                                    
+                                                            
+                                                               
+                                                               
+                                                          
+                                                            
+                                                         
+                                           
+                                           
+                                
+                           
+                
+
+
+
+
+"""
+
 echo """
 ██████╗  ██████╗  ██████╗██╗  ██╗███████╗████████╗ ██████╗██╗  ██╗ █████╗ ████████╗    ██████╗ ██████╗ ███████╗██╗   ██╗██╗███████╗██╗    ██╗
 ██╔══██╗██╔═══██╗██╔════╝██║ ██╔╝██╔════╝╚══██╔══╝██╔════╝██║  ██║██╔══██╗╚══██╔══╝    ██╔══██╗██╔══██╗██╔════╝██║   ██║██║██╔════╝██║    ██║

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.68.5
+ENV RC_VERSION 0.70.4
 
 MAINTAINER [email protected]
 

.eslintignore

@@ -6,13 +6,13 @@ packages/rocketchat-emoji-emojione/generateEmojiIndex.js
 packages/rocketchat-favico/favico.js
 packages/rocketchat-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-ui/client/lib/customEventPolyfill.js
 packages/rocketchat-ui/client/lib/Modernizr.js
 packages/rocketchat-ui/client/lib/recorderjs/recorder.js
-packages/rocketchat-ui/client/lib/textarea-autogrow.js
 packages/rocketchat-videobridge/client/public/external_api.js
 packages/rocketchat-theme/client/vendor/
 packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
@@ -21,3 +21,4 @@ public/livechat/
 public/mp3-realtime-worker.js
 public/lame.min.js
 !.scripts
+!packages/rocketchat-livechat/.app

.eslintrc

@@ -1,93 +1,5 @@
 {
-	"parserOptions": {
-		"sourceType": "module",
-		"ecmaVersion": 2017,
-		"ecmaFeatures": {
-				"experimentalObjectRestSpread" : true
-		}
-	},
-	"env": {
-		"browser": true,
-		"commonjs": true,
-		"es6": true,
-		"node": true,
-		"jquery": true
-	},
-	"rules": {
-		"no-multi-spaces": 2,
-		"no-eval": 2,
-		"no-extend-native": 2,
-		"no-multi-str": 2,
-		"no-use-before-define": 2,
-		"no-const-assign": 2,
-		"no-cond-assign": 2,
-		"no-constant-condition": 2,
-		"no-control-regex": 2,
-		"no-debugger": 2,
-		"no-delete-var": 2,
-		"no-dupe-keys": 2,
-		"no-dupe-args": 2,
-		"no-dupe-class-members": 2,
-		"no-duplicate-case": 2,
-		"no-empty": 2,
-		"no-empty-character-class": 2,
-		"no-ex-assign": 2,
-		"no-extra-boolean-cast": 2,
-		"no-extra-semi": 2,
-		"no-fallthrough": 2,
-		"no-func-assign": 2,
-		"no-inner-declarations": [2, "functions"],
-		"no-invalid-regexp": 2,
-		"no-irregular-whitespace": 2,
-		"no-mixed-spaces-and-tabs": 2,
-		"no-sparse-arrays": 2,
-		"no-negated-in-lhs": 2,
-		"no-obj-calls": 2,
-		"no-octal": 2,
-		"no-redeclare": 2,
-		"no-regex-spaces": 2,
-		"no-undef": 2,
-		"no-unreachable": 2,
-		"no-unused-vars": [2, {
-			"vars": "all",
-			"args": "after-used"
-		}],
-		"no-void": 2,
-		"no-var": 2,
-		"one-var": [2, "never"],
-		"no-lonely-if": 2,
-		"no-trailing-spaces": 2,
-		"complexity": [1, 31],
-		"space-in-parens": [2, "never"],
-		"space-before-function-paren": [2, "never"],
-		"space-before-blocks": [2, "always"],
-		"indent": [2, "tab", {"SwitchCase": 1}],
-		"eol-last": [2, "always"],
-		"comma-dangle": [2, "never"],
-		"keyword-spacing": 2,
-		"block-spacing": 2,
-		"brace-style": [2, "1tbs", { "allowSingleLine": true }],
-		"computed-property-spacing": 2,
-		"comma-spacing": 2,
-		"comma-style": 2,
-		"guard-for-in": 2,
-		"wrap-iife": 2,
-		"block-scoped-var": 2,
-		"curly": [2, "all"],
-		"eqeqeq": [2, "allow-null"],
-		"new-cap":  [2, {
-			"capIsNewExceptions": ["Match.Optional", "Match.Maybe", "Match.OneOf", "Match.Where", "Match.ObjectIncluding", "Push.Configure", "SHA256"]
-		}],
-		"use-isnan": 2,
-		"valid-typeof": 2,
-		"linebreak-style": [2, "unix"],
-		"prefer-template": 2,
-		"template-curly-spacing": [2, "always"],
-		"quotes": [2, "single"],
-		"semi": [2, "always"],
-		"prefer-const": 2,
-		"object-shorthand": 2
-	},
+	"extends": ["@rocket.chat/eslint-config"],
 	"globals": {
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
@@ -118,6 +30,7 @@
 		"LivechatDepartment"          : false,
 		"LivechatDepartmentAgents"    : false,
 		"livechatManagerRoutes"       : true,
+		"LivechatMonitoring"          : false,      
 		"LivechatPageVisited"         : false,
 		"LivechatTrigger"             : false,
 		"Logger"                      : false,

.github/bot-config.yml

@@ -5,6 +5,7 @@ whitelist:
     - TwizzyDizzy
     - theorenck
     - JSzaszvari
+    - reetp
   labels:
     - "Contributions: welcome"
     - "Contributions: only core team"