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

README.md

@@ -33,6 +33,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,22 +48,42 @@ 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 Features
 
+- BYOS (bring your own server)
+- Multiple Rooms
 - Direct Messages
 - Private Groups
-- New message alerts
-- I18n
-
-### Roadmap
-
-The development team uses [Trello](https://trello.com/b/dKS6CCbS/rocket-chat-roadmap) to track progress and discuss new features.
+- Public Channels
+- Desktop Notifications
+- Mentions
+- Avatars
+- Markdown
+- Emojis
+- Transcripts / History
+- I18n - Internationalization
+
+### Roadmap for v1.0
+
+- Image embeds
+- File uploads
+- Full text search
+- REST-like APIs
+- Hubot Friendly
+- Off-the-Record (OTR) Messaging
+- LDAP / Kerberos Authentication
+- XMPP Multi-user chat (MUC)
+- WebRTC signalling
+- Native Mobile App
+- Native Desktop App
 
 #### Changelog
 

client/views/login/services.coffee

 Template.loginServices.helpers
-	hasLoginServices: ->
-		return Accounts.oauth.serviceNames()?.length > 0
-
 	loginService: ->
 		services = []
 
-		authServices = Accounts.oauth.serviceNames()
-
+		authServices = _.pluck ServiceConfiguration.configurations.find({}, { service: 1 }).fetch(), 'service'
+		
 		authServices.sort()
 
 		authServices.forEach (service) ->

client/views/login/services.html

 <template name='loginServices'>
-	{{#if hasLoginServices}}
+	{{#if loginService.length}}
 		<div class="social-login">
 			<h3>{{_ "loginServices.login_with"}}</h3>
 			{{#each loginService}}

public/landing/index.html

@@ -6,7 +6,7 @@
 	<meta http-equiv="expires" content="-1" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-	<meta name="description" content="This is an example of a meta description. This will often show up in search results.">
+	<meta name="description" content="Open Source Slack-like online chat, built with Meteor.">
 	<meta content="summary" name="twitter:card" />
 	<meta content="@rocketchatapp" name="twitter:site" />
 	<meta content="@rocketchatapp" name="twitter:creator" />