From e9579408593c5c867ae4d69be14b39cc23d511c1 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 27 Dec 2017 23:00:45 -0200 Subject: [PATCH 01/46] Bump version to 0.60.1 --- .docker/Dockerfile | 2 +- .sandstorm/sandstorm-pkgdef.capnp | 2 +- .scripts/set-version.js | 2 +- .travis/snap.sh | 2 +- HISTORY.md | 10 ++++++++++ package.json | 2 +- packages/rocketchat-lib/rocketchat.info | 2 +- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index ea3b60c239b5..bc68d48c165b 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.60.0 +ENV RC_VERSION 0.60.1 MAINTAINER buildmaster@rocket.chat diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 9e908d20dd4a..589f53f263cc 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.0"), + appMarketingVersion = (defaultText = "0.60.1"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. diff --git a/.scripts/set-version.js b/.scripts/set-version.js index 9c03d6ef0939..427f604863f9 100644 --- a/.scripts/set-version.js +++ b/.scripts/set-version.js @@ -55,7 +55,7 @@ git.status() if (status.current === 'release-candidate') { return semver.inc(pkgJson.version, 'prerelease', 'rc'); } - if (status.current === 'release-0.60.0') { + if (status.current === 'master') { return semver.inc(pkgJson.version, 'patch'); } if (status.current === 'develop') { diff --git a/.travis/snap.sh b/.travis/snap.sh index 72e7e0147ec0..07e53d299a8f 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.0 + RC_VERSION=0.60.1 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index 3fdd76307d01..ddba76befa4f 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,13 @@ + +## 0.60.1 (2017-12-28) + + +### Bug Fixes + +- [#9262](https://github.com/RocketChat/Rocket.Chat/pull/9262) File access not working when passing credentials via querystring + + + # 0.60.0 (2017-12-27) diff --git a/package.json b/package.json index 7a8674511a5d..9195a04c6f64 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.60.0", + "version": "0.60.1", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index 94ab1c901370..da636e0bfcf7 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.60.0" + "version": "0.60.1" } From 5b1467c444aa7e0b14211a9a987b9163eed94008 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 28 Dec 2017 15:28:25 -0200 Subject: [PATCH 02/46] Merge pull request #9272 from RocketChat/hotifx/i18n [FIX] Missing translations --- packages/rocketchat-i18n/i18n/en.i18n.json | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 3738e834d63b..f0f5da6d011a 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -29,6 +29,7 @@ "Accounts_AllowEmailChange": "Allow Email Change", "Accounts_AllowPasswordChange": "Allow Password Change", "Accounts_AllowUserAvatarChange": "Allow User Avatar Change", + "Accounts_AllowRealNameChange": "Allow Name Change", "Accounts_AllowUsernameChange": "Allow Username Change", "Accounts_AllowUserProfileChange": "Allow User Profile Change", "Accounts_AvatarResize": "Resize Avatars", @@ -40,6 +41,10 @@ "Accounts_CustomFields_Description": "Should be a valid JSON where keys are the field names containing a dictionary of field settings. Example:
{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n} ", "Accounts_CustomFieldsToShowInUserInfo": "Custom Fields to Show in User Info", "Accounts_DefaultUsernamePrefixSuggestion": "Default Username Prefix Suggestion", + "Accounts_Default_User_Preferences": "Default User Preferences", + "Accounts_Default_User_Preferences_audioNotifications": "Audio Notifications Default Alert", + "Accounts_Default_User_Preferences_desktopNotifications": "Desktop Notifications Default Alert", + "Accounts_Default_User_Preferences_mobileNotifications": "Mobile Notifications Default Alert", "Accounts_denyUnverifiedEmail": "Deny unverified email", "Accounts_EmailVerification": "Email Verification", "Accounts_EmailVerification_Description": "Make sure you have correct SMTP settings to use this feature", @@ -67,6 +72,7 @@ "Accounts_OAuth_Custom_Secret": "Secret", "Accounts_OAuth_Custom_Token_Path": "Token Path", "Accounts_OAuth_Custom_Token_Sent_Via": "Token Sent Via", + "Accounts_OAuth_Custom_Identity_Token_Sent_Via": "Identity Token Sent Via", "Accounts_OAuth_Custom_Username_Field": "Username field", "Accounts_OAuth_Drupal": "Drupal Login Enabled", "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI", @@ -100,6 +106,10 @@ "Accounts_OAuth_Meteor_callback_url": "Meteor Callback URL", "Accounts_OAuth_Meteor_id": "Meteor Id", "Accounts_OAuth_Meteor_secret": "Meteor Secret", + "Accounts_OAuth_Tokenpass": "Tokenpass Login", + "Accounts_OAuth_Tokenpass_callback_url": "Tokenpass Callback URL", + "Accounts_OAuth_Tokenpass_id": "Tokenpass Id", + "Accounts_OAuth_Tokenpass_secret": "Tokenpass Secret", "Accounts_OAuth_Proxy_host": "Proxy Host", "Accounts_OAuth_Proxy_services": "Proxy Services", "Accounts_OAuth_Twitter": "Twitter Login", @@ -173,6 +183,7 @@ "All_channels": "All channels", "All_logs": "All logs", "All_messages": "All messages", + "All_added_tokens_will_be_required_by_the_user": "All added tokens will be required by the user", "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages", "Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs", "Allow_Invalid_SelfSigned_Certs_Description": "Allow invalid and self-signed SSL certificate's for link validation and previews.", @@ -218,6 +229,8 @@ "API_Shield_Types": "Shield Types", "API_Shield_Types_Description": "Types of shields to enable as a comma separated list, choose from `online`, `channel` or `*` for all", "API_Token": "API Token", + "API_Tokenpass_URL": "Tokenpass Server URL", + "API_Tokenpass_URL_Description": "Example: https://domain.com (excluding trailing slash)", "API_Upper_Count_Limit": "Max Record Amount", "API_Upper_Count_Limit_Description": "What is the maximum number of records the REST API should return (when not unlimited)?", "API_User_Limit": "User Limit for Adding All Users to Channel", @@ -236,10 +249,12 @@ "are_typing": "are typing", "Are_you_sure": "Are you sure?", "Are_you_sure_you_want_to_delete_your_account": "Are you sure you want to delete your account?", + "Are_you_sure_you_want_to_disable_Facebook_integration": "Are you sure you want to disable Facebook integration?", "assign-admin-role": "Assign Admin Role", "assign-admin-role_description": "Permission to assign the admin role to other users", "Assign_admin": "Assigning admin", "at": "at", + "At_least_one_added_token_is_required_by_the_user": "At least one added token is required by the user", "AtlassianCrowd": "Atlassian Crowd", "Attachment_File_Uploaded": "File Uploaded", "Attribute_handling": "Attribute handling", @@ -391,6 +406,7 @@ "Color": "Color", "Commands": "Commands", "Comment_to_leave_on_closing_session": "Comment to Leave on Closing Session", + "Common_Access": "Common Access", "Compact": "Compact", "Confirm_password": "Confirm your password", "Content": "Content", @@ -506,8 +522,10 @@ "Direct_Reply_Separator_Description": "[Alter only if you know exactly what you are doing, refer docs]
Separator between base & tag part of email", "Direct_Reply_Username": "Username", "Direct_Reply_Username_Description": "Please use absolute email, tagging is not allowed, it would be over-written", + "Disable_Facebook_integration": "Disable Facebook integration", "Disable_Notifications": "Disable Notifications", "Disable_two-factor_authentication": "Disable two-factor authentication", + "Disabled": "Disabled", "Display_offline_form": "Display Offline Form", "Displays_action_text": "Displays action text", "Do_you_want_to_change_to_s_question": "Do you want to change to %s?", @@ -568,6 +586,7 @@ "Enable_Svg_Favicon": "Enable SVG favicon", "Enable_two-factor_authentication": "Enable two-factor authentication", "Enabled": "Enabled", + "Enable_Auto_Away": "Enable Auto Away", "Encrypted_message": "Encrypted message", "End_OTR": "End OTR", "Enter_a_regex": "Enter a regex", @@ -648,12 +667,14 @@ "error-the-field-is-required": "The field __field__ is required.", "error-too-many-requests": "Error, too many requests. Please slow down. You must wait __seconds__ seconds before trying again.", "error-user-is-not-activated": "User is not activated", + "error-user-has-no-roles": "User has no roles", "error-user-limit-exceeded": "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator", "error-user-not-in-room": "User is not in this room", "error-user-registration-disabled": "User registration is disabled", "error-user-registration-secret": "User registration is only allowed via Secret URL", "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.", "Error_changing_password": "Error changing password", + "Error_loading_pages": "Error loading pages", "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances", "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server", "Esc_to": "Esc to", @@ -794,6 +815,7 @@ "If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.", "If_you_are_sure_type_in_your_password": "If you are sure type in your password:", "If_you_are_sure_type_in_your_username": "If you are sure type in your username:", + "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "If you don't have one send an email to [omni@rocket.chat](mailto:omni@rocket.chat) to get yours.", "Iframe_Integration": "Iframe Integration", "Iframe_Integration_receive_enable": "Enable Receive", "Iframe_Integration_receive_enable_Description": "Allow parent window to send commands to Rocket.Chat.", @@ -815,6 +837,7 @@ "Importer_From_Description": "Imports __from__ data into Rocket.Chat.", "Importer_HipChatEnterprise_BetaWarning": "Please be aware that this import is still a work in progress, please report any errors which occur in GitHub:", "Importer_HipChatEnterprise_Information": "The file uploaded must be a decrypted tar.gz, please read the documentation for further information:", + "Importer_Slack_Users_CSV_Information": "The file uploaded must be Slack's Users export file, which is a CSV file. See here for more information:", "Importer_import_cancelled": "Import cancelled.", "Importer_import_failed": "An error occurred while running the import.", "Importer_importing_channels": "Importing the channels.", @@ -845,6 +868,7 @@ "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instructions to your visitor fill the form to send a message", "Integration_added": "Integration has been added", "Integration_Advanced_Settings": "Advanced Settings", + "Integration_disabled": "Integration disabled", "Integration_History_Cleared": "Integration History Successfully Cleared", "Integration_Incoming_WebHook": "Incoming WebHook Integration", "Integration_New": "New Integration", @@ -934,6 +958,7 @@ "IssueLinks_LinkTemplate": "Template for issue links", "IssueLinks_LinkTemplate_Description": "Template for issue links; %s will be replaced by the issue number.", "It_works": "It works", + "Idle_Time_Limit": "Idle Time Limit", "italics": "italics", "Jitsi_Chrome_Extension": "Chrome Extension Id", "Jitsi_Enable_Channels": "Enable in Channels", @@ -1075,6 +1100,9 @@ "Livechat_AllowedDomainsList": "Livechat Allowed Domains", "Livechat_Dashboard": "Livechat Dashboard", "Livechat_enabled": "Livechat enabled", + "Livechat_Facebook_Enabled": "Facebook integration enabled", + "Livechat_Facebook_API_Key": "Facebook API Key", + "Livechat_Facebook_API_Secret": "Facebook API Secret", "Livechat_forward_open_chats": "Forward open chats", "Livechat_forward_open_chats_timeout": "Timeout (in seconds) to forward chats", "Livechat_guest_count": "Guest Counter", @@ -1222,6 +1250,7 @@ "Meta_msvalidate01": "MSValidate.01", "Meta_robots": "Robots", "Min_length_is": "Min length is %s", + "Minimum_balance": "Minimum balance", "minutes": "minutes", "Mobile": "Mobile", "Mobile_Notifications_Default_Alert": "Mobile Notifications Default Alert", @@ -1275,6 +1304,8 @@ "No_integration_found": "No integration found by the provided id.", "No_livechats": "You have no livechats", "No_mentions_found": "No mentions found", + "No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.", + "No_messages_yet": "No messages yet", "No_pinned_messages": "No pinned messages", "No_results_found": "No results found", "No_snippet_messages": "No snippet", @@ -1294,6 +1325,8 @@ "Notification_Duration": "Notification Duration", "Notification_Mobile_Default_For": "Push Mobile Notifications For", "Notifications": "Notifications", + "Notifications_Always_Notify_Mobile" : "Always notify mobile", + "Notifications_Always_Notify_Mobile_Description" : "Choose to always notify mobile device regardless of presence status.", "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications", "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)", "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.", @@ -1395,6 +1428,7 @@ "Please_fill_a_username": "Please fill a username", "Please_fill_all_the_information": "Please fill all the information", "Please_fill_name_and_email": "Please fill name and email", + "Please_go_to_the_Administration_page_then_Livechat_Facebook": "Please go to the Administration page then Livechat > Facebook", "Please_select_an_user": "Please select an user", "Please_select_enabled_yes_or_no": "Please select an option for Enabled", "Please_wait": "Please wait", @@ -1456,6 +1490,7 @@ "Read_only_changed_successfully": "Read only changed successfully", "Read_only_channel": "Read Only Channel", "Read_only_group": "Read Only Group", + "RealName_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of names", "Record": "Record", "Redirect_URI": "Redirect URI", "Refresh_keys": "Refresh keys", @@ -1469,6 +1504,7 @@ "Regular_Expressions": "Regular Expressions", "Release": "Release", "Reload": "Reload", + "Reload_Pages": "Reload Pages", "Remove": "Remove", "remove-user": "Remove User", "remove-user_description": "Permission to remove a user from a room", @@ -1486,6 +1522,8 @@ "Report_exclamation_mark": "Report!", "Report_sent": "Report sent", "Report_this_message_question_mark": "Report this message?", + "Require_all_tokens": "Require all tokens", + "Require_any_token": "Require any token", "Reporting": "Reporting", "Require_password_change": "Require password change", "Resend_verification_email": "Resend verification email", @@ -1513,6 +1551,7 @@ "Room_has_been_archived": "Room has been archived", "Room_has_been_deleted": "Room has been deleted", "Room_has_been_unarchived": "Room has been unarchived", + "Room_tokenpass_config_changed_successfully": "Room tokenpass configuration changed successfully", "Room_Info": "Room Info", "room_is_blocked": "This room is blocked", "room_is_read_only": "This room is read only", @@ -1534,6 +1573,7 @@ "run-migration_description": "Permission to run the migrations", "Running_Instances": "Running Instances", "S_new_messages_since_s": "%s new messages since %s", + "Same_As_Token_Sent_Via" : "Same as \"Token Sent Via\"", "Same_Style_For_Mentions": "Same style for mentions", "SAML": "SAML", "SAML_Custom_Cert": "Custom Certificate", @@ -1592,6 +1632,7 @@ "Send_welcome_email": "Send welcome email", "Send_your_JSON_payloads_to_this_URL": "Send your JSON payloads to this URL.", "Sending": "Sending...", + "Sent_an_attachment": "Sent an attachment", "Served_By": "Served By", "Service": "Service", "Service_account_key": "Service account key", @@ -1612,7 +1653,9 @@ "Shared_Location": "Shared Location", "Should_be_a_URL_of_an_image": "Should be a URL of an image.", "Should_exists_a_user_with_this_username": "The user must already exist.", + "Show_agent_email": "Show agent email", "Show_all": "Show All", + "Show_room_counter_on_sidebar": "Show room counter on sidebar", "Show_more": "Show more", "show_offline_users": "show offline users", "Show_on_registration_page": "Show on registration page", @@ -1623,6 +1666,7 @@ "Showing_archived_results": "

Showing %s archived results

", "Showing_online_users": "Showing: __total_showing__, Online: __online__, Total: __total__ users", "Showing_results": "

Showing %s results

", + "Sidebar": "Sidebar", "Sidebar_list_mode": "Sidebar Channel List Mode", "Sign_in_to_start_talking": "Sign in to start talking", "since_creation": "since %s", @@ -1639,6 +1683,7 @@ "SlackBridge_Out_Enabled": "SlackBridge Out Enabled", "SlackBridge_Out_Enabled_Description": "Choose whether SlackBridge should also send your messages back to Slack", "SlackBridge_start": "@%s has started a SlackBridge import at `#%s`. We'll let you know when it's finished.", + "Slack_Users": "Slack's Users CSV", "Slash_Gimme_Description": "Displays ༼ つ ◕_◕ ༽つ before your message", "Slash_LennyFace_Description": "Displays ( ͡° ͜ʖ ͡°) after your message", "Slash_Shrug_Description": "Displays ¯\\_(ツ)_/¯ after your message", @@ -1664,6 +1709,7 @@ "SMTP_Username": "SMTP Username", "snippet-message": "Snippet Message", "snippet-message_description": "Permission to create snippet message", + "Snippet_name": "Snippet name", "Snippet_Added": "Created on %s", "Snippet_Messages": "Snippet Messages", "Snippeted_a_message": "Created a snippet __snippetLink__", @@ -1708,6 +1754,8 @@ "Stats_Total_Users": "Total Users", "Status": "Status", "Stop_Recording": "Stop Recording", + "Store_Last_Message": "Store Last Message", + "Store_Last_Message_Sent_per_Room": "Store last message sent on each room.", "Stream_Cast": "Stream Cast", "Stream_Cast_Address": "Stream Cast Address", "Stream_Cast_Address_Description": "IP or Host of your Rocket.Chat central Stream Cast. E.g. `192.168.1.1:3000` or `localhost:4000`", @@ -1807,6 +1855,18 @@ "to_see_more_details_on_how_to_integrate": "to see more details on how to integrate.", "To_users": "To Users", "Toggle_original_translated": "Toggle original/translated", + "Token_Access": "Token Access", + "Token_Controlled_Access": "Token Controlled Access", + "Token_required": "Token required", + "Tokenpass_Channel_Label": "Tokenpass Channel", + "Tokenpass_Channels": "Tokenpass Channels", + "Tokens_Minimum_Needed_Balance": "Minimum needed token balance", + "Tokens_Minimum_Needed_Balance_Description": "Set minimum needed balance on each token. Blank or \"0\" for not limit.", + "Tokens_Minimum_Needed_Balance_Placeholder": "Balance value", + "Tokens_Required": "Tokens required", + "Tokens_Required_Input_Description": "Type one or more tokens asset names separated by comma.", + "Tokens_Required_Input_Error": "Invalid typed tokens.", + "Tokens_Required_Input_Placeholder": "Tokens asset names", "Topic": "Topic", "Transcript_Enabled": "Ask Visitor if They Would Like a Transcript After Chat Closed", "Transcript_message": "Message to Show When Asking About Transcript", @@ -1913,11 +1973,13 @@ "User_removed": "User removed", "User_removed_by": "User __user_removed__ removed by __user_by__.", "User_Settings": "User Settings", + "user_sent_an_attachment": "__user__ sent an attachment", "User_unmuted_by": "User __user_unmuted__ unmuted by __user_by__.", "User_unmuted_in_room": "User unmuted in room", "User_updated_successfully": "User updated successfully", "User_uploaded_file": "Uploaded a file", "User_uploaded_image": "Uploaded an image", + "User_Presence": "User Presence", "Username": "Username", "Username_and_message_must_not_be_empty": "Username and message must not be empty.", "Username_cant_be_empty": "The username cannot be empty", @@ -1930,6 +1992,10 @@ "Username_is_already_in_here": "`@%s` is already in here.", "Username_is_not_in_this_room": "The user `#%s` is not in this room.", "Username_Placeholder": "Please enter usernames...", + "User_sent_a_message_on_channel": "__username__ sent a message on __channel__:", + "User_uploaded_a_file_on_channel": "__username__ uploaded a file on __channel__:", + "User_sent_a_message_to_you": "__username__ sent you a message:", + "User_uploaded_a_file_to_you": "__username__ sent you a file:", "Username_title": "Register username", "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ wants to start OTR. Do you want to accept?", "Users": "Users", @@ -2024,6 +2090,7 @@ "Yes_mute_user": "Yes, mute user!", "Yes_remove_user": "Yes, remove user!", "Yes_unarchive_it": "Yes, unarchive it!", + "yesterday": "yesterday", "You": "You", "you_are_in_preview_mode_of": "You are in preview mode of channel #__room_name__", "You_are_logged_in_as": "You are logged in as", @@ -2037,6 +2104,7 @@ "You_have_n_codes_remaining": "You have __number__ codes remaining.", "You_have_not_verified_your_email": "You have not verified your email.", "You_have_successfully_unsubscribed": "You have successfully unsubscribed from our Mailling List.", + "You_have_to_set_an_API_token_first_in_order_to_use_the_integration": "You have to set an API token first in order to use the integration.", "You_must_join_to_view_messages_in_this_channel": "You must join to view messages in this channel", "You_need_confirm_email": "You need to confirm your email to login!", "You_need_install_an_extension_to_allow_screen_sharing": "You need install an extension to allow screen sharing", From 8489425912b9128410a7def55131e87361c6c042 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 28 Dec 2017 22:39:58 -0200 Subject: [PATCH 03/46] Merge pull request #9274 from RocketChat/fix-livechat-facebook-integration [FIX] Remove sweetalert from livechat facebook integration page --- packages/rocketchat-i18n/i18n/en.i18n.json | 4 ++-- .../app/integrations/livechatIntegrationFacebook.js | 10 ++++------ packages/rocketchat-ui/client/views/app/modal.js | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index f0f5da6d011a..b75ee4f14999 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1101,8 +1101,8 @@ "Livechat_Dashboard": "Livechat Dashboard", "Livechat_enabled": "Livechat enabled", "Livechat_Facebook_Enabled": "Facebook integration enabled", - "Livechat_Facebook_API_Key": "Facebook API Key", - "Livechat_Facebook_API_Secret": "Facebook API Secret", + "Livechat_Facebook_API_Key": "OmniChannel API Key", + "Livechat_Facebook_API_Secret": "OmniChannel API Secret", "Livechat_forward_open_chats": "Forward open chats", "Livechat_forward_open_chats_timeout": "Timeout (in seconds) to forward chats", "Livechat_guest_count": "Guest Counter", diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js index 75bbdce564b3..1fa2bd58e3ca 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js +++ b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js @@ -1,5 +1,3 @@ -/* globals swal */ - Template.livechatIntegrationFacebook.helpers({ pages() { return Template.instance().pages.get(); @@ -35,7 +33,7 @@ Template.livechatIntegrationFacebook.onCreated(function() { this.result = (successFn, errorFn = () => {}) => { return (error, result) => { - if (result.success === false && (result.type === 'OAuthException' || typeof result.url !== 'undefined')) { + if (result && result.success === false && (result.type === 'OAuthException' || typeof result.url !== 'undefined')) { const oauthWindow = window.open(result.url, 'facebook-integration-oauth', 'width=600,height=400'); const checkInterval = setInterval(() => { @@ -48,7 +46,7 @@ Template.livechatIntegrationFacebook.onCreated(function() { } if (error) { errorFn(error); - return swal({ + return modal.open({ title: t('Error_loading_pages'), text: error.reason, type: 'error' @@ -93,7 +91,7 @@ Template.livechatIntegrationFacebook.events({ 'click .disable'(event, instance) { event.preventDefault(); - swal({ + modal.open({ title: t('Disable_Facebook_integration'), text: t('Are_you_sure_you_want_to_disable_Facebook_integration'), type: 'warning', @@ -111,7 +109,7 @@ Template.livechatIntegrationFacebook.events({ instance.enabled.set(false); instance.pages.set([]); - swal({ + modal.open({ title: t('Disabled'), text: t('Integration_disabled'), type: 'success', diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js index 1d2c05478f64..4458b07030cf 100644 --- a/packages/rocketchat-ui/client/views/app/modal.js +++ b/packages/rocketchat-ui/client/views/app/modal.js @@ -3,7 +3,7 @@ this.modal = { renderedModal: null, open(config = {}, fn) { - config.confirmButtonText = config.confirmButtonText || t('Send'); + config.confirmButtonText = config.confirmButtonText || (config.type === 'error' ? t('Ok') : t('Send')); config.cancelButtonText = config.cancelButtonText || t('Cancel'); config.closeOnConfirm = config.closeOnConfirm == null ? true : config.closeOnConfirm; config.showConfirmButton = config.showConfirmButton == null ? true : config.showConfirmButton; From 66f3f7696d479c12ef6b2f30d5ed381c55028f98 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 28 Dec 2017 22:40:37 -0200 Subject: [PATCH 04/46] Merge pull request #9277 from RocketChat/hotifx/i18n [FIX] Restore translations from other languages --- packages/rocketchat-i18n/i18n/ca.i18n.json | 4 +++- packages/rocketchat-i18n/i18n/cs.i18n.json | 5 ++++- packages/rocketchat-i18n/i18n/de.i18n.json | 6 +++++- packages/rocketchat-i18n/i18n/fr.i18n.json | 4 +++- packages/rocketchat-i18n/i18n/nl.i18n.json | 4 +++- packages/rocketchat-i18n/i18n/pl.i18n.json | 3 ++- packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 9 ++++++++- packages/rocketchat-i18n/i18n/pt.i18n.json | 9 ++++++++- packages/rocketchat-i18n/i18n/ru.i18n.json | 3 ++- packages/rocketchat-i18n/i18n/tr.i18n.json | 3 ++- 10 files changed, 40 insertions(+), 10 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json index 7a1afcb9737b..2dc8b4821766 100644 --- a/packages/rocketchat-i18n/i18n/ca.i18n.json +++ b/packages/rocketchat-i18n/i18n/ca.i18n.json @@ -40,6 +40,8 @@ "Accounts_CustomFields_Description": "Ha de ser un objecte JSON vàlid on les claus són els noms dels camps i contenen un diccionari amb les opcions del camp. Exemple:
{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n} ", "Accounts_CustomFieldsToShowInUserInfo": "Camps personalitzats a mostrar a l'informació d'usuari", "Accounts_DefaultUsernamePrefixSuggestion": "Prefix suggerit per al nom d'usuari per defecte", + "Accounts_Default_User_Preferences_desktopNotifications": "Alerta per defecte per a les notificacions d'escriptori", + "Accounts_Default_User_Preferences_mobileNotifications": "Alerta per defecte notificacions mòbil", "Accounts_denyUnverifiedEmail": "Denegar correu electrònic sense verificar", "Accounts_EmailVerification": "Verificació de correu electrònic", "Accounts_EmailVerification_Description": "Assegura't que la configuració SMTP és correcta per fer servir aquesta funcionalitat", @@ -2006,4 +2008,4 @@ "your_message_optional": "el teu missatge (opcional)", "Your_password_is_wrong": "La contrasenya és incorrecta!", "Your_push_was_sent_to_s_devices": "La notificació push s'ha enviat a %s dispositius" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json index 8d0d96bda69c..69fa3af7528f 100644 --- a/packages/rocketchat-i18n/i18n/cs.i18n.json +++ b/packages/rocketchat-i18n/i18n/cs.i18n.json @@ -40,6 +40,9 @@ "Accounts_CustomFields_Description": "Validní JSON obsahující klíče polí s nastavením. Například:
{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}", "Accounts_CustomFieldsToShowInUserInfo": "Vlastní pole zobrazená v uživatelském profilu", "Accounts_DefaultUsernamePrefixSuggestion": "Výchozí návrh prefixu uživatelského jména", + "Accounts_Default_User_Preferences_audioNotifications": "Výchozí zvuk upozornění audia", + "Accounts_Default_User_Preferences_desktopNotifications": "Výchozí upozornění oznámení na ploše", + "Accounts_Default_User_Preferences_mobileNotifications": "Výchozí upozornění mobilní notifikace", "Accounts_denyUnverifiedEmail": "Zakázat neověřené e-mailové adresy", "Accounts_EmailVerification": "Ověření e-mailu", "Accounts_EmailVerification_Description": "Pro použití této funkce se ujistěte, že máte správné nastavení SMTP", @@ -2058,4 +2061,4 @@ "your_message_optional": "vaše zpráva (nepovinná)", "Your_password_is_wrong": "Vaše heslo je špatně!", "Your_push_was_sent_to_s_devices": "Vaše notifikace byla odeslána do %s zařízení" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index 6a8b0199fce2..82e3ec46ea66 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -29,6 +29,7 @@ "Accounts_AllowEmailChange": "Ändern der E-Mail-Adresse erlauben", "Accounts_AllowPasswordChange": "Ändern des Passworts erlauben", "Accounts_AllowUserAvatarChange": "Benutzern das Ändern des Profilbilds erlauben", + "Accounts_AllowRealNameChange": "Ändern des Namens erlauben", "Accounts_AllowUsernameChange": "Ändern des Benutzernamens erlauben", "Accounts_AllowUserProfileChange": "Benutzern das Ändern des Profils erlauben", "Accounts_AvatarResize": "Größe des Profilbilds anpassen", @@ -40,6 +41,9 @@ "Accounts_CustomFields_Description": "Ein gültiges JSON, in dem die Schlüssel Sprachkürzel sind, die wiederum Tupel von Schlüssel und Übersetzungen enthalten. Beispiel:
\n{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}", "Accounts_CustomFieldsToShowInUserInfo": "Eigene Felder, die in der Benutzer-Information angezeigt werden sollen", "Accounts_DefaultUsernamePrefixSuggestion": "Vorschlag für Präfix des Standard-Benutzernamens ", + "Accounts_Default_User_Preferences_audioNotifications": "Akustische Benachrichtigung bei", + "Accounts_Default_User_Preferences_desktopNotifications": "Desktop-Benachrichtigungen bei", + "Accounts_Default_User_Preferences_mobileNotifications": "Mobile Benachrichtigungen bei", "Accounts_denyUnverifiedEmail": "Nicht verifizierte E-Mail-Adressen ablehnen", "Accounts_EmailVerification": "E-Mail-Verifizierung", "Accounts_EmailVerification_Description": "Um diese Funktion nutzen zu können, stell bitte sicher, dass Deine SMTP-Einstellungen korrekt sind.", @@ -2058,4 +2062,4 @@ "your_message_optional": "ihre optionale Nachricht", "Your_password_is_wrong": "Falsches Passwort", "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet." -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json index 5c7c1eac9910..d1cf6b7738ab 100644 --- a/packages/rocketchat-i18n/i18n/fr.i18n.json +++ b/packages/rocketchat-i18n/i18n/fr.i18n.json @@ -35,6 +35,7 @@ "Accounts_BlockedUsernameList_Description": "Liste de noms d'utilisateurs bloqués (insensible à la casse), séparés par des virgules", "Accounts_CustomFields_Description": "Devrait être un JSON valide où les clés sont les noms des champs contenant un dictionnaire de champs de paramétrage. Exemple :
\n{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"eleve\",\n  \"options\": [\"enseignant\", \"eleve\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n} ", "Accounts_DefaultUsernamePrefixSuggestion": "Suggestion par défaut du préfixe du nom d'utilisateur", + "Accounts_Default_User_Preferences_desktopNotifications": "Alterte notification de bureau par défaut", "Accounts_denyUnverifiedEmail": "Refuser les e-mails non vérifiés", "Accounts_EmailVerification": "Vérification de l'adresse e-mail", "Accounts_EmailVerification_Description": "Vous devez avoir des paramètres SMTP corrects pour utiliser cette fonctionnalité", @@ -1276,6 +1277,7 @@ "Shared_Location": "Position partagée", "Should_be_a_URL_of_an_image": "Doit être l'URL d'une image.", "Should_exists_a_user_with_this_username": "L'utilisateur doit déjà exister.", + "Show_agent_email": "Afficher le email de l'agent", "Show_all": "Afficher tout", "Show_more": "Afficher plus", "show_offline_users": "montrer les utilisateur hors-ligne", @@ -1611,4 +1613,4 @@ "your_message_optional": "votre message (optionnel)", "Your_password_is_wrong": "Votre mot de passe est incorrect !", "Your_push_was_sent_to_s_devices": "Votre notification a été envoyée à %s appareils" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json index 8292b91b157c..91d7e15d0e91 100644 --- a/packages/rocketchat-i18n/i18n/nl.i18n.json +++ b/packages/rocketchat-i18n/i18n/nl.i18n.json @@ -512,6 +512,7 @@ "Invalid_secret_URL_message": "De gegeven URL is ongeldig.", "invisible": "onzichtbaar", "Invisible": "Onzichtbaar", + "Idle_Time_Limit": "Niet-actieve tijdslimiet", "Invitation_HTML": "Uitnodiging HTML", "Invitation_HTML_Default": "

Je bent uitgenodigd voor

[Site_Name]

Ga naar [Site_URL] en probeer de beste open source chat-oplossing die vandaag beschikbaar zijn!

", "Invitation_HTML_Description": "U mag de volgende plaatshouders gebruiken:
  • [email] voor de ontvanger e-mail.
  • [Site_Name] en [Site_URL] voor de toepassing Naam en URL respectievelijk.
", @@ -1130,6 +1131,7 @@ "Username_is_already_in_here": "`@%s` is al hier.", "Username_is_not_in_this_room": "De gebruiker `#%s` is niet in deze kamer.", "Username_title": "Registreer Gebruikersnaam", + "User_Presence": "Aanwezigheid van de gebruiker", "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ wil OTR starten. Heeft u wilt accepteren?", "Users": "Gebruikers", "Users_in_role": "Gebruikers met rol", @@ -1204,4 +1206,4 @@ "Your_mail_was_sent_to_s": "Uw e-mail werd verzonden naar %s", "Your_password_is_wrong": "Je wachtwoord is verkeerd!", "Your_push_was_sent_to_s_devices": "Je push werd verzonden naar %s apparaten" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json index 530f250a3337..61f065dd7b48 100644 --- a/packages/rocketchat-i18n/i18n/pl.i18n.json +++ b/packages/rocketchat-i18n/i18n/pl.i18n.json @@ -33,6 +33,7 @@ "Accounts_BlockedDomainsList_Description": "Oddzielonych przecinkami lista zablokowanych domen", "Accounts_BlockedUsernameList": "Lista zablokowanych użytkowników", "Accounts_BlockedUsernameList_Description": "Oddzielona przecinkami lista zablokowanych użytkowników (bez uwzględniania wielkości liter)", + "Accounts_Default_User_Preferences_mobileNotifications": "Domyślne powiadomnienia mobilne", "Accounts_denyUnverifiedEmail": "Odrzucaj niezweryfikowane adresy email", "Accounts_EmailVerification": "Weryfikacja adresu email", "Accounts_EmailVerification_Description": "Upewnij się, że masz odpowiednie ustawienia SMTP by korzystać z tej funkcji", @@ -1434,4 +1435,4 @@ "your_message_optional": "twoja wiadomość (opcjonalnie)", "Your_password_is_wrong": "To nie jest poprawne hasło!", "Your_push_was_sent_to_s_devices": "Twój push została wysłany do urządzeń: %s" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json index 95a6764b5395..82369be9693a 100644 --- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json +++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json @@ -33,6 +33,10 @@ "Accounts_BlockedUsernameList_Description": "Lista de nomes de usuários bloqueados, separada por vírgulas (não diferencia maiúsculas)", "Accounts_CustomFields_Description": "Deve ser um JSON válido onde as chaves são os nomes de campos contendo um dicionário de configuração de campos. Exemplo:
{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"estudante\",\n  \"options\": [\"professor\", \"estudante\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n} ", "Accounts_CustomFieldsToShowInUserInfo": "Campos personalizados a exibir", + "Accounts_Default_User_Preferences": "Preferências Padrões do Usuário", + "Accounts_Default_User_Preferences_audioNotifications": "Áudio padrão para alerta de notificação", + "Accounts_Default_User_Preferences_desktopNotifications": "Alerta padrão para notificações Desktop", + "Accounts_Default_User_Preferences_mobileNotifications": "Alerta padrão para notificações Mobile", "Accounts_denyUnverifiedEmail": "Proibir e-mail não verificado", "Accounts_EmailVerification": "Verificação de E-mail", "Accounts_EmailVerification_Description": "Certifique-se de que as configurações de SMTP estão corretas para usar este recurso", @@ -373,6 +377,7 @@ "EmojiCustomFilesystem": "Sistema de arquivos do emoji customizado", "Empty_title": "Título vazio", "Enable": "Habilitar", + "Enable_Auto_Away": "Habilitar Auto Ausência", "Enable_Desktop_Notifications": "Habilitar Notificações Desktop", "Enabled": "Ativado", "Encrypted_message": "Mensagem criptografada", @@ -447,6 +452,7 @@ "error-the-field-is-required": "O campo __field__ é obrigatório.", "error-too-many-requests": "Erro, muitas solicitações. Por favor, diminua a velocidade. Você deve esperar __seconds__ segundos antes de tentar novamente.", "error-user-is-not-activated": "O usuário não está ativo", + "error-user-has-no-roles": "O usuário não possui permissões", "error-user-not-in-room": "O usuário não está nesta sala", "error-user-registration-disabled": "O registro do usuário está desativado", "error-user-registration-secret": "O registro de usuário é permitido somente via URL secreta", @@ -1221,6 +1227,7 @@ "User_removed": "Usuário removido", "User_removed_by": "Usuário __user_removed__ removido da conversa por __user_by__.", "User_Settings": "Configurações do Usuário", + "User_Presence": "Presença do Usuário", "User_unmuted_by": "__user_by__ permitiu que __user_unmuted__ fale na sala.", "User_unmuted_in_room": "Usuário pode falar na sala", "User_updated_successfully": "Usuário atualizado com sucesso", @@ -1316,4 +1323,4 @@ "your_message_optional": "sua mensagem (opcional)", "Your_password_is_wrong": "Sua senha está errada!", "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json index a0407aec2946..3e7bdafcccb7 100644 --- a/packages/rocketchat-i18n/i18n/pt.i18n.json +++ b/packages/rocketchat-i18n/i18n/pt.i18n.json @@ -563,6 +563,8 @@ "How_responsive_was_the_chat_agent": "Quão responsivo foi o agente de bate-papo?", "How_satisfied_were_you_with_this_chat": "Ficou satisfeito com este bate-papo?", "How_to_handle_open_sessions_when_agent_goes_offline": "O que fazer com sessões abertas quando agente ficar offline", + "Idle_Time_Limit": "Tempo limite de ausência", + "Enable_Auto_Away": "Habilitar auto ausência", "If_you_are_sure_type_in_your_password": "Se você tem certeza, digite sua senha:", "If_you_are_sure_type_in_your_username": "Se você tem certeza, digite seu nome de usuário:", "Importer_Archived": "Arquivado", @@ -1215,6 +1217,7 @@ "Use_this_username": "Usar este nome de usuário", "Use_uploaded_avatar": "Use o avatar de upload", "Use_url_for_avatar": "Use url para o avatar", + "User_Presence": "Presença do Utilizador", "User__username__is_now_a_moderator_of__room_name_": "Usuário __username__ agora é um moderador de __room_name__", "User__username__is_now_a_owner_of__room_name_": "Usuário __username__ agora é proprietário de __room_name__", "User__username__removed_from__room_name__moderators": "Usuário __username__ removido dos moderadores de __room_name__", @@ -1246,6 +1249,10 @@ "User_removed": "Usuário removido", "User_removed_by": "Usuário __user_removed__ removido da conversa por __user_by__.", "User_Settings": "Configurações do Usuário", + "User_sent_a_message_on_channel": "__username__ enviou uma mensagem em __channel__:", + "User_uploaded_a_file_on_channel": "__username__ enviou um arquivo em __channel__:", + "User_sent_a_message_to_you": "__username__ enviou uma mensagem para você:", + "User_uploaded_a_file_to_you": "__username__ enviou um arquivo para você:", "User_unmuted_by": "__user_by__ permitiu que __user_unmuted__ fale na sala.", "User_unmuted_in_room": "Usuário pode falar na sala", "User_updated_successfully": "Usuário atualizado com sucesso", @@ -1341,4 +1348,4 @@ "your_message_optional": "sua mensagem (opcional)", "Your_password_is_wrong": "Sua senha está errada!", "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json index 3dd3258e3553..a2f433fb727e 100644 --- a/packages/rocketchat-i18n/i18n/ru.i18n.json +++ b/packages/rocketchat-i18n/i18n/ru.i18n.json @@ -40,6 +40,7 @@ "Accounts_CustomFields_Description": "Ожидается валидный JSON-объект, в котором каждый ключ - это имя поля, а содержимое - словарь настроек поля. Пример:
{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}\n", "Accounts_CustomFieldsToShowInUserInfo": "Кастомные поля для отображения в информации пользователя", "Accounts_DefaultUsernamePrefixSuggestion": "Предлагаемая подсказка префикса логина", + "Accounts_Default_User_Preferences_desktopNotifications": "Стандартные оповещения на рабочем столе", "Accounts_denyUnverifiedEmail": "Запретить неподтверждённые адреса электронной почты", "Accounts_EmailVerification": "Подтверждение адреса электронной почты", "Accounts_EmailVerification_Description": "Убедитесь, что у вас верные настройки SMTP для использования этой функции", @@ -2018,4 +2019,4 @@ "your_message_optional": "Сообщение (опционально)", "Your_password_is_wrong": "Ваш пароль неверен!", "Your_push_was_sent_to_s_devices": "Оповещение было отправлено на %s устройств." -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json index 5f3b1ddcaae9..6ba3e486718c 100644 --- a/packages/rocketchat-i18n/i18n/tr.i18n.json +++ b/packages/rocketchat-i18n/i18n/tr.i18n.json @@ -40,6 +40,7 @@ "Accounts_CustomFields_Description": "Anahtarların, alan ayarları sözlüğü bulunduran alan isimleri olduğu geçerli bir JSON olmalı. Örnek:
{\n\n \"role\": {\n\n  \"type\": \"select\",\n\n  \"defaultValue\": \"student\",\n\n  \"options\": [\"teacher\", \"student\"],\n\n  \"required\": true,\n\n  \"modifyRecordField\": {\n\n   \"array\": true,\n\n   \"field\": \"roles\"\n\n  }\n\n },\n\n \"twitter\": {\n\n  \"type\": \"text\",\n\n  \"required\": true,\n\n  \"minLength\": 2,\n\n  \"maxLength\": 10\n\n }\n\n} ", "Accounts_CustomFieldsToShowInUserInfo": "Kullanıcı Bilgilerini Göstermek için Özel alanlar", "Accounts_DefaultUsernamePrefixSuggestion": "Varsayılan kullanıcı adı ön eki tavsiyesi", + "Accounts_Default_User_Preferences_audioNotifications": "Sesli Mesaj için Varsayılan Uyarı", "Accounts_denyUnverifiedEmail": "Doğrulanmamış e-posta'yı reddet", "Accounts_EmailVerification": "E-Posta Doğrulama", "Accounts_EmailVerification_Description": "Bu özelliği kullanmak için doğru SMTP ayarlarına sahip olduğunuza emin olun", @@ -1398,4 +1399,4 @@ "Your_mail_was_sent_to_s": "Posta %s gönderildi", "Your_password_is_wrong": "Parolanız yanlış!", "Your_push_was_sent_to_s_devices": "Sizin itme %s cihazlara gönderildi" -} \ No newline at end of file +} From 689a8b3faa215678a483e91712de29b48eb5d167 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Fri, 29 Dec 2017 11:34:30 -0200 Subject: [PATCH 05/46] Bump version to 0.60.2 --- .docker/Dockerfile | 2 +- .sandstorm/sandstorm-pkgdef.capnp | 2 +- .scripts/set-version.js | 2 +- .travis/snap.sh | 2 +- HISTORY.md | 15 ++++++++++++--- package.json | 2 +- packages/rocketchat-lib/rocketchat.info | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index bc68d48c165b..a94d57d95bba 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.60.1 +ENV RC_VERSION 0.60.2 MAINTAINER buildmaster@rocket.chat diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 589f53f263cc..e9405b31fc32 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.1"), + appMarketingVersion = (defaultText = "0.60.2"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. diff --git a/.scripts/set-version.js b/.scripts/set-version.js index 427f604863f9..5e7fbb79edcb 100644 --- a/.scripts/set-version.js +++ b/.scripts/set-version.js @@ -55,7 +55,7 @@ git.status() if (status.current === 'release-candidate') { return semver.inc(pkgJson.version, 'prerelease', 'rc'); } - if (status.current === 'master') { + if (status.current === 'release-0.60.2') { return semver.inc(pkgJson.version, 'patch'); } if (status.current === 'develop') { diff --git a/.travis/snap.sh b/.travis/snap.sh index 07e53d299a8f..1b2dcfd49655 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.1 + RC_VERSION=0.60.2 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index ddba76befa4f..6cd166d24a23 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,15 @@ + +## 0.60.2 (2017-12-29) + + +### Bug Fixes + +- [#9272](https://github.com/RocketChat/Rocket.Chat/pull/9272) Missing translations +- [#9274](https://github.com/RocketChat/Rocket.Chat/pull/9274) Remove sweetalert from livechat facebook integration page +- [#9277](https://github.com/RocketChat/Rocket.Chat/pull/9277) Restore translations from other languages + + + ## 0.60.1 (2017-12-28) @@ -8,9 +20,6 @@ - -# 0.60.0 (2017-12-27) - # 0.60.0 (2017-12-27) diff --git a/package.json b/package.json index 9195a04c6f64..86b713325a02 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.60.1", + "version": "0.60.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index da636e0bfcf7..e1320af151c7 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.60.1" + "version": "0.60.2" } From 70cb8f3e7f9c648568006ad643a69461344213d8 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 2 Jan 2018 14:52:17 -0200 Subject: [PATCH 06/46] 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 07/46] 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 08/46] 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 09/46] 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 10/46] [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 11/46] [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 12/46] 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 13/46] 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 14/46] 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 15/46] 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 16/46] 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" } From f0f90e0885be44f725ddf5a0059cbaa7766c6d4f Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Fri, 5 Jan 2018 14:49:11 -0200 Subject: [PATCH 17/46] [FIX] LDAP TLS not working in some cases --- packages/rocketchat-cors/cors.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/rocketchat-cors/cors.js b/packages/rocketchat-cors/cors.js index f458a73ca778..a41a833d1598 100644 --- a/packages/rocketchat-cors/cors.js +++ b/packages/rocketchat-cors/cors.js @@ -3,6 +3,11 @@ import _ from 'underscore'; import url from 'url'; +import tls from 'tls'; +// FIX For TLS error see more here https://github.com/RocketChat/Rocket.Chat/issues/9316 +// TODO: Remove after NodeJS fix it, more information https://github.com/nodejs/node/issues/16196 https://github.com/nodejs/node/pull/16853 +tls.DEFAULT_ECDH_CURVE = 'auto'; + WebApp.rawConnectHandlers.use(Meteor.bindEnvironment(function(req, res, next) { if (req._body) { return next(); From e0041cbb2e0f904a0131fb6406ce25baa71746b6 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Fri, 5 Jan 2018 17:22:09 -0200 Subject: [PATCH 18/46] Bump version to 0.60.4-rc.0 --- .docker/Dockerfile | 2 +- .sandstorm/sandstorm-pkgdef.capnp | 2 +- .travis/snap.sh | 2 +- HISTORY.md | 10 ++++++++++ package.json | 2 +- packages/rocketchat-lib/rocketchat.info | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 8ae95f87d5fa..536e7a2e9f88 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.60.3 +ENV RC_VERSION 0.60.4-rc.0 MAINTAINER buildmaster@rocket.chat diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index d4e50ddfb3a0..663efa614842 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.3"), + appMarketingVersion = (defaultText = "0.60.4-rc.0"), # 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 1e42c1880400..2906602fdccb 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.3 + RC_VERSION=0.60.4-rc.0 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index e73fccd01302..ba8de3400145 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,13 @@ + +## 0.60.4-rc.0 (2018-01-05) + + +### Bug Fixes + +- [#9343](https://github.com/RocketChat/Rocket.Chat/pull/9343) LDAP TLS not working in some cases + + + ## 0.60.3 (2018-01-03) diff --git a/package.json b/package.json index 54a786565207..5daef371be20 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.60.3", + "version": "0.60.4-rc.0", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index c5786ca96c5d..1b422308cd7b 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.60.3" + "version": "0.60.4-rc.0" } From e1c93a039b981eaf34f90a57cc51b84c17f28631 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 8 Jan 2018 09:19:00 -0200 Subject: [PATCH 19/46] Merge pull request #9346 from RocketChat/hotifx/update-marked Update Marked dependecy to 0.3.9 --- .../rocketchat-markdown/.npm/package/npm-shrinkwrap.json | 6 +++--- packages/rocketchat-markdown/package.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json index 50f2b7deb71b..ff3cbd8e237b 100644 --- a/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 1, "dependencies": { "marked": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz", - "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=" + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz", + "integrity": "sha512-nW5u0dxpXxHfkHzzrveY45gCbi+R4PaO4WRZYqZNl+vB0hVGeqlFn0aOg1c8AKL63TrNFn9Bm2UP4AdiZ9TPLw==" } } } diff --git a/packages/rocketchat-markdown/package.js b/packages/rocketchat-markdown/package.js index 12d4a63c539f..ee493f78cd3f 100644 --- a/packages/rocketchat-markdown/package.js +++ b/packages/rocketchat-markdown/package.js @@ -6,7 +6,7 @@ Package.describe({ }); Npm.depends({ - 'marked': '0.3.6' + 'marked': '0.3.9' }); Package.onUse(function(api) { From e88265af8e19cdc3ae0ad2b8e23d0afbddd8cd7f Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 8 Jan 2018 11:12:33 -0200 Subject: [PATCH 20/46] Merge pull request #9345 from RocketChat/fix-last-message-height [FIX] last message cutting on bottom --- .../client/imports/components/sidebar/sidebar-item.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a4713450b11a..61a0780df174 100644 --- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css +++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css @@ -230,7 +230,7 @@ line-height: normal; & .emojione, - & .emoji, { + & .emoji { width: 13px !important; min-width: 13px; height: 13px !important; From 7b2451d1b7f23f7e3728cbe5aea26f8cc0a3286a Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Fri, 5 Jan 2018 18:02:19 -0200 Subject: [PATCH 21/46] Merge pull request #9335 from RocketChat/fix-not-updating-last-message [FIX] Deleting message with store last message not removing --- packages/rocketchat-lib/server/functions/deleteMessage.js | 7 +++++-- packages/rocketchat-lib/server/models/Messages.js | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js index aa7101cbfdf5..9111557397d1 100644 --- a/packages/rocketchat-lib/server/functions/deleteMessage.js +++ b/packages/rocketchat-lib/server/functions/deleteMessage.js @@ -31,8 +31,11 @@ RocketChat.deleteMessage = function(message, user) { // update last message if (RocketChat.settings.get('Store_Last_Message')) { - const lastMessage = RocketChat.models.Messages.getLastMessageSentWithNoTypeByRoomId(message.rid); - RocketChat.models.Rooms.setLastMessageById(message.rid, lastMessage); + const room = RocketChat.models.Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } }); + if (!room.lastMessage || room.lastMessage._id === message._id) { + const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(message.rid, message._id); + RocketChat.models.Rooms.setLastMessageById(message.rid, lastMessage); + } } if (showDeletedStatus) { diff --git a/packages/rocketchat-lib/server/models/Messages.js b/packages/rocketchat-lib/server/models/Messages.js index 3adbe4ad4c64..90f8bf068765 100644 --- a/packages/rocketchat-lib/server/models/Messages.js +++ b/packages/rocketchat-lib/server/models/Messages.js @@ -284,12 +284,17 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base { return this.findOne(query); } - getLastMessageSentWithNoTypeByRoomId(rid) { + getLastVisibleMessageSentWithNoTypeByRoomId(rid, messageId) { const query = { rid, + _hidden: { $ne: true }, t: { $exists: false } }; + if (messageId) { + query._id = { $ne: messageId }; + } + const options = { sort: { ts: -1 From ad498e2a3e3d3298e133ce7841179f5729af106e Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 8 Jan 2018 11:44:10 -0200 Subject: [PATCH 22/46] Merge pull request #9330 from RocketChat/fix-announcement-link [FIX] announcement hyperlink color --- .../rocketchat-theme/client/imports/general/base_old.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css index 0cb6da9e5778..9766649cff2c 100644 --- a/packages/rocketchat-theme/client/imports/general/base_old.css +++ b/packages/rocketchat-theme/client/imports/general/base_old.css @@ -1742,6 +1742,12 @@ & ~ .container-bars { top: 45px; } + + a { + text-decoration: underline; + + color: currentColor; + } } .rc-old .cms-page { From fea039bba7fafbae2c91f095816a46d7eeade9c3 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 8 Jan 2018 11:43:10 -0200 Subject: [PATCH 23/46] Merge pull request #9328 from RocketChat/popover-on-safari-ios [FIX] popover on safari for iOS --- .../rocketchat-theme/client/imports/components/popover.css | 6 ++++++ packages/rocketchat-ui/client/views/app/popover.html | 2 +- packages/rocketchat-ui/client/views/app/popover.js | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css index 64dd8a6f7133..20ade8f8a6e3 100644 --- a/packages/rocketchat-theme/client/imports/components/popover.css +++ b/packages/rocketchat-theme/client/imports/components/popover.css @@ -61,6 +61,8 @@ cursor: pointer; + user-select: none; + color: var(--popover-item-color); font-size: var(--popover-item-text-size); @@ -128,6 +130,10 @@ margin: 8px !important; animation: dropup-show 0.3s cubic-bezier(0.45, 0.05, 0.55, 0.95); + + &--safariIos { + bottom: initial; + } } } } diff --git a/packages/rocketchat-ui/client/views/app/popover.html b/packages/rocketchat-ui/client/views/app/popover.html index 22ba0d120a8a..a1c1f7ad7fa6 100644 --- a/packages/rocketchat-ui/client/views/app/popover.html +++ b/packages/rocketchat-ui/client/views/app/popover.html @@ -1,6 +1,6 @@