Robin Ward
88b5e78424
Merge branch 'add_custom_embed_by_username' of github.com:justinleveck/discourse into justinleveck-add_custom_embed_by_username
...
Conflicts:
config/site_settings.yml
2014-06-16 10:52:15 -04:00
Jeff Atwood
ce0b64ef1f
minor style edits on invites
2014-06-14 15:59:02 -07:00
Jeff Atwood
1b3180f916
better copy for site and topic invites
2014-06-14 15:49:19 -07:00
Neil Lalonde
ba65aa3f6c
Add a way to validate min and max value of an integer site setting
2014-06-12 18:04:37 -04:00
Jeff Atwood
50b3a1734f
copyedits on bulk invite
2014-06-12 03:55:22 -07:00
Neil Lalonde
9611a1ac47
Validate username site settings
2014-06-11 16:20:57 -04:00
Régis Hanol
ce732d2252
FEATURE: new "disable_edit_notifications" site setting
...
Should be used whenever you activate the "download_remote_images_to_local" site setting to prevent users from receiving a lot of edit notifications from the system user.
2014-06-11 17:14:00 +02:00
Robin Ward
d06720d059
REFACTOR: Remove animation from ellpisis post menu, change ordering of
...
buttons.
2014-06-10 15:27:43 -04:00
Régis Hanol
0781531e3c
Merge pull request #2415 from techAPJ/bulk-invite-users-5
...
FEATURE: Bulk Invite
2014-06-10 19:11:11 +02:00
Benjamin Kampmann
8167207e38
Wrap extended post actions in ellipsis.
...
Add a new SiteSetting to specify a maximum of items to be shown in post action menus per default. If more buttons are rendered and those after mentioned maximum will be hidden behind a collapsible ellipsis-button. Once clicked it slides in the missing buttons and hides itself.
If the setting is set to 0, the ellipsis will not be applied. It default is set to 4 though.
All buttons are created equal - but the Reply-Button is more equal than others: If it is rendered, the reply button will never be hidden behind the ellipsis. The max count is exclusiding the reply button and its position would make the reply button hide, it is removed there and pushed to the end of the list.
2014-06-10 09:55:07 +02:00
Sam
8dce92ba50
BUGFIX: rename Topics in search to Results
2014-06-10 16:25:44 +10:00
Sam
a044e3de58
Remove min_posts_for_search_in_topic
...
no longer needed, we always search in topic
2014-06-10 15:07:38 +10:00
Jeff Atwood
8d04e54198
improve username length errors
2014-06-09 17:25:54 -07:00
Neil Lalonde
c61462662b
Add ability to run validation on site settings. notification_email and other email address settings are now validated.
2014-06-09 16:59:20 -04:00
Justin Leveck
a78df3d57d
Add custom embed_by_username feature
...
Feature to allow each imported post to be created using a different discourse
username. A possible use case of this is a multi-author blog where discourse
is being used to track comments. This feature allows authors to receive
updates when someone leaves a comment on one of their articles because each of
the imported posts can be created using the discourse username of the author.
2014-06-09 12:35:38 -07:00
Arpit Jalan
727184641e
FEATURE: Bulk Invite
2014-06-09 01:43:39 +05:30
Arpit Jalan
0ca9d5f3f9
Fix Typo
2014-06-08 18:04:35 +05:30
Jeff Atwood
42509964da
copyedits on admin PM notifications
2014-06-04 13:39:54 -07:00
Robin Ward
5bedc56387
New site setting: limit_suggested_to_category
- ensures suggested
...
topics belong to the same category as the current topic and doesn't mix
in other categories.
2014-06-03 17:49:04 -04:00
Peter N Lewis
6c05de45b6
Support for insecure POP3 (without SSL)
...
Ideally it would be a menu selection to select POP3, POP3S, and potentially other future protocols like IMAP if desired, but I didn't want to deal with data migration at this point. And then I was going to have a checkbox for "Secure" (on by default, obviously), but that was very hard to word as to how it was different given everything else referred to pop3s and I couldn't change that either. So I settled on a preference:
pop3s_polling_insecure: "Poll using plain text POP3 without SSL"
Off by default.
This makes it very clear that as to what turning on that checkbox will be, and by calling it "insecure" makes sure people will think twice before turning it on.
I have not attempted to do any of the translations of the preference, I'm ot sure how you handle that.
2014-06-02 20:59:10 +08:00
Sam
7861cabfa1
FEATURE: posts per page is configurable, so should be desktop slack
2014-05-31 10:19:29 +10:00
Jeff Atwood
a2a834dae0
add guide links to google oauth 2 warning
2014-05-29 21:40:29 -07:00
Jeff Atwood
dab852f922
clarify that it is a new user
2014-05-29 21:37:29 -07:00
Sam
6c1c8be794
Work in progress, keeping avatars locally
...
This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)
user can then pick which they want.
2014-05-27 10:08:03 +10:00
Neil Lalonde
8c3770c0b0
Add site setting show_create_topics_notice as a way to hide the 'Create at least 5 topics to get discussion started' message.
2014-05-26 11:20:06 -04:00
Jeff Atwood
64f8b8c0e8
Log in / Sign in
2014-05-24 15:14:03 -07:00
Sam
40d397e278
FEATURE: Unhide max username length
2014-05-23 11:36:35 +10:00
Jeff Atwood
11348a15ea
improve domain/url block message
2014-05-21 21:51:13 -07:00
Neil Lalonde
867c56d9c7
Add link to google config instructions. Fix dashboard warning for google oauth2.
2014-05-21 19:11:10 -04:00
Neil Lalonde
742841ddce
Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites.
2014-05-21 18:35:10 -04:00
Sam
832a730e36
BUGFIX: re-enable CDN js debugging in a robust way
...
May be disabled if needed via site setting
2014-05-19 08:46:28 +10:00
Jeff Atwood
31aea668e0
improve /top redirect copy in English master
2014-05-16 16:25:28 -07:00
Neil Lalonde
27cbc06563
Add fixed_category_positions site setting to handle whether categories are ordered by specified positions or by activity.
2014-05-16 11:33:52 -04:00
Jeff Atwood
ecd9f5fa78
clarify digest footer
2014-05-14 23:17:04 -07:00
Robin Ward
3211c60bbe
FEATURE: A new site setting public_user_custom_fields
which allows you
...
to whitelist custom fields that will be exposed to the Ember client
application.
2014-05-14 14:39:01 -04:00
Neil Lalonde
c4d3aa3d47
Theming: a UI to choose some base colors that are applied to all the site css. CSS compiled outside of asset pipeline.
2014-05-14 10:18:12 -04:00
Régis Hanol
2d8a4ee91f
BUGFIX: add 'notify_moderators' flag reason
2014-05-13 17:36:32 +02:00
Wojciech Zawistowski
960d64930c
Wiki Post
2014-05-13 08:53:11 -04:00
Jeff Atwood
c382b259f0
minor copy improvement
2014-05-12 15:39:30 -07:00
Neil Lalonde
00390ee739
Add a way to show a custom message at the top of all notification emails. Customize it at /admin/site_contents/notification_email_top
2014-05-12 16:52:06 -04:00
Jeff Atwood
8322f3d5de
copyedits on embedded posts
2014-05-09 23:00:49 -07:00
Neil Lalonde
9f059b1090
User lowercase names for seeded categories. Change colors of meta category badge for new sites.
2014-05-09 12:57:19 -04:00
Erick Guan
f2fd38a7b8
One more line for more space in new version email
2014-05-09 15:02:22 +08:00
Jeff Atwood
1d98d70834
update new version email with release notes too
2014-05-07 17:31:44 -07:00
Jeff Atwood
a40cf28423
update new version email copy
2014-05-07 16:36:35 -07:00
Jeff Atwood
19867c147b
minor copyedit
2014-05-06 14:47:18 -07:00
Jeff Atwood
2cbebd85c6
clarify that global notice for urgent/emergency
2014-05-05 15:02:10 -07:00
Régis Hanol
c21d3f41d0
BUGFIX: only redirect new users to top page once
...
Actually, new users will still be redirected to the top page during the first 30 seconds of their first visit.
2014-05-05 19:00:40 +02:00
Régis Hanol
b6dd0cfb7d
FEATURE: add a link to PMs in the post shown to users when their message has been hidden
2014-05-02 22:54:03 +02:00
Jeff Atwood
80e9e74df9
drop the "in", Omit Needless Words
2014-05-02 13:52:01 -07:00
Jeff Atwood
ee08ace63a
can't stop, won't stop, don't stop. ONW
2014-05-02 13:11:57 -07:00
Jeff Atwood
585997f97e
I really need to stop editing this. 1 word less!
2014-05-02 12:28:29 -07:00
Neil Lalonde
014bfc0512
Use 10k most common passwords instead of 5k
2014-05-02 12:01:21 -04:00
Jeff Atwood
a8b1cb66af
omit needless words
2014-04-30 22:07:08 -07:00
Jeff Atwood
9f16bc9048
digest footer copyedit
2014-04-30 16:21:18 -07:00
Jeff Atwood
0fa7aec74a
minor copyedits on faq and digest
2014-04-30 16:20:23 -07:00
Régis Hanol
11af466737
FEATURE: add a specific flag reason when a post has been hidden
2014-04-30 16:58:01 +02:00
Jeff Atwood
4b83a6f0a0
minor copyedits on flagging
2014-04-30 02:03:13 -07:00
Jeff Atwood
f13e9e58e8
change "Log In" to "Sign In"
...
because
http://www.designcult.org/2011/08/why-do-we-call-in-logging-in.html
2014-04-30 01:10:32 -07:00
Jeff Atwood
dd1ebff956
more accurate description of newuser_max_replies
2014-04-29 13:19:07 -07:00
Jeff Atwood
4442ae1c8a
apparently that's not markdown-ified
2014-04-29 12:56:16 -07:00
Régis Hanol
4371374ba6
FEATURE: support for enabling all upload file types
...
BUGFIX: authorized extensions is now case insensitive
2014-04-29 19:12:35 +02:00
Jeff Atwood
c6d9829092
It's these COLONS! HE HATES THESE COLONS!
...
https://www.youtube.com/watch?v=Tcwz8-EfFYE
2014-04-27 01:35:39 -07:00
Neil Lalonde
feaaf55a0c
Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet.
2014-04-24 16:49:12 -04:00
Régis Hanol
3036490d05
Merge pull request #2260 from riking/download_blacklist
...
Add site setting for domains to never download images from
2014-04-24 11:13:03 +02:00
Jeff Atwood
3dedb0ce05
better S3 bucket name guidance
2014-04-24 00:13:15 -07:00
Jeff Atwood
d094fc91d7
minor digest copyedit
2014-04-23 23:14:26 -07:00
riking
b309deef11
Add site setting for domains to never download images from
2014-04-23 22:24:35 -07:00
Neil Lalonde
51cc39cad6
Add comments to the top of client.en.yml and server.en.yml about Transifex stuff
2014-04-23 16:47:20 -04:00
Jeff Atwood
387ac342ce
slightly improve disk space limit reached message
2014-04-23 11:31:01 -07:00
Régis Hanol
b61abe3107
FEATURE: warn the admin whenever we disable the download_remote_images_to_local site setting
2014-04-23 12:43:10 +02:00
Robin Ward
4eb5474858
Add a SiteSetting to configure how many topics are in the email digest.
2014-04-21 17:49:10 -04:00
Jeff Atwood
ef018db2e6
minor digest email copyedits
2014-04-21 10:36:33 -07:00
Jeff Atwood
7e3dd43e9a
missed a pin copy
2014-04-20 22:52:26 -07:00
Jeff Atwood
1ee039f786
fix pin message copy
2014-04-20 22:45:48 -07:00
Régis Hanol
454f11e597
FEATURE: new title_sanitize site setting
2014-04-18 21:01:21 +02:00
Régis Hanol
756ea0178a
Merge pull request #2276 from vikhyat/badge-system
...
Badge system updates
2014-04-18 11:46:19 +02:00
Vikhyat Korrapati
4eb7579d04
Notification copy.
2014-04-18 04:04:24 +05:30
Robin Ward
64faee0935
Break down new topic counts by category if a digest contains many.
2014-04-17 16:42:40 -04:00
Robin Ward
0e56157212
Basic "Also, there are x new topics" text for the digest
2014-04-17 16:04:26 -04:00
Neil Lalonde
87e5e4b8d0
Use a real link to docker manager in new version email
2014-04-17 14:36:26 -04:00
Vikhyat Korrapati
b62606e7f1
Remove color_hexcode column from badge_types.
2014-04-17 05:36:29 +05:30
Vikhyat Korrapati
89f45901bc
Create notification when badge is granted.
2014-04-17 01:58:01 +05:30
Jeff Atwood
fad31b6d9e
More helpful assets topic explanation
2014-04-15 22:07:19 -07:00
Jeff Atwood
8114588c06
minor copyedit on auto image downloading
2014-04-15 21:52:40 -07:00
Sam
b7caa33841
Site setting to allow mods to create categories
2014-04-15 16:42:45 +10:00
Sam
e5f41b8a21
FEATURE: whitelist and blacklist selectors for embeds
2014-04-15 14:07:30 +10:00
Régis Hanol
2505d18aa9
FEATURE: support email attachments
2014-04-14 22:55:57 +02:00
Robin Ward
b0405d7cfa
Adds a Site Setting to whitelist onebox domains
2014-04-09 16:57:45 -04:00
Robin Ward
f8964bf453
Remove unused SiteSetting
2014-04-09 16:18:31 -04:00
Sam
8cdf25532c
Merge pull request #2207 from riking/list-setting
...
UI for list site settings
2014-04-09 09:34:50 +10:00
riking
9c4dd1cb35
Change comma-delim site settings to pipe-delim
2014-04-08 14:17:55 -07:00
riking
1540a3d5e5
Allow changing ownwership of posts by admins
2014-04-08 01:47:42 -07:00
Jeff Atwood
150081bf27
die, colon! DIEEEEEEeeeEEeee
2014-04-08 00:12:00 -07:00
Sam
0372b81d11
FEATURE: allow moderators to globally pin topics
2014-04-07 16:38:51 +10:00
Robin Ward
c82313595d
Minor text change
2014-04-05 15:10:46 -04:00
Neil Lalonde
30b23a2450
FIX: notify_about_flags_after description said it sends to moderators. It actually sends to contact_email.
2014-04-04 15:24:00 -04:00
Neil Lalonde
ecf211aa3f
Send email to contact_email if there are flags submitted more than 48 hours ago. Configurable with the notify_about_flags_after site setting.
2014-04-03 14:34:40 -04:00
Robin Ward
558a06a117
Adds better reusable error message support. Added to fetching remote
...
posts. /cc @riking
2014-04-02 13:22:10 -04:00
Neil Lalonde
e86d3e5ce2
Revert "Change 5k passwords -> 10k passwords in locale files"
2014-04-01 15:39:31 -04:00
Régis Hanol
ef24a4c71c
FEATURE: add redirect_users_to_top_page site setting (default to true)
2014-03-31 21:53:38 +02:00
Régis Hanol
682b0c4883
typo
...
thanks @Naatan
2014-03-31 18:23:42 +02:00
Benjamin Kampmann
2815e98e6d
Make autohighighting for all Code-Blocks a SiteSetting
2014-03-31 09:44:35 +02:00
riking
57051e896d
Change 5k passwords -> 10k passwords in locale files
2014-03-29 14:06:09 -07:00
Jeff Atwood
32e398d484
omit needless words
2014-03-28 13:58:40 -07:00
Jeff Atwood
239d73c897
improve version update email
2014-03-28 13:35:09 -07:00
Régis Hanol
e6989b5313
Merge pull request #2192 from jorgemanrubia/configurable-emails-prefix
...
Option to change the subject prefix in emails
2014-03-28 15:08:50 +01:00
slainer68
6fb323fd71
Delete enable_local_account_create option as it is not used anywhere.
...
JS fixture
2014-03-27 00:55:06 +01:00
Jorge Manrubia
bd1047a579
Restore locale entry I shouldn't have removed
2014-03-26 23:20:19 +01:00
Jorge Manrubia
806924dd7e
Option to change the email subject prefix
...
It adds a new setting 'email_prefix' to configure which [label] will be used in the subject of emails. Discourse currently uses '[title]'. The problem is that sometimes you need to set a longer title, that doesn't really work well for emails. I think this is very common since the HTML `<title>` tag is very important for SEO.
It will default to '[title]' if this setting is not used.
See: https://meta.discourse.org/t/where-to-change-the-email-subject-prefix/11989
2014-03-26 23:06:00 +01:00
Régis Hanol
0def4747da
FEATURE: send the backup/restore logs when operation fails
2014-03-24 19:34:16 +01:00
Jeff Atwood
bb8dbde0ad
meta "See this guide to learn more" links
2014-03-24 00:30:22 -07:00
Sam
c27c87911e
FEATURE: refactor notice code, add optional global notice.
...
Set the global_notice site setting to notify users of a critical event.
2014-03-24 16:51:48 +11:00
Jeff Atwood
ad71490deb
omit needless words
2014-03-23 00:13:29 -07:00
Jeff Atwood
cd28b3a21b
clarify this is an incoming-only email
2014-03-21 23:43:46 -07:00
Jeff Atwood
2a6849b387
add additional reply via email help text example
2014-03-21 23:41:33 -07:00
Robin Ward
d3f1eb395d
Updated import for TypePad
2014-03-19 15:02:49 -04:00
Robin Ward
84e608079b
Ability to customize the logo in digest emails
2014-03-18 15:56:17 -04:00
Robin Ward
3cf0adaed0
Merge pull request #2139 from riking/s3-backup-warning
...
Add s3_backup_config_warning
2014-03-18 14:41:42 -04:00
Sam
24667cedee
FEATURE: notify users when linked
...
Extract out PostAlerter from observer
Track outgoing post links correctly
Notify users they are linked when linked
2014-03-18 15:22:53 +11:00
riking
ffd4f367e3
Add s3_backup_config_warning
...
Note that only one of the two warnings can be shown, because they are checked in the same method.
2014-03-17 12:56:59 -07:00
Jeff Atwood
2cff3c20f7
clarify invite copy
2014-03-17 12:07:21 -07:00
Sam
fe63db7953
Merge pull request #2115 from vikhyat/badge-system
...
Initial badge system implementation
2014-03-17 10:06:37 +11:00
Jeff Atwood
3f858801a3
omit needless words from welcome email header
2014-03-14 13:31:19 -07:00
Jeff Atwood
93bced5a5e
remove login-specific info
2014-03-14 10:21:33 -07:00
Vikhyat Korrapati
9b26c8584e
Initial badge system implementation.
2014-03-14 21:49:26 +05:30
Jeff Atwood
a07062644c
improve new version emails
2014-03-13 16:22:31 -07:00
Robin Ward
085f7997a2
FEATURE: Upload backups to S3 when complete.
2014-03-12 16:24:45 -04:00
Robin Ward
42ca83ece5
FEATURE: New site setting to enable a daily automatic backup
2014-03-12 13:30:47 -04:00
Robin Ward
dc1d6decf5
Support for removal of old backups automatically via a site setting
2014-03-12 12:24:35 -04:00
Neil Lalonde
659e7fa4ce
FEATURE: Warn when reviving a topic that has been inactive for X days. Setting warn_reviving_old_topic_age controls when the warning is shown. Set it to 0 to disable this feature.
2014-03-12 10:44:12 -04:00
Jeff Atwood
ef854d459b
few more quick new user tips tweaks
2014-03-10 00:52:36 -07:00
Jeff Atwood
9abc2217ee
improve quick tips PM all new user copy
2014-03-10 00:43:30 -07:00
Régis Hanol
8214536614
BUGFIX: don't show redirect reason if you aren't redirected
...
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
2014-03-07 18:58:53 +01:00
riking
ccd3e635d2
Refresh the site after updating certain site settings
2014-03-06 20:24:23 -08:00
Régis Hanol
ca12ea42a7
FEATURE: only redirect new users to top page for a limited period
...
That period is defined by the `redirect_new_users_to_top_page_duration`
site setting and defaults to 7 days.
2014-03-05 22:11:01 +01:00
Robin Ward
b0f3061113
It doesn't make sense to redirect when not logged in on a non-GET
...
request. We should report a failure then. They likely logged out or
in another tab or timed out.
2014-03-05 12:12:53 -05:00
Régis Hanol
bce4130d39
Merge pull request #2036 from ArmedGuy/profile-backgrounds
...
FEATURE: Profile Backgrounds
2014-03-05 16:00:49 +01:00
Johan Jatko
98c479c3c4
FEATURE: Profile Backgrounds
...
Shares a modified codebase with avatars called "user_image"
2014-03-05 15:10:44 +01:00
Sam
adb6541635
FEATURE: mailing list mode always available
2014-03-05 14:21:53 +11:00
Sam
69b498da24
Merge pull request #2034 from birarda/custom_username_length
...
allow for custom username length via site setting
2014-03-05 12:06:23 +11:00
Stephen Birarda
4a2dab9c5e
allow for custom min_username_length
...
change constant in user to be global range and not default
2014-03-04 16:37:05 -08:00
Sam
ea553202f0
Merge pull request #2033 from birarda/master
...
add option to override user attributes from SSO payload
2014-03-05 11:33:32 +11:00
Jeff Atwood
d5ec409434
add Transifex link to header of translation files
2014-03-04 14:35:23 -08:00
Stephen Birarda
c3eb2025d8
add option to override user attributes from SSO payload
...
add an external_username attribute for username from SSO payload
repair the field name in SingleSignOnRecord migration
move setting of external_username for sso to controller
add settings toggle to override username/email from SSO payload
fix changing of external username after override toggle
complete tests and logic for sso override
add some extra context to username override option
add external_email and external_name to single sign on record
add setting for name override from SSO payload
complete override with stored external_email and external_name
add missing checks to tests
remove an unneeded describe block
break up a monster method for single sign on
fixes for sso attribute override after failed tests
2014-03-04 09:52:21 -08:00
Jeff Atwood
2b343a9d94
minor improvements to welcome message
2014-03-04 00:29:48 -08:00
Jeff Atwood
d976623303
clarify use_https setting
2014-03-03 23:50:10 -08:00
Jeff Atwood
8010ed3ba1
we don't use the term "nickname" use -> "username"
2014-03-03 23:30:43 -08:00
Benjamin Kampmann
024597e643
Switch to proper exception handling system for better user feedback
...
- Replace implicit return code-system in Email::Receiver with proper exception system
- Update tests to check for exceptions instead
- Test the PollMailbox for expected failures
- Add proper email-handling of problematic emails
"
2014-02-28 17:02:58 +01:00
Benjamin Kampmann
4af2cf3f23
Refactor and clean up New-Topic via Email
...
With the new email_in admin configuration setting, emails to the email_in_address fetched via POP will now be processed and posted as new topics to the forum.
With the email_in_min_trust you can control the trust level the user needs to have at least to be able to post an email as a new topic.
Also contains tests for the email-in feature and minor clean ups
2014-02-28 16:53:58 +01:00