From 70cb8f3e7f9c648568006ad643a69461344213d8 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 2 Jan 2018 14:52:17 -0200 Subject: [PATCH 01/11] Merge pull request #9285 from HammyHavoc/patch-5 [FIX] English Typos --- packages/rocketchat-i18n/i18n/en.i18n.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index b75ee4f14999..e05dff4f7cc7 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -938,7 +938,7 @@ "IRC_Channel_Leave": "Output of the PART command.", "IRC_Channel_Users": "Output of the NAMES command.", "IRC_Channel_Users_End": "End of output of the NAMES command.", - "IRC_Description": "Internet Relay Chat (IRC) is a text-based group communication tool. Users join uniquely named channels, or rooms, for open discussion. IRC also supports private messages between indivdiual users and file sharing capabilities. This package integrates these layers of functionality with Rocket.Chat.", + "IRC_Description": "Internet Relay Chat (IRC) is a text-based group communication tool. Users join uniquely named channels, or rooms, for open discussion. IRC also supports private messages between individual users and file sharing capabilities. This package integrates these layers of functionality with Rocket.Chat.", "IRC_Enabled": "Attempt to integrate IRC support. Changing this value requires restarting Rocket.Chat.", "IRC_Hostname": "The IRC host server to connect to.", "IRC_Login_Fail": "Output upon a failed connection to the IRC server.", @@ -1288,7 +1288,7 @@ "New_logs": "New logs", "New_Message_Notification": "New Message Notification", "New_messages": "New messages", - "New_password": "New password", + "New_password": "New Password", "New_Password_Placeholder": "Please enter new password...", "New_role": "New role", "New_Room_Notification": "New Room Notification", @@ -1453,8 +1453,8 @@ "Private_Groups": "Private Groups", "Private_Groups_list": "List of Private Groups", "Profile": "Profile", - "Profile_details": "Profile details", - "Profile_picture": "Profile picture", + "Profile_details": "Profile Details", + "Profile_picture": "Profile Picture", "Profile_saved_successfully": "Profile saved successfully", "Public": "Public", "Public_Channel": "Public Channel", @@ -1929,7 +1929,7 @@ "Use_service_avatar": "Use %s avatar", "Use_this_username": "Use this username", "Use_uploaded_avatar": "Use uploaded avatar", - "Use_url_for_avatar": "Use url for avatar", + "Use_url_for_avatar": "Use URL for avatar", "Use_User_Preferences_or_Global_Settings": "Use User Preferences or Global Settings", "User": "User", "user-generate-access-token": "User Generate Access Token", From 3b05711f0d1a0f650da5b3cf5df77d9bf3317457 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 2 Jan 2018 14:53:49 -0200 Subject: [PATCH 02/11] Merge pull request #9286 from HammyHavoc/patch-6 Fix: README typo --- packages/rocketchat-irc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-irc/README.md b/packages/rocketchat-irc/README.md index 2153339f4aa8..0d5457d8fe4c 100644 --- a/packages/rocketchat-irc/README.md +++ b/packages/rocketchat-irc/README.md @@ -2,7 +2,7 @@ ### Overview -Internet Relay Chat (IRC) is a text-based group communication tool. Users join uniquely named channels, or rooms, for open discussion. IRC also supports private messages between indivdiual users and file sharing capabilities. This package integrates these layers of functionality with Rocket.Chat. +Internet Relay Chat (IRC) is a text-based group communication tool. Users join uniquely named channels, or rooms, for open discussion. IRC also supports private messages between individual users and file sharing capabilities. This package integrates these layers of functionality with Rocket.Chat. This package does not attempt to replace Rocket.Chat functionality nor operate as an IRC server for third-party client support. Rather, it utilizes Slack's similarities to IRC by allowing users to transparently access external IRC servers (e.g. Freenode) through Rocket.Chat's desktop and mobile app frontends. From b64e5a9dfa6b8cb7c8a11653097d990672ba4e81 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 2 Jan 2018 14:57:32 -0200 Subject: [PATCH 03/11] Merge pull request #9289 from HammyHavoc/patch-7 [FIX] Wrong position of notifications alert in accounts preference page --- packages/rocketchat-ui-account/client/accountPreferences.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-account/client/accountPreferences.html b/packages/rocketchat-ui-account/client/accountPreferences.html index 17b6bcf090d6..d62ebda59485 100644 --- a/packages/rocketchat-ui-account/client/accountPreferences.html +++ b/packages/rocketchat-ui-account/client/accountPreferences.html @@ -220,8 +220,8 @@

{{_ "Messages"}}

+
{{_ "You_need_to_verifiy_your_email_address_to_get_notications"}}
-
{{_ "You_need_to_verifiy_your_email_address_to_get_notications"}}
From 298a7e71361a82a73b2295f6c4553cd2f03e359c Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 2 Jan 2018 14:59:51 -0200 Subject: [PATCH 04/11] Merge pull request #9290 from HammyHavoc/patch-8 Fix: Improved README.md --- README.md | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 12b2a5b0f5d4..e167a907f424 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) @@ -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! From 2bb6d880d634ca29b8801ca65b877bfa698f5841 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Tue, 2 Jan 2018 17:01:37 +0000 Subject: [PATCH 05/11] [FIX] Changed 'Wordpress' to 'WordPress (#9291) Fix: Change 'Wordpress' to 'WordPress --- HISTORY.md | 2 +- packages/rocketchat-i18n/i18n/ca.i18n.json | 4 ++-- packages/rocketchat-i18n/i18n/cs.i18n.json | 2 +- packages/rocketchat-i18n/i18n/de-AT.i18n.json | 8 ++++---- packages/rocketchat-i18n/i18n/de.i18n.json | 6 +++--- packages/rocketchat-i18n/i18n/el.i18n.json | 2 +- packages/rocketchat-i18n/i18n/en.i18n.json | 4 ++-- packages/rocketchat-i18n/i18n/fi.i18n.json | 4 ++-- packages/rocketchat-i18n/i18n/fr.i18n.json | 2 +- packages/rocketchat-i18n/i18n/hr.i18n.json | 2 +- packages/rocketchat-i18n/i18n/hu.i18n.json | 2 +- packages/rocketchat-i18n/i18n/id.i18n.json | 4 ++-- packages/rocketchat-i18n/i18n/it.i18n.json | 2 +- packages/rocketchat-i18n/i18n/km.i18n.json | 2 +- packages/rocketchat-i18n/i18n/ku.i18n.json | 2 +- packages/rocketchat-i18n/i18n/lo.i18n.json | 2 +- packages/rocketchat-i18n/i18n/ms-MY.i18n.json | 2 +- packages/rocketchat-i18n/i18n/nl.i18n.json | 2 +- packages/rocketchat-i18n/i18n/pl.i18n.json | 2 +- packages/rocketchat-i18n/i18n/ro.i18n.json | 2 +- packages/rocketchat-i18n/i18n/sq.i18n.json | 2 +- packages/rocketchat-i18n/i18n/sv.i18n.json | 2 +- packages/rocketchat-i18n/i18n/tr.i18n.json | 2 +- packages/rocketchat-i18n/i18n/uk.i18n.json | 2 +- packages/rocketchat-i18n/i18n/zh.i18n.json | 2 +- 25 files changed, 34 insertions(+), 34 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 6cd166d24a23..c9f55cd606c9 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2370,7 +2370,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 diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json index 2dc8b4821766..5b2f62f77d42 100644 --- a/packages/rocketchat-i18n/i18n/ca.i18n.json +++ b/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ó", diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json index 69fa3af7528f..1f8dfc177f56 100644 --- a/packages/rocketchat-i18n/i18n/cs.i18n.json +++ b/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", diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json index 3d3bbd45fdc1..6f7e56916076 100644 --- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json +++ b/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", diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index 82e3ec46ea66..73ab1b522875 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/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", diff --git a/packages/rocketchat-i18n/i18n/el.i18n.json b/packages/rocketchat-i18n/i18n/el.i18n.json index 366b69b1620c..40085eb0053c 100644 --- a/packages/rocketchat-i18n/i18n/el.i18n.json +++ b/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": "Επανακαθορισμός κωδικού", diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index e05dff4f7cc7..384c2d477d02 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -117,7 +117,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress Login", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress Callback URL", + "Accounts_OAuth_Wordpress_callback_url": "WordPress Callback URL", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Password Reset", @@ -1313,7 +1313,7 @@ "No_such_command": "No such command: `/__command__`", "No_user_with_username_%s_was_found": "No user with username \"%s\" was found!", "Nobody_available": "Nobody available", - "Node_version": "Node version", + "Node_version": "Node Version", "None": "None", "Normal": "Normal", "Not_authorized": "Not authorized", diff --git a/packages/rocketchat-i18n/i18n/fi.i18n.json b/packages/rocketchat-i18n/i18n/fi.i18n.json index 188d27f8dabb..6268b181d533 100644 --- a/packages/rocketchat-i18n/i18n/fi.i18n.json +++ b/packages/rocketchat-i18n/i18n/fi.i18n.json @@ -90,9 +90,9 @@ "Accounts_OAuth_Twitter_id": "Twitter ID", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress-kirjautuminen", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress Callback URL", + "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": "Salasanan nollaus", "Accounts_Registration_AuthenticationServices_Enabled": "Rekisteröinti autentikointipalveluiden kautta", "Accounts_RegistrationForm": "Rekisteröintilomake", diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json index d1cf6b7738ab..946ab07c68f9 100644 --- a/packages/rocketchat-i18n/i18n/fr.i18n.json +++ b/packages/rocketchat-i18n/i18n/fr.i18n.json @@ -100,7 +100,7 @@ "Accounts_OAuth_Twitter_id": "ID Twitter", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "Connexion avec WordPress", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress URL de Callback", + "Accounts_OAuth_Wordpress_callback_url": "WordPress URL de Callback", "Accounts_OAuth_Wordpress_id": "ID WordPress", "Accounts_OAuth_Wordpress_secret": "Secret WordPress", "Accounts_PasswordReset": "Réinitialisation du mot de passe", diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json index 42a8ccf2b55e..755eb94f1233 100644 --- a/packages/rocketchat-i18n/i18n/hr.i18n.json +++ b/packages/rocketchat-i18n/i18n/hr.i18n.json @@ -93,7 +93,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Tajna", "Accounts_OAuth_Wordpress": "WordPress Prijava", - "Accounts_OAuth_Wordpress_callback_url": "URL Wordpress povratnog poziva ", + "Accounts_OAuth_Wordpress_callback_url": "URL WordPress povratnog poziva ", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Tajna", "Accounts_PasswordReset": "Resetiraj lozinku", diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json index 9dbf59257b56..b1059c77237e 100644 --- a/packages/rocketchat-i18n/i18n/hu.i18n.json +++ b/packages/rocketchat-i18n/i18n/hu.i18n.json @@ -92,7 +92,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter titkos", "Accounts_OAuth_Wordpress": "WordPress Bejelentkezés", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress visszahívás URL", + "Accounts_OAuth_Wordpress_callback_url": "WordPress visszahívás URL", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Jelszó visszaállítása", diff --git a/packages/rocketchat-i18n/i18n/id.i18n.json b/packages/rocketchat-i18n/i18n/id.i18n.json index c57aed9605c7..44b70dc1fa07 100644 --- a/packages/rocketchat-i18n/i18n/id.i18n.json +++ b/packages/rocketchat-i18n/i18n/id.i18n.json @@ -81,8 +81,8 @@ "Accounts_OAuth_Twitter_callback_url": "URL Twitter Callback", "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", - "Accounts_OAuth_Wordpress": "Wordpress Login", - "Accounts_OAuth_Wordpress_callback_url": "URL Wordpress Callback", + "Accounts_OAuth_Wordpress": "WordPress Login", + "Accounts_OAuth_Wordpress_callback_url": "URL WordPress Callback", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Password reset", diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json index 8ae71b3e766e..16a96e64ebbd 100644 --- a/packages/rocketchat-i18n/i18n/it.i18n.json +++ b/packages/rocketchat-i18n/i18n/it.i18n.json @@ -102,7 +102,7 @@ "Accounts_OAuth_Twitter_id": "ID Twitter", "Accounts_OAuth_Twitter_secret": "Chiave segreta Twitter", "Accounts_OAuth_Wordpress": "WordPress Login", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress URL Callback", + "Accounts_OAuth_Wordpress_callback_url": "WordPress URL Callback", "Accounts_OAuth_Wordpress_id": "ID WordPress", "Accounts_OAuth_Wordpress_secret": "Chiave segreta WordPress", "Accounts_PasswordReset": "Reimposta password", diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json index 84ad0b1e4ebc..c44f468c7c34 100644 --- a/packages/rocketchat-i18n/i18n/km.i18n.json +++ b/packages/rocketchat-i18n/i18n/km.i18n.json @@ -81,7 +81,7 @@ "Accounts_OAuth_Twitter_callback_url": "URL ដែល Twitter បានហៅទៅវិញ", "Accounts_OAuth_Twitter_id": "លេខសម្គាល់ Twitter", "Accounts_OAuth_Twitter_secret": "Twitter សម្ងាត់", - "Accounts_OAuth_Wordpress": "ការឡុកចូល Wordpress", + "Accounts_OAuth_Wordpress": "ការឡុកចូល WordPress", "Accounts_OAuth_Wordpress_callback_url": "URL ដែលប្លកហៅទៅវិញ", "Accounts_OAuth_Wordpress_id": "លេខសម្គាល់ WordPress", "Accounts_OAuth_Wordpress_secret": "WordPress សម្ងាត់", diff --git a/packages/rocketchat-i18n/i18n/ku.i18n.json b/packages/rocketchat-i18n/i18n/ku.i18n.json index db1ba2d3f356..63adca296667 100644 --- a/packages/rocketchat-i18n/i18n/ku.i18n.json +++ b/packages/rocketchat-i18n/i18n/ku.i18n.json @@ -82,7 +82,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress Login", - "Accounts_OAuth_Wordpress_callback_url": "URL Wordpress Callback", + "Accounts_OAuth_Wordpress_callback_url": "URL WordPress Callback", "Accounts_OAuth_Wordpress_id": "Id WordPress", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Şîfreyê nû bike", diff --git a/packages/rocketchat-i18n/i18n/lo.i18n.json b/packages/rocketchat-i18n/i18n/lo.i18n.json index 37f3a778bd3c..3070db9ec3d2 100644 --- a/packages/rocketchat-i18n/i18n/lo.i18n.json +++ b/packages/rocketchat-i18n/i18n/lo.i18n.json @@ -82,7 +82,7 @@ "Accounts_OAuth_Twitter_id": "Id Twitter", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress ເຂົ້າສູ່ລະບົບ", - "Accounts_OAuth_Wordpress_callback_url": "URL Wordpress ໂທກັບ", + "Accounts_OAuth_Wordpress_callback_url": "URL WordPress ໂທກັບ", "Accounts_OAuth_Wordpress_id": "Id WordPress", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "ຕັ້ງຄ່າລະຫັດຜ່ານ", diff --git a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json index 101fb57ec931..b7d956455719 100644 --- a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json +++ b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json @@ -82,7 +82,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "Daftar masuk WordPress", - "Accounts_OAuth_Wordpress_callback_url": "URL Wordpress Callback", + "Accounts_OAuth_Wordpress_callback_url": "URL WordPress Callback", "Accounts_OAuth_Wordpress_id": " ID WordPress", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Password Reset", diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json index 91d7e15d0e91..c5361d90ee0f 100644 --- a/packages/rocketchat-i18n/i18n/nl.i18n.json +++ b/packages/rocketchat-i18n/i18n/nl.i18n.json @@ -82,7 +82,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress Inloggen", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress Callback URL", + "Accounts_OAuth_Wordpress_callback_url": "WordPress Callback URL", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Geheim (secret)", "Accounts_PasswordReset": "Wachtwoord reset", diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json index 61f065dd7b48..8577b053459e 100644 --- a/packages/rocketchat-i18n/i18n/pl.i18n.json +++ b/packages/rocketchat-i18n/i18n/pl.i18n.json @@ -95,7 +95,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress Login", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress Callback URL", + "Accounts_OAuth_Wordpress_callback_url": "WordPress Callback URL", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Zresetuj hasło", diff --git a/packages/rocketchat-i18n/i18n/ro.i18n.json b/packages/rocketchat-i18n/i18n/ro.i18n.json index 098f09b5d03d..802046f59565 100644 --- a/packages/rocketchat-i18n/i18n/ro.i18n.json +++ b/packages/rocketchat-i18n/i18n/ro.i18n.json @@ -82,7 +82,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "Autentificare WordPress", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress URL de apelare inversă", + "Accounts_OAuth_Wordpress_callback_url": "WordPress URL de apelare inversă", "Accounts_OAuth_Wordpress_id": " Id WordPress", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Resetează parola", diff --git a/packages/rocketchat-i18n/i18n/sq.i18n.json b/packages/rocketchat-i18n/i18n/sq.i18n.json index 8d389179d9e0..98c124cc6579 100644 --- a/packages/rocketchat-i18n/i18n/sq.i18n.json +++ b/packages/rocketchat-i18n/i18n/sq.i18n.json @@ -82,7 +82,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress Login", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress Callback URL", + "Accounts_OAuth_Wordpress_callback_url": "WordPress Callback URL", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "Password Reset", diff --git a/packages/rocketchat-i18n/i18n/sv.i18n.json b/packages/rocketchat-i18n/i18n/sv.i18n.json index 7a9c8a9dcfac..74ed9b744765 100644 --- a/packages/rocketchat-i18n/i18n/sv.i18n.json +++ b/packages/rocketchat-i18n/i18n/sv.i18n.json @@ -91,7 +91,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "Word Login", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress återuppringning URL", + "Accounts_OAuth_Wordpress_callback_url": "WordPress återuppringning URL", "Accounts_OAuth_Wordpress_id": "Word Id", "Accounts_OAuth_Wordpress_secret": "Word Secret", "Accounts_PasswordReset": "Nollställ lösenord", diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json index 6ba3e486718c..532f5fc50c24 100644 --- a/packages/rocketchat-i18n/i18n/tr.i18n.json +++ b/packages/rocketchat-i18n/i18n/tr.i18n.json @@ -108,7 +108,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Kimliği", "Accounts_OAuth_Twitter_secret": "Twitter Gizli Kodu", "Accounts_OAuth_Wordpress": "WordPress ile Giriş", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress Callback URL", + "Accounts_OAuth_Wordpress_callback_url": "WordPress Callback URL", "Accounts_OAuth_Wordpress_id": "WordPress Kimliği", "Accounts_OAuth_Wordpress_secret": "WordPress Gizli Kodu", "Accounts_PasswordReset": "Parola Sıfırlama", diff --git a/packages/rocketchat-i18n/i18n/uk.i18n.json b/packages/rocketchat-i18n/i18n/uk.i18n.json index a957d28bfeb9..4111ca764fd0 100644 --- a/packages/rocketchat-i18n/i18n/uk.i18n.json +++ b/packages/rocketchat-i18n/i18n/uk.i18n.json @@ -86,7 +86,7 @@ "Accounts_OAuth_Twitter_id": "Twitter Id", "Accounts_OAuth_Twitter_secret": "Twitter Секретний", "Accounts_OAuth_Wordpress": "WordPress Увійти", - "Accounts_OAuth_Wordpress_callback_url": "URL Wordpress Зворотній дзвінок", + "Accounts_OAuth_Wordpress_callback_url": "URL WordPress Зворотній дзвінок", "Accounts_OAuth_Wordpress_id": "WordPress Id", "Accounts_OAuth_Wordpress_secret": "WordPress Секретний", "Accounts_PasswordReset": "Скидання пароля", diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json index 3c57240dad34..df866b486299 100644 --- a/packages/rocketchat-i18n/i18n/zh.i18n.json +++ b/packages/rocketchat-i18n/i18n/zh.i18n.json @@ -97,7 +97,7 @@ "Accounts_OAuth_Twitter_id": "Twitter ID", "Accounts_OAuth_Twitter_secret": "Twitter Secret", "Accounts_OAuth_Wordpress": "WordPress 账户登录", - "Accounts_OAuth_Wordpress_callback_url": "Wordpress 回调地址", + "Accounts_OAuth_Wordpress_callback_url": "WordPress 回调地址", "Accounts_OAuth_Wordpress_id": "WordPress ID", "Accounts_OAuth_Wordpress_secret": "WordPress Secret", "Accounts_PasswordReset": "重置密码", From aa40d40071f18c1cc03eac1f64adc47a5afa1a08 Mon Sep 17 00:00:00 2001 From: Hammy Havoc Date: Tue, 2 Jan 2018 17:06:46 +0000 Subject: [PATCH 06/11] [FIX] English language improvements (#9299) Fix: English language improvements --- packages/rocketchat-i18n/i18n/en.i18n.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 384c2d477d02..99d52c55dab0 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -80,7 +80,7 @@ "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Secret", "Accounts_OAuth_Facebook": "Facebook Login", "Accounts_OAuth_Facebook_callback_url": "Facebook Callback URL", - "Accounts_OAuth_Facebook_id": "Facebook App Id", + "Accounts_OAuth_Facebook_id": "Facebook App ID", "Accounts_OAuth_Facebook_secret": "Facebook Secret", "Accounts_OAuth_Github": "OAuth Enabled", "Accounts_OAuth_Github_callback_url": "Github Callback URL", @@ -1339,8 +1339,8 @@ "OAuth_Applications": "OAuth Applications", "Objects": "Objects", "Off": "Off", - "Off_the_record_conversation": "Off-the-record Conversation", - "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record conversation is not available for your browser or device.", + "Off_the_record_conversation": "Off-the-Record Conversation", + "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-Record conversation is not available for your browser or device.", "Office_Hours": "Office Hours", "Office_hours_enabled": "Office Hours Enabled", "Office_hours_updated": "Office hours updated", From 57620326a770ed1ee66db345e14f2c88139b2b91 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 2 Jan 2018 16:47:20 -0200 Subject: [PATCH 07/11] Merge pull request #9309 from RocketChat/hotfix/ldap-import [FIX] LDAP/AD is not importing all users --- packages/rocketchat-ldap/server/ldap.js | 56 +++++++++++++++++-------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js index 5c9bfe25bb68..894d00264bed 100644 --- a/packages/rocketchat-ldap/server/ldap.js +++ b/packages/rocketchat-ldap/server/ldap.js @@ -371,6 +371,17 @@ export default class LDAP { searchAllPaged(BaseDN, options, page) { this.bindIfNecessary(); + const processPage = ({entries, title, end, next}) => { + logger.search.info(title); + // Force LDAP idle to wait the record processing + this.client._updateIdle(true); + page(null, entries, {end, next: () => { + // Reset idle timer + this.client._updateIdle(); + next && next(); + }}); + }; + this.client.search(BaseDN, options, (error, res) => { if (error) { logger.search.error(error); @@ -392,33 +403,42 @@ export default class LDAP { entries.push(this.extractLdapEntryData(entry)); if (entries.length >= internalPageSize) { - logger.search.info('Internal Page'); - this.client._updateIdle(true); - page(null, entries, {end: false, next: () => { - // Reset idle timer - this.client._updateIdle(); - }}); + processPage({ + entries, + title: 'Internal Page', + end: false + }); entries = []; } }); res.on('page', (result, next) => { if (!next) { - logger.search.debug('Final Page'); this.client._updateIdle(true); - page(null, entries, {end: true, next: () => { - // Reset idle timer - this.client._updateIdle(); - }}); + processPage({ + entries, + title: 'Final Page', + end: true + }); } else if (entries.length) { logger.search.info('Page'); - // Force LDAP idle to wait the record processing - this.client._updateIdle(true); - page(null, entries, {end: !next, next: () => { - // Reset idle timer - this.client._updateIdle(); - next(); - }}); + processPage({ + entries, + title: 'Page', + end: false, + next + }); + entries = []; + } + }); + + res.on('end', () => { + if (entries.length) { + processPage({ + entries, + title: 'Final Page', + end: true + }); entries = []; } }); From f0703585021e9393acf3b8cc93b5672a24dd184d Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 3 Jan 2018 14:14:11 -0200 Subject: [PATCH 08/11] Merge pull request #9249 from RocketChat/fix-sidebar-footer-padding [FIX] sidebar footer padding --- .../client/imports/components/sidebar/sidebar-account.css | 4 ++-- .../client/imports/components/sidebar/sidebar.css | 2 +- .../rocketchat-theme/client/imports/general/variables.css | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css index a6c1c08786d6..85578a4c080b 100644 --- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css +++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css @@ -14,9 +14,9 @@ .sidebar__account { display: flex; - margin: 0 0 var(--sidebar-header-small-padding); + margin: 0 0 var(--sidebar-extra-small-default-padding); - padding: var(--sidebar-header-small-padding) var(--sidebar-default-padding) var(--sidebar-header-small-padding); + padding: var(--sidebar-extra-small-default-padding) var(--sidebar-default-padding); align-items: center; diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css index f0e368af8cd4..33fb8fec937b 100644 --- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css +++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css @@ -49,7 +49,7 @@ &__footer { width: auto; height: var(--sidebar-footer-height); - padding: calc(var(--sidebar-footer-padding) / 2) var(--sidebar-footer-padding); + padding: var(--sidebar-extra-small-default-padding) var(--sidebar-default-padding); text-align: center; diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css index f6be0ab3088d..07a9282c0dc6 100644 --- a/packages/rocketchat-theme/client/imports/general/variables.css +++ b/packages/rocketchat-theme/client/imports/general/variables.css @@ -144,10 +144,8 @@ --sidebar-background-light-hover: var(--rc-color-primary-light); --sidebar-default-padding: 24px; --sidebar-small-default-padding: 16px; - --sidebar-header-padding: 16px; - --sidebar-header-small-padding: 12px; + --sidebar-extra-small-default-padding: 12px; --sidebar-footer-height: 70px; - --sidebar-footer-padding: var(--sidebar-header-padding); --sidebar-small-header-padding: var(--sidebar-small-default-padding); /* From 79b1cc2c70fd43b02c8b81274e512320513533b8 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 3 Jan 2018 16:01:03 -0200 Subject: [PATCH 09/11] Merge pull request #9311 from RocketChat/fix-svg-firefox [FIX] svg render on firefox --- packages/rocketchat-ui-master/client/main.js | 2 ++ packages/rocketchat-ui/client/components/icon.html | 2 +- packages/rocketchat-ui/client/components/icon.js | 7 +++++++ packages/rocketchat-ui/package.js | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 packages/rocketchat-ui/client/components/icon.js diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js index 05d98df004f2..74a41c42339d 100644 --- a/packages/rocketchat-ui-master/client/main.js +++ b/packages/rocketchat-ui-master/client/main.js @@ -4,6 +4,8 @@ import s from 'underscore.string'; RocketChat.settings.collection.find({_id:/theme-color-rc/i}, {fields:{ value: 1 }}).observe({changed: () => { DynamicCss.run(true); }}); +this.isFirefox = navigator.userAgent.match(/Firefox\/(\d+)\.\d/); + Template.body.onRendered(function() { new Clipboard('.clipboard'); diff --git a/packages/rocketchat-ui/client/components/icon.html b/packages/rocketchat-ui/client/components/icon.html index d875feb5db3e..fd29bd068e08 100644 --- a/packages/rocketchat-ui/client/components/icon.html +++ b/packages/rocketchat-ui/client/components/icon.html @@ -1,5 +1,5 @@ diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js new file mode 100644 index 000000000000..c16c92c2c1c8 --- /dev/null +++ b/packages/rocketchat-ui/client/components/icon.js @@ -0,0 +1,7 @@ +/* globals isFirefox */ + +const firefoxBaseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`; + +Template.icon.helpers({ + baseUrl: isFirefox && isFirefox[1] < 55 ? firefoxBaseUrlFix : undefined +}); diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js index f23eb29a3608..2c9994250719 100644 --- a/packages/rocketchat-ui/package.js +++ b/packages/rocketchat-ui/package.js @@ -120,6 +120,7 @@ Package.onUse(function(api) { api.addFiles('client/views/app/photoswipe.js', 'client'); api.addFiles('client/components/icon.html', 'client'); + api.addFiles('client/components/icon.js', 'client'); api.addFiles('client/components/popupList.html', 'client'); api.addFiles('client/components/popupList.js', 'client'); From 24a3af014913d9e476b9fcb0169f776b37aeb92d Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 3 Jan 2018 16:08:54 -0200 Subject: [PATCH 10/11] Merge pull request #9314 from RocketChat/custom-emoji-size-last-message [FIX] custom emoji size on sidebar item --- .../client/imports/components/emojiPicker.css | 4 ++-- .../client/imports/components/sidebar/sidebar-item.css | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-theme/client/imports/components/emojiPicker.css b/packages/rocketchat-theme/client/imports/components/emojiPicker.css index c0e7050ecbf0..30574c4681e9 100644 --- a/packages/rocketchat-theme/client/imports/components/emojiPicker.css +++ b/packages/rocketchat-theme/client/imports/components/emojiPicker.css @@ -254,6 +254,6 @@ } .emoji.big { - width: 44px !important; - height: 44px !important; + width: 44px; + height: 44px; } diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css index 779e02e6c689..a4713450b11a 100644 --- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css +++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css @@ -229,7 +229,8 @@ font-size: 12px; line-height: normal; - & .emojione { + & .emojione, + & .emoji, { width: 13px !important; min-width: 13px; height: 13px !important; From 84453b3dd965ba4307f4d8589a4284e43c11aa21 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 3 Jan 2018 16:14:01 -0200 Subject: [PATCH 11/11] Bump version to 0.60.3 --- .docker/Dockerfile | 2 +- .sandstorm/sandstorm-pkgdef.capnp | 2 +- .travis/snap.sh | 2 +- HISTORY.md | 23 +++++++++++++++++++++++ package.json | 2 +- packages/rocketchat-lib/rocketchat.info | 2 +- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a94d57d95bba..8ae95f87d5fa 100644 --- a/.docker/Dockerfile +++ b/.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 diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index e9405b31fc32..d4e50ddfb3a0 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.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. diff --git a/.travis/snap.sh b/.travis/snap.sh index 1b2dcfd49655..1e42c1880400 100755 --- a/.travis/snap.sh +++ b/.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" diff --git a/HISTORY.md b/HISTORY.md index c9f55cd606c9..e73fccd01302 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,26 @@ + +## 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 + + +
+Others + +- [#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 +
+ + + ## 0.60.2 (2017-12-29) diff --git a/package.json b/package.json index 86b713325a02..54a786565207 100644 --- a/package.json +++ b/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/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index e1320af151c7..c5786ca96c5d 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.60.2" + "version": "0.60.3" }