Merge pull request #1 from RocketChat/master

merging Rocket.Chat current master

.gitignore

@@ -1,4 +1,65 @@
+**/bin/**
+**/build/*
+**/node_modules/*
+**/tmp/*
+*.bak
+*.iml
+*.ipr
+*.iws
+*.launch
+*.log
+*.pydevproject
+*.sublime-project
+*.swp
+*.tmp
+*.tokens
+*.un~
+*~
+*~.nib
+.*.sw[a-z]
+.\#*
+._*
+.buildpath
+.classpath
+.clover
+.cproject
+.DS_Store
+.elasticbeanstalk
+.elc
+.emacs.desktop
+.emacs.desktop.lock
+.env
+.externalToolBuilders
+.idea
+.loadpath
+.map
+.metadata
 .meteor/local
 .meteor/meteorite
-.DS_Store
-ecosystem.json
+.mule
+.pmd
+.project
+.sass-cache
+.settings
+.Spotlight-V100
+.Trashes
+.wtpmodules
+\#*\#
+BuildInfo.js
+Desktop.ini
+ehthumbs.db
+example.css
+jrat.output
+jrat.xml
+local.properties
+meteor-vulcanize
+nb-configuration.xml
+nbactions.xml
+nbproject
+profiles.xml
+Session.vim
+smart.lock
+temp_*
+Thumbs.db
+thumbs.db
+tramp

.meteor/packages

@@ -3,49 +3,54 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-platform
 accounts-facebook
 accounts-github
 accounts-google
 accounts-meteor-developer
 accounts-password
-jquery
 coffeescript
 email
+http
+jquery
 less
 markdown
+meteor-platform
 reactive-var
 service-configuration
+
 chrismbeckett:toastr
 francocatena:status
+iframely:oembed
 iron:router
+jparker:gravatar
 konecty:autolinker
 konecty:delayed-task
 konecty:mongo-counter
 konecty:multiple-instances-status
 konecty:user-presence
+meteorhacks:kadira
 mizzao:autocomplete
 mizzao:timesync
 momentjs:moment
-monbro:mongodb-mapreduce-aggregation
-mrt:mask
-mrt:publish-with-relations
 mrt:reactive-store
 nooitaf:colors
+pauli:accounts-linkedin
+percolate:migrations
 percolatestudio:synced-cron
-qnub:emojione
+pierreeric:rxfavico
 raix:handlebar-helpers
+rocketchat:autolinker
+rocketchat:emojione
+rocketchat:file
+rocketchat:highlight
+rocketchat:lib
+rocketchat:markdown
+rocketchat:me
+rocketchat:mentions
+rocketchat:tmpembed
 tap:i18n
 tmeasday:crypto-md5
 tmeasday:errors
 todda00:friendly-slugs
-simple:highlight.js
-percolate:migrations
 underscorestring:underscore.string
-meteorhacks:kadira
 yasaricli:slugify
-jparker:gravatar
-http
-cfs:filesystem
-cfs:standard-packages
-cfs:gridfs

.meteor/versions

@@ -13,24 +13,7 @@ blaze@2.1.2
 blaze-tools@1.0.3
 boilerplate-generator@1.0.3
 callback-hook@1.0.3
-cfs:access-point@0.1.49
-cfs:base-package@0.0.30
-cfs:collection@0.5.5
-cfs:collection-filters@0.2.4
-cfs:data-man@0.0.6
-cfs:file@0.1.17
-cfs:filesystem@0.1.2
-cfs:gridfs@0.0.33
 cfs:http-methods@0.0.29
-cfs:http-publish@0.0.13
-cfs:power-queue@0.9.11
-cfs:reactive-list@0.0.9
-cfs:reactive-property@0.0.4
-cfs:standard-packages@0.5.9
-cfs:storage-adapter@0.2.2
-cfs:tempstore@0.1.5
-cfs:upload-http@0.0.20
-cfs:worker@0.1.4
 check@1.0.5
 chrismbeckett:toastr@2.1.0
 coffeescript@1.0.6
@@ -41,22 +24,23 @@ ejson@1.0.6
 email@1.0.6
 facebook@1.2.0
 fastclick@1.0.3
-francocatena:status@1.2.2
+francocatena:status@1.2.3
 geojson-utils@1.0.3
 github@1.1.3
 google@1.1.5
 html-tools@1.0.4
 htmljs@1.0.4
 http@1.1.0
 id-map@1.0.3
-iron:controller@1.0.7
-iron:core@1.0.7
-iron:dynamic-template@1.0.7
-iron:layout@1.0.7
-iron:location@1.0.7
-iron:middleware-stack@1.0.7
-iron:router@1.0.7
-iron:url@1.0.7
+iframely:oembed@0.0.2
+iron:controller@1.0.8
+iron:core@1.0.8
+iron:dynamic-template@1.0.8
+iron:layout@1.0.8
+iron:location@1.0.9
+iron:middleware-stack@1.0.9
+iron:router@1.0.9
+iron:url@1.0.9
 jparker:crypto-core@0.1.0
 jparker:crypto-md5@0.1.1
 jparker:gravatar@0.3.1
@@ -85,28 +69,36 @@ mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.1
 mobile-status-bar@1.0.3
 momentjs:moment@2.10.3
-monbro:mongodb-mapreduce-aggregation@1.0.1
 mongo@1.1.0
 mongo-livedata@1.0.8
-mrt:mask@0.0.1
-mrt:publish-with-relations@0.1.5
 mrt:reactive-store@0.0.1
 nooitaf:colors@0.0.2
 npm-bcrypt@0.7.8_2
 oauth@1.1.4
 oauth2@1.1.3
 observe-sequence@1.0.6
 ordered-dict@1.0.3
+pauli:accounts-linkedin@1.1.2
+pauli:linkedin@1.1.2
 percolate:migrations@0.7.5
 percolatestudio:synced-cron@1.1.0
+pierreeric:rxfavico@0.3.5_1
 qnub:emojione@0.0.3
-raix:eventemitter@0.1.2
 raix:handlebar-helpers@0.2.4
 random@1.0.3
 reactive-dict@1.1.0
 reactive-var@1.0.5
 reload@1.1.3
 retry@1.0.3
+rocketchat:autolinker@0.0.1
+rocketchat:emojione@0.0.1
+rocketchat:file@0.0.1
+rocketchat:highlight@0.0.1
+rocketchat:lib@0.0.1
+rocketchat:markdown@0.0.1
+rocketchat:me@0.0.1
+rocketchat:mentions@0.0.1
+rocketchat:tmpembed@0.0.1
 routepolicy@1.0.5
 service-configuration@1.0.4
 session@1.1.0
@@ -124,7 +116,7 @@ todda00:friendly-slugs@0.3.0
 tracker@1.0.7
 ui@1.0.6
 underscore@1.0.3
-underscorestring:underscore.string@3.0.3_1
+underscorestring:underscore.string@3.1.1
 url@1.0.4
 webapp@1.2.0
 webapp-hashing@1.0.3

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 ChatRocket
+Copyright (c) 2015 RocketChat
 
 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

@@ -1,4 +1,4 @@
-<img src="http://rocket.chat/images/logo/logo-dark.svg" />
+<img src="http://rocket.chat/images/logo/logo-dark.svg?v2" />
 
 The Complete Open Source Chat Solution
 
@@ -8,7 +8,8 @@ Checkout the latest version at http://rocket.chat
 
 ## About
 
-[![Code Climate](https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg)](https://codeclimate.com/github/RocketChat/Rocket.Chat)
+[![Code Climate][codeclimate-image]][codeclimate-url]
+[![MIT License][license-image]][license-url]
 
 Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](https://www.meteor.com/install) fullstack framework.
 
@@ -33,6 +34,8 @@ It is a great solution for communities and companies wanting to privately host t
 
 ## Installation
 
+### Development
+
 Prerequisites:
 
 * [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
@@ -46,30 +49,60 @@ cd Rocket.Chat
 meteor
 ```
 
-## One-Click Deploy
+### Production
+
+#### One-Click Deploy
 
-Deploy on Heroku:
+##### Heroku
 
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
 
 ## Features
 
+### Current
+
+- BYOS (bring your own server)
+- Multiple Rooms
 - Direct Messages
 - Private Groups
-- New message alerts
-- I18n
+- Public Channels
+- Desktop Notifications
+- Mentions
+- Avatars
+- Markdown
+- Emojis
+- Transcripts / History
+- I18n - [Internationalization with Lingohub](https://translate.lingohub.com/engelgabriel/rocket-dot-chat/dashboard)
+- Hubot Friendly - [Hubot Integration Project](https://github.com/RocketChat/hubot-rocketchat)
+
+### Roadmap for v1.0
+
+- Image embeds
+- File uploads
+- Full text search
+- REST-like APIs
+- Off-the-Record (OTR) Messaging
+- LDAP / Kerberos Authentication
+- XMPP Multi-user chat (MUC)
+- WebRTC signalling
+- Native Mobile App
+- Native Desktop App
 
-### Roadmap
+### Issues
 
-The development team uses [Trello](https://trello.com/b/dKS6CCbS/rocket-chat-roadmap) to track progress and discuss new features.
+[Github Issues](https://github.com/RocketChat/Rocket.Chat/issues) are used to track todos, bugs, feature requests, and more.
 
-#### Changelog
+### Integrations
 
-Changelog can be found in the HISTORY.md file.
+#### Hubot
 
-### Issues
+The docker image is ready.
+Everyone can start hacking the adapter code, or launch his/her own bot within a few minutes now.
+Please head over to the [Hubot Integration Project](https://github.com/RocketChat/hubot-rocketchat) for more information.
 
-[Github Issues](https://github.com/RocketChat/Rocket.Chat/issues) are used to track todos, bugs, feature requests, and more.
+#### Many, many, many more to come!
+
+We are developing the APIs based on the competition, so stay tunned and you will see a lot happening here.
 
 ### Documentation
 
@@ -85,16 +118,28 @@ Performance monitoring provided by [Kadira](https://kadira.io/)
 
 ### Contributions
 
-##### We Need Your Help!
+#### We Need Your Help!
 
 A lot of work has already gone into Rocket.Chat, but we have much bigger plans for it!
 
 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.
 
+### 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 the converation at [Twitter](http://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
+Join the the conversation at [Twitter](http://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
 
 ### License
 
 Note that Rocket.Chat is distributed under the [MIT License](http://opensource.org/licenses/MIT).
+
+
+[license-image]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
+[license-url]: LICENSE
+
+[codeclimate-image]: https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg
+[codeclimate-url]: https://codeclimate.com/github/RocketChat/Rocket.Chat

app.json

@@ -5,18 +5,9 @@
   "logo": "http://rocket.chat/images/logo/logo-dark.svg",
   "keywords": ["meteor", "social", "community", "chat"],
   "env": {
-    "BUILDPACK_URL": "https://github.com/AdmitHub/meteor-buildpack-horse.git",
+    "BUILDPACK_URL": "https://github.com/RocketChat/heroku-buildpack-meteor.git",
     "ROOT_URL": {
       "description": "The full URL of your Rocket.Chat app (https://<App Name>.herokuapp.com)."
-    },
-    "AWS_ACCESS_KEY_ID": {
-      "description": "Your AWS Access Key Id"
-    },
-    "AWS_SECRET_ACCESS_KEY": {
-      "description": "Your AWS Secret Access Key"
-    },
-    "AWS_BUCKET": {
-      "description": "The AWS Bucket"
     }
   },
   "addons": [