From 3c161e3c09bcd1105ca0e2aa8cc7b676bcd2d137 Mon Sep 17 00:00:00 2001 From: Gabriel Engel Date: Thu, 12 Nov 2015 02:07:27 -0200 Subject: [PATCH] Using official emojione package --- .meteor/versions | 2 +- README.md | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index b614712a8a3..e14a67dbf4c 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -39,6 +39,7 @@ ecmascript@0.1.6 ecmascript-runtime@0.2.6 ejson@1.0.7 email@1.0.8 +emojione:emojione@1.5.2 facebook@1.2.2 fastclick@1.0.7 francocatena:status@1.5.0 @@ -109,7 +110,6 @@ percolate:migrations@0.9.6 percolate:synced-cron@1.3.0 pntbr:js-yaml-client@0.0.1 promise@0.5.1 -qnub:emojione@1.5.1_2 raix:eventemitter@0.1.3 raix:eventstate@0.0.4 raix:handlebar-helpers@0.2.5 diff --git a/README.md b/README.md index 73b34b6b932..47e916bffbe 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Available from the AppStore: [![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) @@ -90,18 +90,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/) @@ -145,7 +145,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. @@ -269,5 +269,3 @@ 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) - - 3,000 commits!!