Upstream merge

.codeclimate.yml

@@ -6,6 +6,32 @@
 #
 languages:
    JavaScript: true
+
+engines:
+# to turn on an engine, add it here and set enabled to `true`
+# to turn off an engine, set enabled to `false` or remove it
+ eslint:
+   enabled: true
+ coffeelint:
+   enabled: true
+ csslint:
+   enabled: true
+ fixme:
+   enabled: true
+
+
+
+# Engines can analyze files and report issues on them, but you can separately
+# decide which files will receive ratings based on those issues. This is
+# specified by path patterns under the ratings key.
+
+# For more details see here:
+# http://docs.codeclimate.com/article/289-configuring-your-repository-via-codeclimate-yml#platform
+
+ratings:
+paths:
+- **.coffee
+- **.js
 #
 # ---Exclude Files or Directories---
 # List the files or directories you would like excluded from our analysis.
@@ -14,4 +40,4 @@ languages:
 #
 exclude_paths:
  - "public/moment-locales/*"
- - "packages/rocketchat-favico/favico.js"
+ - "packages/rocketchat-favico/favico.js"

.jshintrc

@@ -0,0 +1,19 @@
+{
+	"bitwise"	:  true,
+	"curly"		:  true,
+	"eqeqeq"	:  true,
+	"forin"		:  true,
+	"immed"		:  true,
+	"latedef"	:  "nofunc",
+	"maxparams"	:  4,
+	"newcap"	:  true,
+	"noarg"		:  true,
+	"noempty"	:  true,
+	"nonew"		:  true,
+	"undef"		:  true,
+	"unused"	:  true,
+	"node"		:  true,
+	"browser"	:  true,
+	"jquery"	:  true,
+	"globals"       : {}
+}

.meteor/packages

@@ -72,6 +72,8 @@ tmeasday:errors
 todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
+eskan:chosen
+nemo64:bootstrap
 yasinuslu:blaze-meta
 rocketchat:colors
 raix:push@2.6.13-rc.1

.meteor/versions

@@ -27,6 +27,7 @@ deps@1.0.7
 dispatch:run-as-user@0.0.2
 ejson@1.0.6
 email@1.0.6
+eskan:chosen@1.4.2
 facebook@1.2.1
 fastclick@1.0.3
 francocatena:status@1.3.0
@@ -78,6 +79,8 @@ mongo@1.1.0
 mongo-livedata@1.0.8
 mrt:reactive-store@0.0.1
 mystor:device-detection@0.2.0
+nemo64:bootstrap@3.3.5_2
+nemo64:bootstrap-data@3.3.5
 nimble:restivus@0.8.2
 nooitaf:colors@0.0.2
 npm-bcrypt@0.7.8_2

.travis.yml

@@ -9,4 +9,4 @@ before_install:
 script:
   - meteor add rocketchat:external
   - meteor add rocketchat:hubot
-  - meteor build --server demo.rocket.chat ./
+  - meteor build --server chat-locker ./

README.md

@@ -1,172 +1,36 @@
-![Rocket.Chat logo](https://rocket.chat/images/logo/logo-dark.svg?v3)
-
-The Complete Open Source Chat Solution
-
-## Demo
-
-Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.chat)
-
-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)
-
-Try it on Ubuntu:
-
-[Deploy on VPS or standalone server](https://github.com/RocketChat/Rocket.Chat/wiki/Deploy-Rocket.Chat-without-docker)
-
-Try it with docker:
-
-```
-docker-compose up
-```
-
-and check it out at http://localhost:80
-
-Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
-
-[![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)
-
 ## About
+The Complete Open Source Chat Solution that implements the [DoD Manual 5200.01V2] (http://www.dtic.mil/whs/directives/corres/pdf/520001_vol2.pdf)
 
-[![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)
-
-Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](https://www.meteor.com/install) fullstack framework.
+[![Build Status](https://travis-ci.org/sscpac/chat-locker.svg?branch=master)](https://travis-ci.org/sscpac/chat-locker)
+<!--- [![Coverage Status](https://coveralls.io/repos/sscpac/chat-locker/badge.svg?branch=master&service=github)](https://coveralls.io/github/sscpac/chat-locker?branch=master) -->
+[![Code Climate](https://codeclimate.com/github/sscpac/chat-locker/badges/gpa.svg)](https://codeclimate.com/github/sscpac/chat-locker)
+<!--- [![Test Coverage](https://codeclimate.com/github/sscpac/chat-locker/badges/coverage.svg)](https://codeclimate.com/github/sscpac/chat-locker/coverage)-->
+[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/sscpac/chat-locker/raw/master/LICENSE)
 
-It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms.
+Chat Locker is a Web Chat Server, developed in JavaScript, using the [Meteor](https://www.meteor.com/install) fullstack framework.
 
-### On the News
-
-##### [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)
-> Your own open source Slack-like chat
-
-##### [JavaScript Weekly](http://javascriptweekly.com/issues/234)
-> An open source Web based, channel based chat system (a la Slack) built using Meteor, the full stack JavaScript development platform.
-
-##### [wwwhatsnew.com](http://wwwhatsnew.com/2015/05/30/rocket-chat-para-los-programadores-que-quieran-ofrecer-un-chat-en-su-web/)
-> Para los programadores que quieran ofrecer un chat en su web
-
-##### [clasesdeperiodismo.com](http://www.clasesdeperiodismo.com/2015/05/30/un-chat-de-codigo-abierto-que-puedes-anadir-a-la-web/)
-> Un chat de código abierto que puedes añadir a la web
-
-## Features
-
-- BYOS (bring your own server)
-- Multiple Rooms
-- Direct Messages
-- Private Groups
-- Public Channels
-- Desktop Notifications
-- Mentions
-- Avatars
-- Markdown
-- Emojis
-- Sent Message Edit and Deletion
-- Transcripts / History
-- File Upload / Sharing
-- I18n - Supports 22 Languages [Internationalization with Lingohub](https://translate.lingohub.com/engelgabriel/rocket-dot-chat/dashboard)
-- Hubot Friendly - [Hubot Integration Project](https://github.com/RocketChat/hubot-rocketchat)
-- Media Embeds
-- Link Previews
-- LDAP Authentication - [LDAP Authentication on Rocket.Chat Wiki](https://github.com/RocketChat/Rocket.Chat/wiki/LDAP-Authentication)
-- Face to Face Video Conferencing aka WebRTC (Alpha) - [How to video chat](https://github.com/RocketChat/Rocket.Chat/wiki/Using-Face-to-face-video-conference-%28aka-webrtc%29)
-- REST-full APIs - [Ready for testing ...](https://github.com/RocketChat/Rocket.Chat/wiki/REST-full-APIs)
-- Remote Locations Video Monitoring - [Early access ...](https://github.com/RocketChat/Rocket.Chat/wiki/Remote-Video-Monitoring)
-- Native Cross-Platform Desktop Application [Rocket.Chat.Electron - HELP WANTED](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
-- Mobile app for iPhone, iPad, and iPod touch [Available now! - help us test](https://github.com/RocketChat/Rocket.Chat/wiki/Mobile-app-for-iPhones,-iPads,-iPod-Touch)
-- Mobile app for Android phone, tablet, and TV stick [Install now!](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
-
-### Roadmap
-
-#### In Progress
-
-- Native iOS Application [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)
-- External popout window for chat with website visitor, like Zopim, Olark, LiveChat, SnapEngage [Issue #519](https://github.com/RocketChat/Rocket.Chat/issues/519)
-
-#### Planned
-
-- Off-the-Record (OTR) Messaging [Issue #36 - HELP WANTED](https://github.com/RocketChat/Rocket.Chat/issues/36)
-- Full text search
-- Kerberos Authentication
-- XMPP Multi-user chat (MUC)
+It is the best solution to agencies or companies that need to deploy a web based chat solution that can handle classification guidelines from the 5200.01V2.
 
 ### Issues
 
-[Github Issues](https://github.com/RocketChat/Rocket.Chat/issues) are used to track todos, bugs, feature requests, and more.
-
-### Integrations
-
-#### Hubot
-
-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.
-
-#### 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
-
-Checkout [Github Wiki](https://github.com/RocketChat/Rocket.Chat/wiki) (coming soon)
-
-## Production Deployment
-
-### Unbuntu VPS or server
-
-Follow these [deployment instructions](https://github.com/RocketChat/Rocket.Chat/wiki/Deploy-Rocket.Chat-without-docker).
-
-### Docker
-
-Use the automated build at our [Official Docker Registry](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://registry.hub.docker.com/u/rocketchat/rocket.chat/)
-
-```
-docker pull rocketchat/rocket.chat
-```
-
-### sloppy.io
-
-Host your docker container at [sloppy.io](http://sloppy.io). Get an account and use the [quickstarter](https://github.com/sloppyio/quickstarters/tree/master/rocketchat)
-
-### Heroku
-
-Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
-
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
-
-
+[Github Issues](https://github.com/sscpac/chat-locker/issues) are used to track todos, bugs, feature requests, and more.
 
 ## Development Installation
 
 Prerequisites:
 
 * [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [Meteor](https://www.meteor.com/install)
+* [LDAP] - Configuration coming soon!
 
 Now just clone and start the app:
 
 ```sh
-git clone https://github.com/RocketChat/Rocket.Chat.git
-cd Rocket.Chat
+git clone https://github.com/sscpac/chat-locker.git
+cd chat-locker
 meteor
 ```
 
-or use docker:
-
-```
-git clone https://github.com/RocketChat/Rocket.Chat.git
-cd Rocket.Chat
-docker run -it -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
-```
-
 ## Credits
 
 Thanks to
@@ -181,29 +45,9 @@ Emoji provided free by [Emoji One](http://emojione.com)
 
 Performance monitoring provided by [Kadira](https://kadira.io/)
 
-### Contributions
-
-#### 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 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).
-
-### Donate
+Note that Chat Locker is distributed under the [MIT License](http://opensource.org/licenses/MIT).
 
-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)
+:smiling_imp:

build.sh

@@ -9,9 +9,9 @@ if [ $1 ]; then
 	export METEOR_SETTINGS=$(cat settings.$1.json)
 	meteor add rocketchat:external
 	meteor add rocketchat:hubot
-	meteor build --server https://demo.rocket.chat --directory /var/www/rocket.chat
-	cd /var/www/rocket.chat/bundle/programs/server
+	meteor build --server chat-locker --directory /var/www/chat-locker
+	cd /var/www/chat-locker/bundle/programs/server
 	npm install
-	cd /var/www/rocket.chat/current
-	pm2 startOrRestart /var/www/rocket.chat/current/pm2.$1.json
+	cd /var/www/chat-locker/current
+	pm2 startOrRestart /var/www/chat-locker/current/pm2.$1.json
 fi

client/lib/RoomManager.coffee

@@ -36,7 +36,7 @@ Meteor.startup ->
 	subscription = null
 	msgStream = new Meteor.Stream 'messages'
 	deleteMsgStream = new Meteor.Stream 'delete-message'
-	onlineUsers = new ReactiveVar {}
+	allUsers = new ReactiveVar {}
 
 	Dep = new Tracker.Dependency
 
@@ -99,7 +99,7 @@ Meteor.startup ->
 									if Session.get('openedRoom') is msg.rid
 										type = if FlowRouter.current().route.name is 'channel' then 'c' else 'p'
 										RoomManager.close type + FlowRouter.getParam('name')
-										FlowRouter.go FlowRouter.current().route.name, name: msg.msg
+										FlowRouter.go FlowRouter.current().route.name, name: msg.slugName
 
 						deleteMsgStream.on openedRooms[typeName].rid, (msg) ->
 							ChatMessage.remove _id: msg._id
@@ -155,16 +155,14 @@ Meteor.startup ->
 		return room?.dom?
 
 	updateUserStatus = (user, status, utcOffset) ->
-		onlineUsersValue = onlineUsers.curValue
+		allUsersValue = allUsers.curValue
+		allUsersValue[user.username] =
+			firstName: user.profile.first_name
+			lastName: user.profile.last_name
+			name: user.name
+			status: user.status
 
-		if status is 'offline'
-			delete onlineUsersValue[user.username]
-		else
-			onlineUsersValue[user.username] =
-				status: status
-				utcOffset: utcOffset
-
-		onlineUsers.set onlineUsersValue
+		allUsers.set allUsersValue
 
 	open: open
 	close: close
@@ -174,4 +172,4 @@ Meteor.startup ->
 	msgStream: msgStream
 	openedRooms: openedRooms
 	updateUserStatus: updateUserStatus
-	onlineUsers: onlineUsers
+	allUsers: allUsers

client/lib/accountBox.coffee

@@ -2,7 +2,9 @@
 	status = 0
 	self = {}
 
-	setStatus = (status) ->
+	setStatus = (status, message) ->
+		if message?
+			Meteor.call('setStatusMessage', status, message)
 		Meteor.call('UserPresence:setDefaultStatus', status)
 
 	toggle = ->
@@ -32,4 +34,4 @@
 	open: open
 	close: close
 	init: init
-)()
+)()

client/lib/chatMessages.coffee

@@ -9,7 +9,7 @@ class @ChatMessages
 		return
 
 	resize: ->
-		dif = 60 + $(".messages-container").find("footer").outerHeight()
+		dif = 60 + $(".messages-container").find("footer").outerHeight() + $(".messages-container").find(".security-banner").outerHeight()
 		$(".messages-box").css
 			height: "calc(100% - #{dif}px)"