diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8ed39bf6de5..57c8b2a96ec 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -47,7 +47,7 @@ Discourse::Application.configure do
require 'rbtrace'
if emails = GlobalSetting.developer_emails
- config.developer_emails = emails.split(",").map(&:strip!)
+ config.developer_emails = emails.split(",").map(&:strip)
end
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3a8b992a8ee..927bb8b60ee 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -61,7 +61,7 @@ Discourse::Application.configure do
# developers have god like rights and may impersonate anyone in the system
# normal admins may only impersonate other moderators (not admins)
if emails = GlobalSetting.developer_emails
- config.developer_emails = emails.split(",").map(&:strip!)
+ config.developer_emails = emails.split(",").map(&:strip)
end
end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f48773268fe..d4bc9579c1e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1833,7 +1833,7 @@ en:
newuser: 'Users at Trust Level 0 (New User)'
basic: 'Users at Trust Level 1 (Basic User)'
regular: 'Users at Trust Level 2 (Regular User)'
- leader: 'Users at Trust Level 3 (Leader)'
+ leader: 'Users at Trust Level 3 (Veteran)'
elder: 'Users at Trust Level 4 (Elder)'
admins: 'Admin Users'
moderators: 'Moderators'
@@ -2059,11 +2059,14 @@ en:
show_incoming_updated_topics: '. Show incoming/updated topics'
search: '/ Search'
help: '? Open keyboard shortcuts help'
+ dismiss_new_posts: 'x, r Dismiss New/Posts'
+ dismiss_topics: 'x, t Dismiss Topics'
actions:
title: 'Actions'
star: 'f Star topic'
share_topic: 'shift s Share topic'
share_post: 's Share post'
+ reply_as_new_topic: 't Reply as new topic'
reply_topic: 'shift r Reply to topic'
reply_post: 'r Reply to post'
quote_post: 'q Quote post'
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index eadf66784d2..05463dece2f 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1267,7 +1267,7 @@ en:
usage_tips:
text_body_template: |
- This private message has a few quick tips to get you started:
+ This private message has a few quick tips to get you started.
## Keep scrolling
@@ -1279,11 +1279,13 @@ en:
- For search, your user page, or the menu, use the **icon buttons at the upper right**.
- - While reading a topic, move back to the top ↑ by clicking the topic title. Click the green progress bar at the bottom right to see full navigation controls, or use the home and end keys.
+ - In a list of topics, the title will always take you to your next unread post. Use the last activity time to jump to the last post.
+
+ - While reading a topic, jump to the top ↑ by selecting the topic title. Select the green progress bar at the bottom right for full navigation controls, or use the home and end keys.
- - The topic title will always take you to your next unread post. Use the last activity time to quickly jump to the first or last post in a topic.
+
## How do I reply?
@@ -1299,19 +1301,22 @@ en:
(To quote an entire post, use the Import Quote button on the editor toolbar.)
- To mention someone's name in your reply, start typing `@` and an autocompleter will pop up.
+ To ping someone in your reply, mention their name. Type `@` and an autocompleter will pop up.
+ For [standard Emoji](http://www.emoji-cheat-sheet.com/), just start typing `:` or the traditional smileys `:)` :smile:
+
## What else can I do?
- To let someone know that you enjoyed their post, use the **like** button at the bottom of the post. If you see a problem with a post, don't hesitate to use the **flag** button and privately let them, or our staff, know about it.
+ There are action buttons at the bottom of each post.
- You can also share a link to a post, or bookmark a post for later reference on your user page.
+ To let someone know that you enjoyed their post, use the **like** button. If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button.
+
+ You can also **share** a link to a post, or **bookmark** it for later reference on your user page.
- For [standard Emoji](http://www.emoji-cheat-sheet.com/), just start typing `:` or the traditional smileys `:)` :smile:
## Who is talking to me?
@@ -1323,7 +1328,7 @@ en:
## When are conversations new?
- By default all conversations less than two days old are considered new, and any conversation you've participated in will automatically be tracked.
+ By default all conversations less than two days old are considered new, and any conversation you've participated in (replied to, created, or read for an extended period) will automatically be tracked.
You will see the blue new and number indicators next to these topics:
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 3aab6184bcf..26b7ce4deeb 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -67,7 +67,7 @@ Fabricator(:active_user, from: :user) do
end
Fabricator(:leader, from: :user) do
- name 'Leader McLeaderman'
+ name 'Veteran McVeteranish'
username { sequence(:username) { |i| "leader#{i}" } }
email { sequence(:email) { |i| "leader#{i}@leaderfun.com" } }
trust_level TrustLevel.levels[:leader]
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js.es6
index 627de5641da..4a335328f8d 100644
--- a/test/javascripts/components/keyboard-shortcuts-test.js.es6
+++ b/test/javascripts/components/keyboard-shortcuts-test.js.es6
@@ -46,6 +46,8 @@ module("Discourse.KeyboardShortcuts", {
" ",
" ",
" ",
+ " ",
+ " ",
"
- - The topic title will always take you to your next unread post. Use the last activity time to quickly jump to the first or last post in a topic.
+
## How do I reply?
@@ -1299,19 +1301,22 @@ en:
(To quote an entire post, use the Import Quote button on the editor toolbar.)
- To mention someone's name in your reply, start typing `@` and an autocompleter will pop up.
+ To ping someone in your reply, mention their name. Type `@` and an autocompleter will pop up.
+ For [standard Emoji](http://www.emoji-cheat-sheet.com/), just start typing `:` or the traditional smileys `:)` :smile:
+
## What else can I do?
- To let someone know that you enjoyed their post, use the **like** button at the bottom of the post. If you see a problem with a post, don't hesitate to use the **flag** button and privately let them, or our staff, know about it.
+ There are action buttons at the bottom of each post.
- You can also share a link to a post, or bookmark a post for later reference on your user page.
+ To let someone know that you enjoyed their post, use the **like** button. If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button.
+
+ You can also **share** a link to a post, or **bookmark** it for later reference on your user page.
- For [standard Emoji](http://www.emoji-cheat-sheet.com/), just start typing `:` or the traditional smileys `:)` :smile:
## Who is talking to me?
@@ -1323,7 +1328,7 @@ en:
## When are conversations new?
- By default all conversations less than two days old are considered new, and any conversation you've participated in will automatically be tracked.
+ By default all conversations less than two days old are considered new, and any conversation you've participated in (replied to, created, or read for an extended period) will automatically be tracked.
You will see the blue new and number indicators next to these topics:
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 3aab6184bcf..26b7ce4deeb 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -67,7 +67,7 @@ Fabricator(:active_user, from: :user) do
end
Fabricator(:leader, from: :user) do
- name 'Leader McLeaderman'
+ name 'Veteran McVeteranish'
username { sequence(:username) { |i| "leader#{i}" } }
email { sequence(:email) { |i| "leader#{i}@leaderfun.com" } }
trust_level TrustLevel.levels[:leader]
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js.es6
index 627de5641da..4a335328f8d 100644
--- a/test/javascripts/components/keyboard-shortcuts-test.js.es6
+++ b/test/javascripts/components/keyboard-shortcuts-test.js.es6
@@ -46,6 +46,8 @@ module("Discourse.KeyboardShortcuts", {
" ",
" ",
" ",
+ " ",
+ " ",
"