Merge branch 'release-candidate' into release-0.61.0

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.scripts/set-version.js
#	.travis/snap.sh
#	HISTORY.md
#	README.md
#	package.json
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
#	packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json
#	packages/rocketchat-markdown/package.js
#	packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
#	packages/rocketchat-theme/client/imports/general/variables.css
#	packages/rocketchat-ui/client/views/app/popover.html

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.60.4
+ENV RC_VERSION 0.61.0-rc.2
 
 MAINTAINER buildmaster@rocket.chat
 

.docker/Dockerfile.local

@@ -0,0 +1,20 @@
+FROM node:8
+
+ADD . /app
+
+ENV RC_VERSION=0.57.0-designpreview \
+    DEPLOY_METHOD=docker \
+    NODE_ENV=production \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000
+
+RUN set -x \
+ && cd /app/bundle/programs/server \
+ && npm install \
+ && npm cache clear --force
+
+WORKDIR /app/bundle
+
+EXPOSE 3000
+
+CMD ["node", "main.js"]

.drone.yml

@@ -0,0 +1,44 @@
+pipeline:
+  restore-cache:
+    image: drillster/drone-volume-cache
+    restore: true
+    mount:
+      - /drone/.meteor/
+      - ./node_modules
+      - ./.meteor/local
+    volumes:
+      - /tmp/cache/Rocket.Chat:/cache
+  build:
+    image: ubuntu:16.04
+    environment:
+      - METEOR_ALLOW_SUPERUSER=true
+    commands:
+      - apt update && apt install curl git python g++ build-essential bzip2 -y
+      - export HOME=/drone
+      - export PATH="/drone/.meteor:$PATH"
+      - if [ ! -e "/drone/.meteor/meteor" ]; then export HOME=/drone; curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh; fi
+      - which meteor
+      - meteor npm install
+      - set +e
+      - meteor add rocketchat:lib
+      - set -e
+      - mkdir /drone/build
+      - meteor build --allow-superuser --server-only --directory /drone/build
+      - cp .docker/Dockerfile.local /drone/build/Dockerfile
+  rebuild-cache:
+    image: drillster/drone-volume-cache
+    rebuild: true
+    mount:
+      - /drone/.meteor/
+      - ./node_modules
+      - ./.meteor/local
+    volumes:
+      - /tmp/cache/Rocket.Chat:/cache
+  docker:
+    image: plugins/docker
+    repo: rocketchat/rocket.chat
+    dockerfile: /drone/build/Dockerfile
+    storage_driver: overlay
+    context: /drone/build
+    secrets: [ docker_username, docker_password ]
+    tag: designpreview

.drone.yml.sig

@@ -0,0 +1 @@
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgcmVzdG9yZS1jYWNoZToKICAgIGltYWdlOiBkcmlsbHN0ZXIvZHJvbmUtdm9sdW1lLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLm1ldGVvci8KICAgICAgLSAuL25vZGVfbW9kdWxlcwogICAgICAtIC4vLm1ldGVvci9sb2NhbAogICAgdm9sdW1lczoKICAgICAgLSAvdG1wL2NhY2hlL1JvY2tldC5DaGF0Oi9jYWNoZQogIGJ1aWxkOgogICAgaW1hZ2U6IHVidW50dToxNi4wNAogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTUVURU9SX0FMTE9XX1NVUEVSVVNFUj10cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBhcHQgdXBkYXRlICYmIGFwdCBpbnN0YWxsIGN1cmwgZ2l0IHB5dGhvbiBnKysgYnVpbGQtZXNzZW50aWFsIGJ6aXAyIC15CiAgICAgIC0gZXhwb3J0IEhPTUU9L2Ryb25lCiAgICAgIC0gZXhwb3J0IFBBVEg9Ii9kcm9uZS8ubWV0ZW9yOiRQQVRIIgogICAgICAtIGlmIFsgISAtZSAiL2Ryb25lLy5tZXRlb3IvbWV0ZW9yIiBdOyB0aGVuIGV4cG9ydCBIT01FPS9kcm9uZTsgY3VybCBodHRwczovL2luc3RhbGwubWV0ZW9yLmNvbSB8IHNlZCBzLy0tcHJvZ3Jlc3MtYmFyLy1zTC9nIHwgL2Jpbi9zaDsgZmkKICAgICAgLSB3aGljaCBtZXRlb3IKICAgICAgLSBtZXRlb3IgbnBtIGluc3RhbGwKICAgICAgLSBzZXQgK2UKICAgICAgLSBtZXRlb3IgYWRkIHJvY2tldGNoYXQ6bGliCiAgICAgIC0gc2V0IC1lCiAgICAgIC0gbWtkaXIgL2Ryb25lL2J1aWxkCiAgICAgIC0gbWV0ZW9yIGJ1aWxkIC0tYWxsb3ctc3VwZXJ1c2VyIC0tc2VydmVyLW9ubHkgLS1kaXJlY3RvcnkgL2Ryb25lL2J1aWxkCiAgICAgIC0gY3AgLmRvY2tlci9Eb2NrZXJmaWxlLmxvY2FsIC9kcm9uZS9idWlsZC9Eb2NrZXJmaWxlCiAgcmVidWlsZC1jYWNoZToKICAgIGltYWdlOiBkcmlsbHN0ZXIvZHJvbmUtdm9sdW1lLWNhY2hlCiAgICByZWJ1aWxkOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLm1ldGVvci8KICAgICAgLSAuL25vZGVfbW9kdWxlcwogICAgICAtIC4vLm1ldGVvci9sb2NhbAogICAgdm9sdW1lczoKICAgICAgLSAvdG1wL2NhY2hlL1JvY2tldC5DaGF0Oi9jYWNoZQogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogcm9ja2V0Y2hhdC9yb2NrZXQuY2hhdAogICAgZG9ja2VyZmlsZTogL2Ryb25lL2J1aWxkL0RvY2tlcmZpbGUKICAgIHN0b3JhZ2VfZHJpdmVyOiBvdmVybGF5CiAgICBjb250ZXh0OiAvZHJvbmUvYnVpbGQKICAgIHNlY3JldHM6IFsgZG9ja2VyX3VzZXJuYW1lLCBkb2NrZXJfcGFzc3dvcmQgXQogICAgdGFnOiBkZXNpZ25wcmV2aWV3Cg.vIwnazoqiKfxsC6hQHJFmB7jE0dvewf69xJgNxUWNic

.eslintignore

@@ -5,7 +5,7 @@ packages/meteor-timesync/
 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/node_modules
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
 packages/rocketchat-migrations/

.github/bot-config.yml

@@ -0,0 +1,13 @@
+bot:
+  name: "@rocket-cat"
+whitelist:
+  users:
+    - TwizzyDizzy
+    - theorenck
+  labels:
+    - duplicate
+    - enhancement
+    - "help wanted"
+    - invalid
+    - question
+    - wontfix

.meteor/versions

@@ -1,11 +1,11 @@
-accounts-base@1.4.0
-accounts-facebook@1.3.0
-accounts-github@1.4.0
-accounts-google@1.3.0
-accounts-meteor-developer@1.4.0
+accounts-base@1.4.2
+accounts-facebook@1.3.1
+accounts-github@1.4.1
+accounts-google@1.3.1
+accounts-meteor-developer@1.4.1
 accounts-oauth@1.1.15
 accounts-password@1.5.0
-accounts-twitter@1.4.0
+accounts-twitter@1.4.1
 aldeed:simple-schema@1.5.3
 allow-deny@1.1.0
 autoupdate@1.3.12
@@ -103,16 +103,16 @@ nimble:restivus@0.8.12
 nooitaf:colors@1.1.2_1
 npm-bcrypt@0.9.3
 npm-mongo@2.2.33
-oauth@1.2.0
+oauth@1.2.1
 oauth1@1.2.0
 oauth2@1.2.0
 observe-sequence@1.0.16
 ordered-dict@1.0.9
 ostrio:cookies@2.2.4
-pauli:accounts-linkedin@2.1.3
+pauli:accounts-linkedin@2.1.5
 pauli:linkedin-oauth@1.2.0
 percolate:synced-cron@1.3.2
-promise@0.10.0
+promise@0.10.1
 raix:eventemitter@0.1.3
 raix:eventstate@0.0.4
 raix:handlebar-helpers@0.2.5

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.60.4"),
+		appMarketingVersion = (defaultText = "0.61.0-rc.2"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.scripts/set-version.js

@@ -55,13 +55,13 @@ git.status()
 	if (status.current === 'release-candidate') {
 		return semver.inc(pkgJson.version, 'prerelease', 'rc');
 	}
-	if (status.current === 'release-0.60.2') {
+	if (/release-\d+\.\d+\.\d+/.test(status.current)) {
 		return semver.inc(pkgJson.version, 'patch');
 	}
-	if (status.current === 'develop') {
-		return semver.inc(semver.inc(pkgJson.version, 'minor'), 'minor')+'-develop';
+	if (status.current === 'develop-sync') {
+		return semver.inc(pkgJson.version, 'minor') + '-develop';
 	}
-	return Promise.reject(`No relea se action for branch ${ status.current }`);
+	return Promise.reject(`No release action for branch ${ status.current }`);
 })
 .then(nextVersion => inquirer.prompt([{
 	type: 'list',

.travis.yml

@@ -32,8 +32,8 @@ cache:
   - "$HOME/build/RocketChat/Rocket.Chat/node_modules"
   - "$HOME/build/RocketChat/Rocket.Chat/.meteor/local"
   - "$HOME/build/RocketChat/Rocket.Chat/packages/rocketchat-livechat/.npm"
-  - "$HOME/build/RocketChat/Rocket.Chat/packages/rocketchat-livechat/app/node_modules"
-  - "$HOME/build/RocketChat/Rocket.Chat/packages/rocketchat-livechat/app/.meteor/local"
+  - "$HOME/build/RocketChat/Rocket.Chat/packages/rocketchat-livechat/.app/node_modules"
+  - "$HOME/build/RocketChat/Rocket.Chat/packages/rocketchat-livechat/.app/.meteor/local"
 before_install:
 - if [ ! -e "$HOME/.meteor/meteor" ]; then curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh; fi
 # Start X Virtual Frame Buffer for headless testing with real browsers

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.60.4
+    RC_VERSION=0.61.0-rc.2
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"