Merge pull request #1 from RocketChat/master

Updating to more current version

.meteor/packages

@@ -38,6 +38,7 @@ rocketchat:lib
 
 rocketchat:authorization
 rocketchat:autolinker
+rocketchat:channel-settings
 rocketchat:colors
 rocketchat:custom-oauth
 rocketchat:emojione
@@ -48,19 +49,28 @@ rocketchat:gitlab
 rocketchat:highlight
 rocketchat:ldap
 rocketchat:logger
+rocketchat:mailer
 rocketchat:markdown
 rocketchat:me
 rocketchat:mentions
+rocketchat:message-pin
 rocketchat:message-star
 rocketchat:oembed
 rocketchat:slashcommands-invite
 rocketchat:slashcommands-join
 rocketchat:slashcommands-leave
-rocketchat:soundcloud
 rocketchat:spotify
 rocketchat:statistics
 rocketchat:theme
 rocketchat:tutum
+rocketchat:ui
+rocketchat:ui-account
+rocketchat:ui-admin
+rocketchat:ui-flextab
+rocketchat:ui-login
+rocketchat:ui-master
+rocketchat:ui-message
+rocketchat:ui-sidenav
 rocketchat:webrtc
 rocketchat:wordpress
 #rocketchat:chatops

.meteor/platforms

@@ -1,2 +1,3 @@
 browser
+ios
 server

.meteor/versions

@@ -25,7 +25,7 @@ cfs:[email protected]
 [email protected]
 chrismbeckett:[email protected]_1
 [email protected]
-cosmos:browserify@0.8.1
+cosmos:browserify@0.9.0
 dandv:[email protected]
 [email protected]
 [email protected]
@@ -39,6 +39,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+emojione:[email protected]
 [email protected]
 [email protected]
 francocatena:[email protected]
@@ -58,8 +59,8 @@ jparker:[email protected]
 jparker:[email protected]
 [email protected]
 kadira:[email protected]
-kadira:flow-router@2.7.0
-kenton:[email protected].7
+kadira:flow-router@2.9.0
+kenton:[email protected].8
 kevohagan:[email protected]
 konecty:[email protected]
 konecty:[email protected]
@@ -77,7 +78,7 @@ matb33:[email protected]
 [email protected]
 [email protected]
 [email protected]
-meteorhacks:kadira@2.24.1
+meteorhacks:kadira@2.26.3
 meteorhacks:[email protected]
 meteorspark:[email protected]
 [email protected]
@@ -109,11 +110,10 @@ percolate:[email protected]
 percolate:[email protected]
 pntbr:[email protected]
 [email protected]
-qnub:[email protected]_1
 raix:[email protected]
 raix:[email protected]
 raix:[email protected]
-raix:push@2.6.13-rc.1
+raix:push@3.0.2
 raix:[email protected]
 [email protected]
 [email protected]
@@ -123,6 +123,7 @@ [email protected]
 [email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
@@ -134,19 +135,28 @@ rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
-rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 [email protected]
@@ -166,7 +176,7 @@ [email protected]
 tmeasday:[email protected]
 tmeasday:[email protected]
 tmeasday:[email protected]
-todda00:[email protected].4
+todda00:[email protected].6
 [email protected]
 [email protected]
 [email protected]

.travis.yml

@@ -3,11 +3,27 @@ language: node_js
 branches:
   only:
   - master
+  - develop
 node_js:
-- '0.10'
+- '0.12'
+addons:
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
 before_install:
 - curl https://install.meteor.com | /bin/sh
 - npm install -g npm@'>=2.13.5'
+- mkdir -p node_modules
+- npm install phantomjs
+- npm install velocity-cli
+- export PHANTOMJS_BIN=./node_modules/phantomjs/bin/phantomjs
+- export JASMINE_BROWSER=PhantomJS
+- export DEBUG=1
+- export JASMINE_DEBUG=1
+- export VELOCITY_DEBUG=1
+- export VELOCITY_DEBUG_MIRROR=1
 script:
 - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "Building PR $TRAVIS_PULL_REQUEST"; meteor build ../build; exit $?; fi
 - cd .travis
@@ -18,8 +34,9 @@ script:
 - cd .travis
 - sh ./namefiles.sh
 - cd ..
-- meteor add-platform ios
-- meteor add rocketchat:livechat rocketchat:hubot
+- meteor add rocketchat:livechat rocketchat:hubot sanjo:jasmine velocity:console-reporter
+- ./node_modules/velocity-cli/bin/velocity test-packages --ci
+- ./node_modules/velocity-cli/bin/velocity test-app --ci
 - meteor build --server demo.rocket.chat  ../build
 - cd .travis
 - sh ./namedemo.sh
@@ -34,5 +51,6 @@ deploy:
   skip_cleanup: true
   local_dir: ../build
   on:
-    branch: master
-
+    branch:
+    - master
+    - develop

README.md

@@ -8,9 +8,9 @@ Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.ch
 
 Available from the AppStore:
 
-[![Rocket.Chat on Apple AppStore](http://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg)](https://geo.itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8)
+[![Rocket.Chat on Apple AppStore](http://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8)
 
-Get the app for your Android phone: 
+Get the app for your Android phone:
 
 
 [![Rocket.Chat on Google Play](https://developer.android.com/images/brand/en_app_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
@@ -45,7 +45,7 @@ Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron]
 [![Build Status](https://img.shields.io/travis/RocketChat/Rocket.Chat/master.svg)](https://travis-ci.org/RocketChat/Rocket.Chat)
 [![Coverage Status](https://coveralls.io/repos/RocketChat/Rocket.Chat/badge.svg)](https://coveralls.io/r/RocketChat/Rocket.Chat)
 [![Code Climate](https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg)](https://codeclimate.com/github/RocketChat/Rocket.Chat)
-[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/RocketChat/Rocket.Chat/raw/master/LICENSE)
+[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/RocketChat/Rocket.Chat/raw/master/LICENSE)
 [![Stories in Ready](https://badge.waffle.io/RocketChat/Rocket.Chat.png?label=ready&title=Ready)](https://waffle.io/RocketChat/Rocket.Chat)
 
 Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](https://www.meteor.com/install) fullstack framework.
@@ -57,7 +57,7 @@ It is a great solution for communities and companies wanting to privately host t
 ##### [Hacker News](https://news.ycombinator.com/item?id=9624737)
 > Yes, we made it to the #1
 
-##### [Product Hunt](http://www.producthunt.com/posts/rocket-chat)
+##### [Product Hunt](https://www.producthunt.com/tech/rocket-chat)
 > Your own open source Slack-like chat
 
 ##### [JavaScript Weekly](http://javascriptweekly.com/issues/234)
@@ -72,6 +72,10 @@ It is a great solution for communities and companies wanting to privately host t
 ##### [snowulf.com](https://snowulf.com/2015/09/25/why-slack-when-you-can-rocket-chat/)
 > Why Slack when you can Rocket.chat?
 
+##### [liminality.xyz](http://liminality.xyz/self-hosting/)
+> Self-hosted alternatives to popular cloud services
+
+
 ## Features
 
 - BYOS (bring your own server)
@@ -90,18 +94,18 @@ It is a great solution for communities and companies wanting to privately host t
 - Transcripts / History
 - File Upload / Sharing
 - Full text search
-- Live chat / Messaging call center 
-- LDAP Authentication 
+- Live chat / Messaging call center
+- LDAP Authentication
 - Support for Okta SSO through SAML v2
-- I18n - Supports 22 Languages 
+- I18n - Supports 22 Languages
 - Hubot Friendly
 - Face to Face Video Conferencing (aka WebRTC)
 - Multi-users Video Group Chat
 - Audio calls
 - Multi-users Audio Conference
 - Screensharing
-- REST APIs 
-- Remote Locations Video Monitoring 
+- REST APIs
+- Remote Locations Video Monitoring
 - 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, Mac OSX, or Linux](https://rocket.chat/)
@@ -115,7 +119,7 @@ It is a great solution for communities and companies wanting to privately host t
 
 #### In Progress
 - Support multiple teams on the same instance / same VPS infrastructure: [Issue #658](https://github.com/RocketChat/Rocket.Chat/issues/658), [Issue #630](https://github.com/RocketChat/Rocket.Chat/issues/630)
-- Support for PostgreSQL: [Issue #533](https://github.com/RocketChat/Rocket.Chat/issues/533), [Issue #822](https://github.com/RocketChat/Rocket.Chat/issues/822)
+- Support for PostgreSQL: [Issue #533](https://github.com/RocketChat/Rocket.Chat/issues/533), [Issue #822](https://github.com/RocketChat/Rocket.Chat/pull/822)
 - Native iOS Application [Issue #270](https://github.com/RocketChat/Rocket.Chat/issues/270), [Rocket.Chat.iOS - HELP WANTED](https://github.com/RocketChat/Rocket.Chat.iOS)
 - Native Android Application [Issue #271 - HELP WANTED](https://github.com/RocketChat/Rocket.Chat/issues/271)
 - Off-the-Record (OTR) Messaging [Issue #36](https://github.com/RocketChat/Rocket.Chat/issues/36), [Issue #268 - HELP WANTED](https://github.com/RocketChat/Rocket.Chat/issues/268)
@@ -145,7 +149,7 @@ Everyone can start hacking the adapter code, or launch his/her own bot within a
 Please head over to the [Hubot Integration Project](https://github.com/RocketChat/hubot-rocketchat) for more information.
 
 
-#### Chat-ops integrations powered by Hubot 
+#### Chat-ops integrations powered by Hubot
 
 Integrate your application with fly-in panels today!   Early access is available for developers.
 
@@ -181,9 +185,9 @@ Easy one click install right from your Ubuntu Desktop (coming soon).
 
 ### Docker
 
-Use the automated build at our [Official Docker Registry](https://registry.hub.docker.com/u/rocketchat/rocket.chat/)
+Use the automated build at our [Official Docker Registry](https://hub.docker.com/r/rocketchat/rocket.chat/)
 
-[![Rocket.Chat logo](https://d207aa93qlcgug.cloudfront.net/1.95.5.qa/img/nav/docker-logo-loggedout.png)](https://registry.hub.docker.com/u/rocketchat/rocket.chat/)
+[![Rocket.Chat logo](https://d207aa93qlcgug.cloudfront.net/1.95.5.qa/img/nav/docker-logo-loggedout.png)](https://hub.docker.com/r/rocketchat/rocket.chat/)
 
 ```
 docker pull rocketchat/rocket.chat
@@ -227,19 +231,19 @@ docker run -it -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
 ## Credits
 
 Thanks to
+[Aaron Ogle](https://github.com/geekgonecrazy),
+[Bradley Hilton](https://github.com/Graywolf336),
 [Diego Sampaio](https://github.com/sampaiodiego),
 [Gabriel Engel](https://github.com/engelgabriel),
 [Marcelo Schmidt](https://github.com/marceloschmidt),
 [Rafael Caferati](https://github.com/rcaferati),
 [Rodrigo Nascimento](https://github.com/rodrigok),
 [Sing Li](https://github.com/Sing-Li),
-[Aaron Ogle](https://github.com/geekgonecrazy),
-[Graywolf336](https://github.com/Graywolf336)
-
+and many others.
 
 Emoji provided free by [Emoji One](http://emojione.com)
 
-Performance monitoring provided by [Kadira](https://kadira.io/)
+Performance monitoring provided by [Kadira](https://kadira.io)
 
 ### Contributions
 
@@ -249,14 +253,20 @@ A lot of work has already gone into Rocket.Chat, but we have much bigger plans f
 
 So if you'd like to be part of the project, please check out the [roadmap](https://github.com/RocketChat/Rocket.Chat/milestones) and [issues](https://github.com/RocketChat/Rocket.Chat/issues) to see if there's anything you can help with.
 
+### Branching Model
+
+The [Gitflow Workflow](http://nvie.com/posts/a-successful-git-branching-model/) section below is derived from Vincent Driessen at nvie.
+
+See also this [Git Workflows Comparison](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for more details.
+
 ### Translations
 
 We are experimenting [Lingohub](https://translate.lingohub.com/engelgabriel/rocket-dot-chat/dashboard).
 If you want to help, send an email to support at rocket.chat to be invited to the translation project.
 
 ### Community
 
-Join the conversation at [Twitter](http://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
+Join the conversation at [Twitter](https://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
 
 ### License
 
@@ -267,3 +277,5 @@ Note that Rocket.Chat is distributed under the [MIT License](http://opensource.o
 Rocket.Chat will be free forever, but you can help us speed-up the development!
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=49QX7TYCVZK8L)
+
+[BountySource](https://www.bountysource.com/teams/rocketchat)

SECURITY.md

@@ -0,0 +1,7 @@
+# Reporting Security Issues
+
+Please report any security issues you discovered to security[at]rocket[dot]chat
+
+We will assess the risk, plus make a fix available before we create a GitHub issue.
+
+Thank you for your contribution.

build-ios.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-meteor add-platform ios
 rm -rf .meteor/local/cordova-build
 rm -rf ../Rocket.Chat-build
 meteor build ../Rocket.Chat-build --server https://demo.rocket.chat

build-old.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 source ./build-info.sh
 export METEOR_SETTINGS=$(cat settings.json)
-meteor add rocketchat:livechat
-meteor add rocketchat:hubot
-meteor add-platform ios
+meteor add rocketchat:livechat rocketchat:hubot
 meteor build --server https://demo.rocket.chat --directory /var/www/rocket.chat
 cd /var/www/rocket.chat/bundle/programs/server
 npm install