Merge pull request #9320 from RocketChat/release-0.60.3

Release 0.60.3

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.60.2
+ENV RC_VERSION 0.60.3
 
 MAINTAINER buildmaster@rocket.chat
 

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.60.2"),
+		appMarketingVersion = (defaultText = "0.60.3"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.60.2
+    RC_VERSION=0.60.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

HISTORY.md

@@ -1,3 +1,26 @@
+<a name="0.60.3"></a>
+## 0.60.3 (2018-01-03)
+
+
+### Bug Fixes
+
+- [#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) custom emoji size on sidebar item
+- [#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) English Typos
+- [#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309) LDAP/AD is not importing all users
+- [#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) sidebar footer padding
+- [#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) svg render on firefox
+- [#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) Wrong position of notifications alert in accounts preference page
+
+
+<details>
+<summary>Others</summary>
+
+- [#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) Fix: Improved README.md
+- [#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) Fix: README typo
+</details>
+
+
+
 <a name="0.60.2"></a>
 ## 0.60.2 (2017-12-29)
 
@@ -2370,7 +2393,7 @@
 - [#6498](https://github.com/RocketChat/Rocket.Chat/pull/6498) Convert Ui-Master Package to Js
 - [#6473](https://github.com/RocketChat/Rocket.Chat/pull/6473) Convert ui-vrecord Package to JS
 - [#6494](https://github.com/RocketChat/Rocket.Chat/pull/6494) Convert Version Package to JS
-- [#6499](https://github.com/RocketChat/Rocket.Chat/pull/6499) Convert Wordpress Package to js
+- [#6499](https://github.com/RocketChat/Rocket.Chat/pull/6499) Convert WordPress Package to js
 - [#6496](https://github.com/RocketChat/Rocket.Chat/pull/6496) converted getAvatarUrlFromUsername
 - [#6500](https://github.com/RocketChat/Rocket.Chat/pull/6500) converted messageAttachment coffee to js
 - [#6467](https://github.com/RocketChat/Rocket.Chat/pull/6467) converted rocketchat-mentions coffee to js

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)
@@ -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)
@@ -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.
 
@@ -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!*
 
@@ -99,9 +99,9 @@ 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 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/).
 
@@ -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
@@ -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
@@ -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
@@ -312,15 +312,15 @@ 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)
 - 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)
+- 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)
 - 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)
 
@@ -333,18 +333,18 @@ 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)
-- Integration with PSTN (telephone networks)
+- 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
 - 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)
@@ -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!
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.60.2",
+	"version": "0.60.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

packages/rocketchat-i18n/i18n/ca.i18n.json

@@ -110,8 +110,8 @@
   "Accounts_OAuth_Twitter_secret": "Twitter Secret",
   "Accounts_OAuth_Wordpress": "Inici de sessió amb WordPress",
   "Accounts_OAuth_Wordpress_callback_url": "URL de retorn (callback) de WordPress",
-  "Accounts_OAuth_Wordpress_id": "Wordpress ID",
-  "Accounts_OAuth_Wordpress_secret": "Wordpress Secret",
+  "Accounts_OAuth_Wordpress_id": "WordPress ID",
+  "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "Restablir contrasenya",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Rols per defecte per als serveis d'autenticació",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Rols per defecte (separats per comes) que s'assignaran als usuaris quan es registrin a través dels serveis d'autenticació",

packages/rocketchat-i18n/i18n/cs.i18n.json

@@ -110,7 +110,7 @@
   "Accounts_OAuth_Twitter_id": "Twitter ID",
   "Accounts_OAuth_Twitter_secret": "Twitter Secret",
   "Accounts_OAuth_Wordpress": "WordPress Přihlášení",
-  "Accounts_OAuth_Wordpress_callback_url": "Wordpress callback URL",
+  "Accounts_OAuth_Wordpress_callback_url": "WordPress callback URL",
   "Accounts_OAuth_Wordpress_id": "ID WordPress",
   "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "Obnovit heslo",

packages/rocketchat-i18n/i18n/de-AT.i18n.json

@@ -90,10 +90,10 @@
   "Accounts_OAuth_Twitter_callback_url": "Twitter-Callback-URL",
   "Accounts_OAuth_Twitter_id": "Twitter-ID",
   "Accounts_OAuth_Twitter_secret": "Twitter-Secret",
-  "Accounts_OAuth_Wordpress": "Anmeldung über Wordpress",
-  "Accounts_OAuth_Wordpress_callback_url": "Wordpress-Callback-URL",
+  "Accounts_OAuth_Wordpress": "Anmeldung über WordPress",
+  "Accounts_OAuth_Wordpress_callback_url": "WordPress-Callback-URL",
   "Accounts_OAuth_Wordpress_id": "WordPress-ID",
-  "Accounts_OAuth_Wordpress_secret": "Wordpress-Secret",
+  "Accounts_OAuth_Wordpress_secret": "WordPress-Secret",
   "Accounts_PasswordReset": "Passwort zurücksetzen",
   "Accounts_Registration_AuthenticationServices_Enabled": "Anmeldung mit Authentifizierungsdiensten",
   "Accounts_RegistrationForm": "Anmeldeformular",
@@ -160,7 +160,7 @@
   "API_Gitlab_URL": "GitLab-URL",
   "API_Token": "API-Token",
   "API_User_Limit": "User Limit für das Hinzufügen aller Benutzer auf Kanal",
-  "API_Wordpress_URL": "Wordpress-URL",
+  "API_Wordpress_URL": "WordPress-URL",
   "Apiai_Key": "Api.ai Key",
   "Apiai_Language": "Api.ai Sprache",
   "Appearance": "Erscheinungsbild",

packages/rocketchat-i18n/i18n/de.i18n.json

@@ -110,8 +110,8 @@
   "Accounts_OAuth_Twitter_callback_url": "Twitter-Callback-URL",
   "Accounts_OAuth_Twitter_id": "Twitter-ID",
   "Accounts_OAuth_Twitter_secret": "Geheimer Twitter Schlüssel",
-  "Accounts_OAuth_Wordpress": "Wordpress-Anmeldung erlauben",
-  "Accounts_OAuth_Wordpress_callback_url": "Wordpress-Callback-URL",
+  "Accounts_OAuth_Wordpress": "WordPress-Anmeldung erlauben",
+  "Accounts_OAuth_Wordpress_callback_url": "WordPress-Callback-URL",
   "Accounts_OAuth_Wordpress_id": "WordPress-ID",
   "Accounts_OAuth_Wordpress_secret": "Geheimer WordPress Schlüssel",
   "Accounts_PasswordReset": "Passwort zurücksetzen",
@@ -225,7 +225,7 @@
   "API_Upper_Count_Limit": "Maximales Limit",
   "API_Upper_Count_Limit_Description": "Max. Anzahl an Einträgen, die das REST API zurückliefen soll (sofern nicht weiter eingeschränkt)",
   "API_User_Limit": "Limit für das Hinzufügen aller Benutzer zu einem Kanal",
-  "API_Wordpress_URL": "Wordpress-URL",
+  "API_Wordpress_URL": "WordPress-URL",
   "Apiai_Key": "Api.ai-Schlüssel",
   "Apiai_Language": "Api.ai-Sprache",
   "Appearance": "Erscheinungsbild",

packages/rocketchat-i18n/i18n/el.i18n.json

@@ -84,7 +84,7 @@
   "Accounts_OAuth_Twitter_id": "Twitter Id",
   "Accounts_OAuth_Twitter_secret": "Twitter Secret",
   "Accounts_OAuth_Wordpress": "WordPress Είσοδος",
-  "Accounts_OAuth_Wordpress_callback_url": "Wordpress επανάκλησης URL",
+  "Accounts_OAuth_Wordpress_callback_url": "WordPress επανάκλησης URL",
   "Accounts_OAuth_Wordpress_id": "WordPress Id",
   "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "Επανακαθορισμός κωδικού",