From b11cacc48ae992aa4ca183911ff03bb981866d9a Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:40:46 +0000 Subject: [PATCH 01/12] Changed 'AppStore' to 'App Store' As per Apple's marketing guidelines: https://developer.apple.com/app-store/marketing/guidelines/ Also removed excessive use of exclamation marks; read more like marketing material than a serious feature list that could be referenced on the likes of Wikipedia. :- ) --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 12b2a5b0f5d4..ffdccf440f99 100644 --- a/README.md +++ b/README.md @@ -75,11 +75,11 @@ Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron] ## Native Mobile Apps *Note: currently the native apps doesn't support all the features that web does. If you're looking for it, you should download the Cordova apps.* -[![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=chat.rocket.android) +[![Rocket.Chat on Apple App Store](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=chat.rocket.android) ## Hybrid Mobile Apps (Cordova) -[![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat) +[![Rocket.Chat on Apple App Store](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat) *Now compatible with all Android devices as old as version 4.0.x - [download here](https://docs.rocket.chat/developer-guides/mobile-apps/), even on BlackBerry Passport!* @@ -318,9 +318,9 @@ It is a great solution for communities and companies wanting to privately host t - 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/) -- Mobile app for iPhone, iPad, and iPod touch [Download on AppStore!](https://geo.itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) -- Mobile app for Android phone, tablet, and TV stick [Available now on Google Play!](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat) -- Native Firefox OS Application (also for Desktop Firefox and Firefox for Android!) - [Check the docs page for install instructions](https://docs.rocket.chat/installation/mobile-and-desktop-apps/#native-firefox-os-app) +- Mobile app for iPhone, iPad, and iPod touch [Download on App Store](https://geo.itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) +- Mobile app for Android phone, tablet, and TV stick [Available now on Google Play](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat) +- Native Firefox OS Application (also for Desktop Firefox and Firefox for Android) - [Check the docs page for install instructions](https://docs.rocket.chat/installation/mobile-and-desktop-apps/#native-firefox-os-app) - Sandstorm.io instant Rocket.Chat server [Now on Sandstorm App Store](https://apps.sandstorm.io/app/vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0) - Available on [Cloudron Store](https://cloudron.io/appstore.html#chat.rocket.cloudronapp) From 3b0a1eba7bc5dd06d4f9bc9276e5cd5e9b51a900 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:45:52 +0000 Subject: [PATCH 02/12] Capitalized explanation of acronym Considered good form. :- ) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ffdccf440f99..f60bb5d0d63a 100644 --- a/README.md +++ b/README.md @@ -276,7 +276,7 @@ It is a great solution for communities and companies wanting to privately host t ## Features -- BYOS (bring your own server) +- BYOS (Bring Your Own Server) - Multiple Rooms - Direct Messages - Private Groups From 8b6d3634431b1b0ebe86da6722cc92e22ed3535d Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:48:44 +0000 Subject: [PATCH 03/12] Explained PSTN acronym --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f60bb5d0d63a..233ad9f60273 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ It is a great solution for communities and companies wanting to privately host t - Native Android Application [Issue #271 - HELP WANTED](https://github.com/RocketChat/Rocket.Chat/issues/271) - Off the Record Messaging [Issue #36](https://github.com/RocketChat/Rocket.Chat/issues/36), [Issue #268](https://github.com/RocketChat/Rocket.Chat/issues/268) - Wordpress Plug-in [Issue # 1920](https://github.com/RocketChat/Rocket.Chat/issues/1920) -- Integration with PSTN (telephone networks) +- Integration with PSTN (Public Switched Telephone Networks) - API-enabled methods: [Issue #202](https://github.com/RocketChat/Rocket.Chat/issues/202), [Issue #454](https://github.com/RocketChat/Rocket.Chat/issues/454), [Issue #455](https://github.com/RocketChat/Rocket.Chat/issues/455), [Issue #759](https://github.com/RocketChat/Rocket.Chat/issues/759) - Scalable WebRTC broadcaster / media-server integration, [Issue #1118](https://github.com/RocketChat/Rocket.Chat/issues/1118) - White label hosting From d918e18343fb2f5a3e0bdc14ee67e7bc7e7f6bc0 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:50:52 +0000 Subject: [PATCH 04/12] Capitalized titles for consistency --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 233ad9f60273..8dc102f3b34f 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ * [Community](#community) -* [Mobile apps](#mobile-apps) -* [Desktop apps](#desktop-apps) +* [Mobile Apps](#mobile-apps) +* [Desktop Apps](#desktop-apps) * [Deployment](#deployment) * [Snaps](#instant-server-installation-with-snaps) * [RocketChatLauncher](#rocketchatlauncher) From be10a9d9b593253d1f863b7441b33d36d4bc5287 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:52:43 +0000 Subject: [PATCH 05/12] Changed 'On The News' to 'In The News' Makes more grammatical sense. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8dc102f3b34f..944fc036ed8b 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ * [WeDeploy](#wedeploy) * [D2C.io](#d2cio) * [About Rocket.Chat](#about-rocketchat) - * [On the News](#on-the-news) + * [In the News](#in-the-news) * [Features](#features) * [Roadmap](#roadmap) * [How it all started](#how-it-all-started) @@ -244,7 +244,7 @@ Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](ht 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. -## On the News +## In the News ##### [Wired](http://www.wired.com/2016/03/open-source-devs-racing-build-better-versions-slack/) > Open Sourcers Race to Build Better Versions of Slack From 15e864e84722bff293175789da1941c11c1787ca Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:54:48 +0000 Subject: [PATCH 06/12] Changed 'letsencrypt' to 'Let's Encrypt' This is in accordance with their guidelines for using their brand. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 944fc036ed8b..752544471fe1 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ sudo snap install rocketchat-server Installing snaps is very quick. By running that command you have your full Rocket.Chat server up and running. Snaps are secure. They are isolated with all of their dependencies. Snaps also auto update when we release new versions. -Our snap features a built-in reverse proxy that can request and maintain free letsencrypt SSL certificates. You can go from zero to a public-facing SSL-secured Rocket.Chat server in less than 5 minutes. +Our snap features a built-in reverse proxy that can request and maintain free Let's Encrypt SSL certificates. You can go from zero to a public-facing SSL-secured Rocket.Chat server in less than 5 minutes. Find out more information about our snaps [here](https://docs.rocket.chat/installation/manual-installation/ubuntu/snaps/). From 3954f3135fc77945486ccd57e79ed3fb7b4a53df Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:57:27 +0000 Subject: [PATCH 07/12] Changed 'Mac OSX' to 'macOS' This is in accordance to Apple's new brand guidelines. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 752544471fe1..50b77e91bfb2 100644 --- a/README.md +++ b/README.md @@ -317,7 +317,7 @@ It is a great solution for communities and companies wanting to privately host t - API access from [Perl](https://metacpan.org/pod/Net::RocketChat) and [Java](https://github.com/baloise/rocket-chat-rest-client) (community contributions) - 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/) +- Native Cross-Platform Desktop Application [Windows, macOS, or Linux](https://rocket.chat/) - Mobile app for iPhone, iPad, and iPod touch [Download on App Store](https://geo.itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) - Mobile app for Android phone, tablet, and TV stick [Available now on Google Play](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat) - Native Firefox OS Application (also for Desktop Firefox and Firefox for Android) - [Check the docs page for install instructions](https://docs.rocket.chat/installation/mobile-and-desktop-apps/#native-firefox-os-app) From 6ea03a2aff55edbe54a2b3904b38b1dd604aaa36 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 21:59:00 +0000 Subject: [PATCH 08/12] Changed 'education' to 'educational' Fixed a typo, as per http://www.webster-dictionary.org/definition/educational%20institution --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50b77e91bfb2..36e758768806 100644 --- a/README.md +++ b/README.md @@ -299,7 +299,7 @@ It is a great solution for communities and companies wanting to privately host t - Full text search - Live chat / Messaging call center - LDAP Authentication -- CAS 1.0, 2.0 support for education institutions and hosting providers worldwide +- CAS 1.0, 2.0 support for educational institutions and hosting providers worldwide - Support for Okta SSO through SAML v2 - I18n - Supports 22 Languages - Hubot Friendly From eb6c11854ed6b002cb975960a0ed8b5183206bc9 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 22:13:42 +0000 Subject: [PATCH 09/12] Removed excessive spaces --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 36e758768806..5c6b0e182134 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ sudo snap install rocketchat-server [![Rocket.Chat Snap is recommended for Linux deployments](https://github.com/Sing-Li/bbug/raw/master/images/ubuntulogo.png)](https://uappexplorer.com/snap/ubuntu/rocketchat-server) -Installing snaps is very quick. By running that command you have your full Rocket.Chat server up and running. Snaps are secure. They are isolated with all of their dependencies. Snaps also auto update when we release new versions. +Installing snaps is very quick. By running that command you have your full Rocket.Chat server up and running. Snaps are secure. They are isolated with all of their dependencies. Snaps also auto update when we release new versions. Our snap features a built-in reverse proxy that can request and maintain free Let's Encrypt SSL certificates. You can go from zero to a public-facing SSL-secured Rocket.Chat server in less than 5 minutes. @@ -333,13 +333,13 @@ It is a great solution for communities and companies wanting to privately host t - 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 Messaging [Issue #36](https://github.com/RocketChat/Rocket.Chat/issues/36), [Issue #268](https://github.com/RocketChat/Rocket.Chat/issues/268) -- Wordpress Plug-in [Issue # 1920](https://github.com/RocketChat/Rocket.Chat/issues/1920) +- Wordpress Plug-in [Issue # 1920](https://github.com/RocketChat/Rocket.Chat/issues/1920) - Integration with PSTN (Public Switched Telephone Networks) - API-enabled methods: [Issue #202](https://github.com/RocketChat/Rocket.Chat/issues/202), [Issue #454](https://github.com/RocketChat/Rocket.Chat/issues/454), [Issue #455](https://github.com/RocketChat/Rocket.Chat/issues/455), [Issue #759](https://github.com/RocketChat/Rocket.Chat/issues/759) - Scalable WebRTC broadcaster / media-server integration, [Issue #1118](https://github.com/RocketChat/Rocket.Chat/issues/1118) - White label hosting - Reseller support for white label hosting -- CRM integrations: Microsoft Dynamics CRM, Salesforce.com, Zoho.com, SugarCRM, SuiteCRM and more +- CRM integrations: Microsoft Dynamics CRM, Salesforce.com, Zoho.com, SugarCRM, SuiteCRM and more - 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) #### Planned @@ -379,7 +379,7 @@ Please head over to the [Hubot Integration Project](https://github.com/RocketCha #### Chat-ops integrations powered by Hubot -Integrate your application with fly-in panels today! Early access is available for developers. +Integrate your application with fly-in panels today! Early access is available for developers. ![Sample integration of a Drones Fleet Management System](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/dronechatops.png) @@ -427,7 +427,7 @@ If you want to help, send an email to support at rocket.chat to be invited to th ## How to Contribute -Already a JavaScript developer? Familiar with Meteor? [Pick an issue](https://github.com/RocketChat/Rocket.Chat/labels/contrib%3A%20easy), push a PR and instantly become a member of Rocket.Chat's international contributors community. +Already a JavaScript developer? Familiar with Meteor? [Pick an issue](https://github.com/RocketChat/Rocket.Chat/labels/contrib%3A%20easy), push a PR and instantly become a member of Rocket.Chat's international contributors community. A lot of work has already gone into Rocket.Chat, but we have much bigger plans for it! From cf7b77e058b78d8808568e591537f1250c518b12 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 22:16:48 +0000 Subject: [PATCH 10/12] Reworded Remote Video Monitoring 'Remote Video Monitoring' is used elsewhere and makes a lot more sense. https://rocket.chat/docs/community-cookbook/remote-video-monitoring/ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c6b0e182134..80959eb86fc7 100644 --- a/README.md +++ b/README.md @@ -312,7 +312,7 @@ It is a great solution for communities and companies wanting to privately host t - Drupal 7.x and 8.x Plug-in (both stable and development flavours) ([download](https://www.drupal.org/project/rocket_chat) and [source code](https://git.drupal.org/project/rocket_chat.git) ) - XMPP bridge ([try it](https://open.rocket.chat/channel/general)) - REST APIs -- Remote Locations Video Monitoring +- Remote Video Monitoring - Native real-time APIs for Microsoft C#, Visual Basic, F# and other .NET supported languages ([Get it!](https://www.nuget.org/packages/Rocket.Chat.Net/0.0.12-pre)) - API access from [Perl](https://metacpan.org/pod/Net::RocketChat) and [Java](https://github.com/baloise/rocket-chat-rest-client) (community contributions) - Chat-ops powered by Hubot: scalable horizontal app integration (early access) From 6c59fb594eaf7650016278e73a11c51fc78c243e Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 22:18:10 +0000 Subject: [PATCH 11/12] Amended 'Wordpress' to 'WordPress' As per WordPress brand usage guidelines. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 80959eb86fc7..f3bf7c96664f 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ It is a great solution for communities and companies wanting to privately host t - 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 Messaging [Issue #36](https://github.com/RocketChat/Rocket.Chat/issues/36), [Issue #268](https://github.com/RocketChat/Rocket.Chat/issues/268) -- Wordpress Plug-in [Issue # 1920](https://github.com/RocketChat/Rocket.Chat/issues/1920) +- WordPress Plug-in [Issue # 1920](https://github.com/RocketChat/Rocket.Chat/issues/1920) - Integration with PSTN (Public Switched Telephone Networks) - API-enabled methods: [Issue #202](https://github.com/RocketChat/Rocket.Chat/issues/202), [Issue #454](https://github.com/RocketChat/Rocket.Chat/issues/454), [Issue #455](https://github.com/RocketChat/Rocket.Chat/issues/455), [Issue #759](https://github.com/RocketChat/Rocket.Chat/issues/759) - Scalable WebRTC broadcaster / media-server integration, [Issue #1118](https://github.com/RocketChat/Rocket.Chat/issues/1118) @@ -344,7 +344,7 @@ It is a great solution for communities and companies wanting to privately host t #### Planned - Kerberos Authentication: [Issue #839](https://github.com/RocketChat/Rocket.Chat/issues/839) -- More webhooks: GitLab, Confluence, Jira, Piwik, Wordpress: [Issue #233](https://github.com/RocketChat/Rocket.Chat/issues/233), [Issue #525](https://github.com/RocketChat/Rocket.Chat/issues/525), [Issue #637](https://github.com/RocketChat/Rocket.Chat/issues/637), [Issue #638](https://github.com/RocketChat/Rocket.Chat/issues/638), [Issue #747](https://github.com/RocketChat/Rocket.Chat/issues/747) +- More webhooks: GitLab, Confluence, Jira, Piwik, WordPress: [Issue #233](https://github.com/RocketChat/Rocket.Chat/issues/233), [Issue #525](https://github.com/RocketChat/Rocket.Chat/issues/525), [Issue #637](https://github.com/RocketChat/Rocket.Chat/issues/637), [Issue #638](https://github.com/RocketChat/Rocket.Chat/issues/638), [Issue #747](https://github.com/RocketChat/Rocket.Chat/issues/747) - Anonymous use of Rocket.Chat: [Issue #604](https://github.com/RocketChat/Rocket.Chat/issues/604) - File Sharing via P2P: [Issue #369](https://github.com/RocketChat/Rocket.Chat/issues/369), [Issue #370](https://github.com/RocketChat/Rocket.Chat/issues/370) - Anti-virus checking on file uploads: [Issue #757](https://github.com/RocketChat/Rocket.Chat/issues/757) From ec3ae5e87f55e0542423b3dc531db91663b0bad7 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Fri, 29 Dec 2017 22:35:24 +0000 Subject: [PATCH 12/12] Grammar improvement --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3bf7c96664f..e167a907f424 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ # Community -Join thousands of members world-wide 24 x 7 in our [community server](https://open.rocket.chat). +Join thousands of members worldwide 24/7 in our [community server](https://open.rocket.chat). [![Rocket.Chat](https://open.rocket.chat/api/v1/shield.svg?type=channel&name=Rocket.Chat&channel=support)](https://open.rocket.chat/channel/support) for help from our community with general Rocket.Chat questions.