Merge branch 'develop'

Conflicts:
	server/startup/migrations/v078.js

.eslintignore

@@ -9,11 +9,11 @@ packages/rocketchat-livechat/app/node_modules
 packages/rocketchat-migrations/
 packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
 packages/rocketchat-ui/lib/customEventPolyfill.js
-packages/rocketchat-ui/lib/jquery.swipebox.min.js
 packages/rocketchat-ui/lib/Modernizr.js
 packages/rocketchat-ui/lib/recorderjs/recorder.js
 packages/rocketchat-ui/lib/textarea-autogrow.js
 packages/rocketchat-videobridge/client/public/external_api.js
+packages/rocketchat-theme/client/vendor/
 private/moment-locales/
 public/livechat/
 public/recorderWorker.js

.eslintrc

@@ -120,6 +120,7 @@
 		"RocketChatFile"              : false,
 		"RocketChatFileAvatarInstance": false,
 		"RoomHistoryManager"          : false,
+		"RoomManager"                 : false,
 		"s"                           : false,
 		"ServiceConfiguration"        : false,
 		"Session"                     : false,

.github/ISSUE_TEMPLATE.md

@@ -1 +1,6 @@
-Your Rocket.Chat version: (make sure you are running the latest)
+<!-- INSTRUCTION: Complete the information below from your Administration page -->
+
+Rocket.Chat Version: 
+Running Instances: 
+DB Replicaset OpLog:
+Node Version:

.gitignore

@@ -39,12 +39,15 @@
 .metadata
 .meteor/local*
 .meteor/meteorite
+.meteor/dev_bundle
+packages/rocketchat-livechat/app/.meteor/dev_bundle
 .mule
 .pmd
 .project
 .sass-cache
 .settings
 .Spotlight-V100
+tatus
 .Trashes
 .wtpmodules
 \#*\#

.meteor/packages

@@ -4,39 +4,39 @@
 # but you can also edit it by hand.
 
 rocketchat:cors
-accounts-facebook@1.0.11
-accounts-github@1.0.11
-accounts-google@1.0.11
-accounts-meteor-developer@1.0.11
-accounts-password@1.3.3
-accounts-twitter@1.1.12
+accounts-facebook
+accounts-github
+accounts-google
+accounts-meteor-developer
+accounts-password
+accounts-twitter
 blaze-html-templates
-check@1.2.4
-coffeescript@1.11.1_4
-ddp-rate-limiter@1.0.6
-ecmascript@0.6.1
-ejson@1.0.13
-email@1.1.18
-fastclick@1.0.13
-http@1.2.10
-jquery@1.11.10
-less@2.7.8
-logging@1.1.16
-meteor-base@1.0.4
-mobile-experience@1.0.4
-mongo@1.1.14
-random@1.0.10
-rate-limit@1.0.6
-reactive-dict@1.1.8
-reactive-var@1.0.11
-reload@1.1.11
-service-configuration@1.0.11
-session@1.1.7
-shell-server@0.2.1
+check
+coffeescript
+ddp-rate-limiter
+ecmascript
+ejson
+email
+fastclick
+http
+jquery
+less
+logging
+meteor-base
+mobile-experience
+mongo
+random
+rate-limit
+reactive-dict
+reactive-var
+reload
+service-configuration
+session
+shell-server
 spacebars
-standard-minifier-css@1.3.2
-standard-minifier-js@1.2.1
-tracker@1.1.1
+standard-minifier-css
+standard-minifier-js
+tracker
 
 rocketchat:action-links
 rocketchat:api
@@ -151,7 +151,6 @@ nimble:restivus
 nooitaf:colors
 ostrio:cookies
 pauli:accounts-linkedin
-perak:codemirror
 percolate:synced-cron
 raix:handlebar-helpers
 raix:push

.meteor/versions

@@ -13,12 +13,12 @@ babel-compiler@6.13.0
 babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
-blaze@2.2.0
-blaze-html-templates@1.0.5
+blaze@2.3.0
+blaze-html-templates@1.1.0
 blaze-tools@1.0.10
 boilerplate-generator@1.0.11
 caching-compiler@1.1.9
-caching-html-compiler@1.0.7
+caching-html-compiler@1.1.0
 callback-hook@1.0.10
 cfs:http-methods@0.0.32
 check@1.2.4
@@ -59,7 +59,7 @@ jparker:gravatar@0.5.1
 jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.12.1
-kenton:accounts-sandstorm@0.5.1
+kenton:accounts-sandstorm@0.6.0
 konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3
@@ -86,34 +86,32 @@ mizzao:timesync@0.3.4
 mobile-experience@1.0.4
 mobile-status-bar@1.0.13
 modules@0.7.7
-modules-runtime@0.7.7
+modules-runtime@0.7.8
 mongo@1.1.14
 mongo-id@1.0.6
 mongo-livedata@1.0.12
 mrt:reactive-store@0.0.1
 mystor:device-detection@0.2.0
-nimble:restivus@0.8.11
+nimble:restivus@0.8.12
 nooitaf:colors@1.1.2_1
 npm-bcrypt@0.9.2
-npm-mongo@2.2.11_2
+npm-mongo@2.2.16_1
 oauth@1.1.12
 oauth1@1.1.11
 oauth2@1.1.11
 observe-sequence@1.0.14
 ordered-dict@1.0.9
-ostrio:cookies@2.0.5
+ostrio:cookies@2.1.2
 pauli:accounts-linkedin@1.3.1
 pauli:linkedin@1.3.1
 peerlibrary:aws-sdk@2.4.9_1
 peerlibrary:blocking@0.5.2
-perak:codemirror@1.3.1
 percolate:synced-cron@1.3.2
-pntbr:js-yaml-client@0.0.1
 promise@0.8.8
 raix:eventemitter@0.1.3
 raix:eventstate@0.0.4
 raix:handlebar-helpers@0.2.5
-raix:push@3.0.2
+raix:push@3.0.3-rc.7
 raix:ui-dropped-event@0.0.7
 random@1.0.10
 rate-limit@1.0.6
@@ -223,16 +221,16 @@ simple:highlight.js@1.2.0
 simple:json-routes@2.1.0
 smoral:sweetalert@1.1.1
 spacebars@1.0.13
-spacebars-compiler@1.0.13
+spacebars-compiler@1.1.0
 srp@1.0.10
 standard-minifier-css@1.3.2
 standard-minifier-js@1.2.1
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
-templating@1.2.15
-templating-compiler@1.2.15
-templating-runtime@1.2.15
-templating-tools@1.0.5
+templating@1.3.0
+templating-compiler@1.3.0
+templating-runtime@1.3.0
+templating-tools@1.1.0
 tmeasday:crypto-base@3.1.2
 tmeasday:crypto-md5@3.1.2
 todda00:friendly-slugs@0.6.0

.sandstorm/sandstorm-pkgdef.capnp

@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 49,  # Increment this for every release.
+		appVersion = 56,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.49.0-develop"),
+		appMarketingVersion = (defaultText = "0.51.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.snapcraft/edge/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 0.49.0-develop
+version: 0.51.0-develop
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
@@ -20,10 +20,19 @@ apps:
         command: env LC_ALL=C mongod --bind_ip 127.0.0.1 --smallfiles --dbpath=$SNAP_COMMON
         daemon: simple
         plugs: [network, network-bind]
+    rocketchat-caddy:
+        command: env LC_ALL=C caddy -conf=$SNAP_DATA/Caddyfile -host=localhost:8080
+        daemon: simple
+        plugs: [network, network-bind]
+    backupdb:
+        command: env LC_ALL=c rcbackup
+        plugs: [network]
+    initcaddy:
+        command: env LC_ALL=c initcaddy
 parts:
     node:
         plugin: nodejs
-        node-engine: 4.7.0
+        node-engine: 4.7.1
         node-packages:
             - promise
             - fibers
@@ -47,11 +56,13 @@ parts:
         stage:
             - programs
             - main.js
+            - .node_version.txt
             - usr
             - lib
         snap:
             - programs
             - main.js
+            - .node_version.txt
             - usr
             - lib
     mongodb:
@@ -67,3 +78,23 @@ parts:
             - usr
             - bin
             - lib
+    scripts:
+        plugin: dump
+        source: resources/
+        organize:
+            rcbackup: bin/rcbackup
+            startmongo: bin/startmongo
+            initmongo: bin/initmongo
+            Caddyfile: bin/Caddyfile
+            initcaddy: bin/initcaddy
+            initmongoreplset.js: bin/initmongoreplset.js
+        snap:
+            - bin
+    caddy:
+        plugin: go
+        go-importpath:  github.com/mholt/caddy
+        source: https://github.com/mholt/caddy
+        source-type: git
+        source-commit: 53e117802fedd5915eeb32907873d8786a4b2936
+        snap:
+            - bin/caddy

.snapcraft/resources/Caddyfile

@@ -0,0 +1,5 @@
+http://:8080
+proxy / localhost:3000 {
+  websocket
+  transparent
+}

.snapcraft/resources/initcaddy

@@ -0,0 +1,3 @@
+#!/bin/sh
+cp $SNAP/bin/Caddyfile  $SNAP_DATA/Caddyfile
+echo "Replace $SNAP_DATA/Caddyfile with your own to customize reverse proxy" 

.snapcraft/resources/initmongo

@@ -0,0 +1,6 @@
+#!/bin/sh
+echo "initializing replset if necessary... in 60 seconds"
+sleep 60
+echo "after 60 seconds, checking for replset..."
+mongo $SNAP/bin/initmongoreplset.js
+

.snapcraft/resources/initmongoreplset.js

@@ -0,0 +1,8 @@
+var ism = db.isMaster();
+printjson(ism);
+if (ism.ismaster) {
+   } else 
+{
+    var msg  = rs.initiate();
+    printjson(msg);
+}

.snapcraft/resources/rcbackup

@@ -0,0 +1,7 @@
+#!/bin/sh
+rm -rf $SNAP_DATA/dump
+rm $SNAP_DATA/backup.tgz
+mkdir $SNAP_DATA/dump
+mongodump -d parties -o $SNAP_DATA/dump
+tar zcvf $SNAP_DATA/backup.tgz  $SNAP_DATA/dump
+echo "A backup of your data can be found at $SNAP_DATA/backup.tgz"

.snapcraft/resources/startmongo

@@ -0,0 +1,7 @@
+#!/bin/sh
+echo "initializing replset backgrounded..."
+$SNAP/bin/initmongo  &
+
+echo "Starting mongodb server in replicaset standalone mode..."
+mongod --bind_ip 127.0.0.1 --smallfiles --dbpath=$SNAP_COMMON  --journal --replSet rcreplset
+