Merge branch 'goalify'

* goalify: (104 commits)
  Regression: Various search provider fixes (RocketChat#10591)
  Supplement TOS and privacy policy texts for use within server instances
  Fix /api/v1/settings.oauth not sending needed info for SAML & CAS (RocketChat#10596)
  Fix the Apps and Livechats not getting along well with each other (RocketChat#10598)
  [FIX] Missing "Administration" menu for users with some administration permissions (RocketChat#10551)
  [FIX] Member list search with no results (RocketChat#10599)
  merge vi-VN and vi json
  Add and enhance translations
  Update gitlab, npm package lock, include current server update script
  Adds Visual Studio Code debugging configuration (RocketChat#10586)
  [FIX] Integrations with room data not having the usernames filled in (RocketChat#10576)
  fixed problems with margin negative (RocketChat#10558)
  Add some information regarding Zapier and Bots to the integrations page (RocketChat#10574)
  Added target="_blank" to homepage and support link. (RocketChat#10575)
  [FIX] Stop Firefox announcement overflowing viewport (RocketChat#10503)
  [FIX] Wordpress oAuth authentication wasn't behaving correctly (RocketChat#10550)
  Fix inconsistent response of settings.oauth endpoint (RocketChat#10553)
  Regression: Remove added mentions on quote/reply (RocketChat#10571)
  Fix the attachments and fields incorrectly failing on validation (RocketChat#10573)
  Deps update (RocketChat#10549)
  ...

.docker/Dockerfile.rhel

@@ -0,0 +1,44 @@
+FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
+
+ENV RC_VERSION 0.64.0-develop
+
+MAINTAINER [email protected]
+
+LABEL name="Rocket.Chat" \
+      vendor="Rocket.Chat" \
+      version="${RC_VERSION}" \
+      release="1" \
+      url="https://rocket.chat" \
+      summary="The Ultimate Open Source Web Chat Platform" \
+      description="The Ultimate Open Source Web Chat Platform" \
+      run="docker run -d --name ${NAME} ${IMAGE}"
+
+
+# This is ugly... But for some reason npm and node aren't available at this stage.
+ENV PATH /opt/rh/rh-nodejs8/root/usr/bin:/opt/app-root/src/node_modules/.bin/:/opt/app-root/src/.npm-global/bin/:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+RUN set -x \
+ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+ && gpg --verify rocket.chat.tgz.asc \
+ && tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
+ && cd /opt/app-root/src/bundle/programs/server \
+ && npm install
+
+COPY licenses /licenses
+
+VOLUME /opt/app-root/src/uploads
+
+WORKDIR /opt/app-root/src/bundle
+
+ENV DEPLOY_METHOD=docker-redhat \
+    NODE_ENV=production \
+    MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000
+
+EXPOSE 3000
+
+CMD ["node", "main.js"]

.docker/licenses/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

.eslintignore

@@ -8,7 +8,6 @@ packages/rocketchat-katex/client/katex/katex.min.js
 packages/rocketchat-livechat/.app/node_modules
 packages/rocketchat-livechat/assets/*.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
-packages/rocketchat-migrations/
 packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
 packages/rocketchat-ui/client/lib/customEventPolyfill.js
 packages/rocketchat-ui/client/lib/Modernizr.js

.eslintrc

@@ -76,7 +76,7 @@
 		"curly": [2, "all"],
 		"eqeqeq": [2, "allow-null"],
 		"new-cap":  [2, {
-			"capIsNewExceptions": ["Match.Optional", "Match.Maybe", "Match.ObjectIncluding", "Push.Configure", "SHA256"]
+			"capIsNewExceptions": ["Match.Optional", "Match.Maybe", "Match.OneOf", "Match.Where", "Match.ObjectIncluding", "Push.Configure", "SHA256"]
 		}],
 		"use-isnan": 2,
 		"valid-typeof": 2,

.github/history.json

@@ -12207,5 +12207,62 @@
         "web-flow"
       ]
     }
+  ],
+  "0.63.2": [
+    {
+      "pr": "10475",
+      "title": "[FIX] Even TypeErrors with SAML",
+      "userLogin": "graywolf336",
+      "contributors": [
+        "graywolf336"
+      ]
+    },
+    {
+      "pr": "10408",
+      "title": "add redhat dockerfile to master",
+      "userLogin": "geekgonecrazy",
+      "contributors": [
+        "geekgonecrazy"
+      ]
+    }
+  ],
+  "0.63.3": [
+    {
+      "pr": "10485",
+      "title": "[FIX] The 'channel.messages' REST API Endpoint error",
+      "userLogin": "rafaelks",
+      "milestone": "0.64.0",
+      "contributors": [
+        "rafaelks",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10218",
+      "title": "Added one2mail.info to default blocked domains list",
+      "userLogin": "nsuchy",
+      "milestone": "0.64.0",
+      "contributors": [
+        "nsuchy",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10476",
+      "title": "Release 0.63.2",
+      "userLogin": "graywolf336",
+      "contributors": [
+        "graywolf336",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10475",
+      "title": "[FIX] Even TypeErrors with SAML",
+      "userLogin": "graywolf336",
+      "contributors": [
+        "graywolf336"
+      ]
+    }
   ]
-}
+}

.gitignore

@@ -2,6 +2,7 @@
 **/build/*
 **/node_modules/*
 **/tmp/*
+**/.meteor/.id
 **/.meteor/dev_bundle
 **/.meteor/local*
 **/.meteor/meteorite
@@ -73,3 +74,5 @@ pm2.json
 settings.json
 build.sh
 /public/livechat
+packages/rocketchat-i18n/i18n/livechat.*
+yarn.lock

.gitlab-ci.yml

@@ -27,9 +27,8 @@ stages:
 
 test:
   stage: test
-  only:
-    - develop
-    - goalify
+  except:
+    - master
   script:
     - npm install
     - npm run lint
@@ -41,6 +40,9 @@ build:
   stage: build
   only:
     - master
+  before_script:
+    # Remove previous output
+    - rm -rf $OUTPUT || true
   script:
     # Install meteor VM (not applicable for shell executor)
     # - if [ ! -e "/usr/local/bin/meteor" ]; then curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh; fi
@@ -53,9 +55,6 @@ build:
     - cd $OUTPUT
     - mv Goalify.Chat.tar.gz goalify-chat-server.tar.gz
     - aws s3 cp *.gz s3://goalify.chat/downloads/beta/
-    # Remove output
-    - cd ..
-    - rm -r $OUTPUT
   artifacts:
     paths:
       - build/*.gz

.meteor/packages

@@ -146,6 +146,7 @@ rocketchat:ui-master
 rocketchat:ui-message
 rocketchat:ui-sidenav
 rocketchat:ui-vrecord
+rocketchat:user-data-download
 rocketchat:version
 rocketchat:videobridge
 rocketchat:webrtc
@@ -185,3 +186,6 @@ todda00:friendly-slugs
 yasaricli:slugify
 yasinuslu:blaze-meta
 rocketchat:version-check
+
+rocketchat:search
+chatpal:search

.meteor/versions

@@ -21,6 +21,7 @@ [email protected]
 [email protected]
 [email protected]
 cfs:[email protected]
+chatpal:[email protected]
 [email protected]
 [email protected]
 dandv:[email protected]
@@ -43,7 +44,7 @@ [email protected]
 [email protected]
 emojione:[email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 francocatena:[email protected]
 [email protected]
@@ -52,7 +53,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 jalik:[email protected]
 jalik:[email protected]
@@ -92,7 +93,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].5
+[email protected].7
 [email protected]
 [email protected]
 [email protected]
@@ -200,6 +201,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]
@@ -235,6 +237,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]

.scripts/set-version.js

@@ -25,6 +25,7 @@ const files = [
 	'./.circleci/snap.sh',
 	'./.circleci/update-releases.sh',
 	'./.docker/Dockerfile',
+	'./.docker/Dockerfile.rhel',
 	'./packages/rocketchat-lib/rocketchat.info'
 ];
 const readFile = (file) => {

.vscode/launch.json

@@ -0,0 +1,94 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Attach to meteor debug",
+			"type": "node",
+			"request": "attach",
+			"port": 9229,
+			"address": "localhost",
+			"restart": false,
+			"sourceMaps": true,
+			"sourceMapPathOverrides": {
+				"meteor://💻app/packages/rocketchat:*": "${workspaceFolder}/packages/rocketchat-*"
+			},
+			"protocol": "inspector"
+		},
+		{
+			"type": "chrome",
+			"request": "launch",
+			"name": "Frontend (Chrome)",
+			"url": "http://localhost:3000",
+			"webRoot": "${workspaceFolder}",
+			"sourceMapPathOverrides": {
+				"meteor://💻app/packages/rocketchat:*": "${workspaceFolder}/packages/rocketchat-*"
+			}
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Server (debug)",
+			"runtimeExecutable": "npm",
+			"runtimeArgs": [
+				"run",
+				"debug"
+			],
+			"port": 9229,
+			"timeout": 300000, //Rocket.Chat really takes some time to startup, so play it safe
+			"sourceMapPathOverrides": {
+				"meteor://💻app/packages/rocketchat:*": "${workspaceFolder}/packages/rocketchat-*"
+			},
+			"protocol": "inspector",
+			"env": {
+				"USE_UNRELEASED_ROCKETAPPS_FRAMEWORK": "true"
+			}
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Server (debug-brk)",
+			"runtimeExecutable": "npm",
+			"runtimeArgs": [
+				"run",
+				"debug-brk"
+			],
+			"port": 9229,
+			"timeout": 300000, //Rocket.Chat really takes some time to startup, so play it safe
+			"sourceMapPathOverrides": {
+				"meteor://💻app/packages/rocketchat:*": "${workspaceFolder}/packages/rocketchat-*"
+			},
+			"protocol": "inspector",
+			"env": {
+				"USE_UNRELEASED_ROCKETAPPS_FRAMEWORK": "true"
+			}
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Server (Testmode)",
+			"runtimeExecutable": "npm",
+			"runtimeArgs": [
+				"run",
+				"debug"
+			],
+			"port": 9229,
+			"timeout": 300000, //Rocket.Chat really takes some time to startup, so play it safe
+			"sourceMapPathOverrides": {
+				"meteor://💻app/packages/rocketchat:*": "${workspaceFolder}/packages/rocketchat-*"
+			},
+			"env": {
+				"TEST_MODE": "true"
+			},
+			"protocol": "inspector"
+		}
+	],
+	"compounds": [
+		{
+			"name": "Server + Frontend",
+			"configurations": [
+				"Server (debug-brk)",
+				"Frontend (Chrome)"
+			]
+		}
+	]
+}