Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

.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

.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/packages

@@ -40,6 +40,7 @@ tracker@1.1.3
 
 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/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
@@ -125,6 +125,7 @@ reactive-var@1.0.11
 reload@1.1.11
 retry@1.0.9
 rocketchat:2fa@0.0.1
+rocketchat:accounts@0.0.1
 rocketchat:action-links@0.0.1
 rocketchat:analytics@0.0.2
 rocketchat:api@0.0.1
@@ -153,6 +154,11 @@ rocketchat:file-upload@0.0.1
 rocketchat:github-enterprise@0.0.1
 rocketchat:gitlab@0.0.1
 rocketchat:google-vision@0.0.1
+rocketchat:grant@0.0.1
+rocketchat:grant-facebook@0.0.1
+rocketchat:grant-github@0.0.1
+rocketchat:grant-google@0.0.1
+rocketchat:graphql@0.0.1
 rocketchat:highlight-words@0.0.1
 rocketchat:i18n@0.0.1
 rocketchat:iframe-login@1.0.0
@@ -170,6 +176,7 @@ rocketchat:katex@0.0.1
 rocketchat:ldap@0.0.1
 rocketchat:lib@0.0.1
 rocketchat:livechat@0.0.1
+rocketchat:livestream@0.0.5
 rocketchat:logger@0.0.1
 rocketchat:login-token@1.0.0
 rocketchat:mailer@0.0.1
@@ -242,6 +249,7 @@ spacebars-compiler@1.1.3
 srp@1.0.10
 standard-minifier-js@2.2.3
 steffo:meteor-accounts-saml@0.0.1
+swydo:graphql@0.0.3
 tap:i18n@1.8.2
 templating@1.3.2
 templating-compiler@1.3.3

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
+Copyright (c) 2015-2018 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

README.md

@@ -318,8 +318,8 @@ It is a great solution for communities and companies wanting to privately host t
 - Chat-ops powered by Hubot: scalable horizontal app integration (early access)
 - Massively scalable hosting and provisioning (beta testing now)
 - Native Cross-Platform Desktop Application [Windows, macOS, or Linux](https://rocket.chat/)
-- Mobile app for iPhone, iPad, and iPod touch [Download on App Store](https://geo.itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8)
-- Mobile app for Android phone, tablet, and TV stick [Available now on Google Play](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
+- Mobile app for iPhone, iPad, and iPod touch [Download on App Store](https://geo.itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8)
+- Mobile app for Android phone, tablet, and TV stick [Available now on Google Play](https://play.google.com/store/apps/details?id=chat.rocket.android)
 - Native Firefox OS Application (also for Desktop Firefox and Firefox for Android) - [Check the docs page for install instructions](https://docs.rocket.chat/installation/mobile-and-desktop-apps/#native-firefox-os-app)
 - Sandstorm.io instant Rocket.Chat server [Now on Sandstorm App Store](https://apps.sandstorm.io/app/vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0)
 - Available on [Cloudron Store](https://cloudron.io/appstore.html#chat.rocket.cloudronapp)

graphql.config.json

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