1910 Commits

Author	SHA1	Message	Date
David García-Navas López de Cuéllar	7e0ee2a931	[CI SKIP] Little typo.	2016-04-18 16:43:16 +02:00
Sam	fad017d842	FEATURE: add support for bounce emails ... We now optionally add a Variable Email Return Path to every email we send. This allows us to cleanly handle email bounces, which in turn will improve deliverability.	2016-04-18 17:14:01 +10:00
Régis Hanol	4d9c81fde7	Merge pull request #4148 from tgxworld/dont_reply_to_emails_that_are_autogenerated ... FIX: Don't send rejection mailer to bounced emails.	2016-04-13 15:36:14 +02:00
Jeff Atwood	36683da8b6	somehow git missed this file	2016-04-12 13:29:47 -07:00
Jeff Atwood	2258dbd232	badge copyedits	2016-04-12 12:56:48 -07:00
Robin Ward	0396b14b70	FEATURE: New "First Onebox" badge	2016-04-12 15:31:14 -04:00
Jeff Atwood	04c1d37e63	some copyedits on autoclose and new badges	2016-04-12 12:26:06 -07:00
Sam	0113fce420	FEATURE: automatically close topics with 10k+ posts ... FEATURE: automatically close messages with 2k+ posts Both configurable via `auto_close_messages_post_count` and `auto_close_topics_post_count`	2016-04-12 13:29:48 +10:00
Régis Hanol	56089c4856	FEATURE: new 'auto_generated_whitelist' site setting	2016-04-11 22:47:34 +02:00
Neil Lalonde	a299231f9a	FEATURE: add setting to omit category name from topic page title tag	2016-04-11 16:44:16 -04:00
Régis Hanol	a359a973e2	remove useless content when sending email to a staged used	2016-04-11 19:06:10 +02:00
Régis Hanol	e4980392da	improve receiver specs to account for posts approval	2016-04-11 18:20:26 +02:00
Sam	030fb71f60	add missing localizations	2016-04-09 10:07:11 +10:00
Neil Lalonde	7f0b1691c4	FEATURE: add pop3 timeouts and auth errors to admin dashboard. Admins will get notified along with other problems.	2016-04-08 17:33:47 -04:00
Neil Lalonde	9c934e27be	FEATURE: notify admins if problems have been reported on the dashboard for a while	2016-04-08 16:44:13 -04:00
Sam	19ca08857f	FEATURE: verbose SSO logging ... By enabling the site setting verbose_sso_logging you can log information every time a user tries initiates SSO and during SSO failures	2016-04-08 11:20:01 +10:00
Neil Lalonde	01b6bc08ba	Merge fixes from master	2016-04-07 13:51:05 -04:00
Guo Xiang Tan	5734c7f3f3	FIX: Don't send rejection mailer to bounced emails.	2016-04-07 22:21:17 +08:00
Guo Xiang Tan	2ecff60af2	FIX: Typos.	2016-04-07 11:52:07 +08:00
frictionel	9410c2b986	correcting errors in translation sources ... * Update client.en.yml	2016-04-06 21:08:47 +02:00
Arpit Jalan	9a045c216c	FIX: verify that sso_url setting includes protocol	2016-04-06 11:12:47 +05:30
Neil Lalonde	56e47c8d7e	FEATURE: report on admin dashboard when favicon is failing to load	2016-04-05 14:42:32 -04:00
Arpit Jalan	f9d1a2554d	FIX: do not allow SVG image as digest logo	2016-04-02 17:27:06 +05:30
Neil Lalonde	01d0aeb5a9	merge master	2016-03-31 17:40:54 -04:00
Arpit Jalan	41208b99a1	FEATURE: RSS feed for user posts and topics	2016-03-31 20:24:05 +05:30
Jeff Atwood	03b65345d1	remove :) from new version notifications :(	2016-03-29 22:47:12 -07:00
Jeff Atwood	a307689621	slightly better avatar missing copy	2016-03-28 12:04:27 -07:00
Sam	fe51f84aa7	FEATURE: allow admins to enter badge long descriptions ... FIX: fallback to description if badge long description is missing Also moves all badge localization into server.en, this slims the client down serializers pass down localized names/descriptions/long descriptions	2016-03-28 18:38:57 +11:00
Arpit Jalan	64feffbb60	FEATURE: site setting for suppressing categories from digest email	2016-03-26 01:06:03 +05:30
Arpit Jalan	fc9519af52	Merge pull request #4117 from techAPJ/invite-email ... UX: user invite email style should be consistent with other user notifications	2016-03-25 23:15:52 +05:30
Robin Ward	2c5eed9a85	FIX: Basic badge description was missing	2016-03-25 12:11:39 -04:00
Arpit Jalan	17afdc34cc	UX: user invite email style should be consistent with other user notifications	2016-03-25 19:28:55 +05:30
Jeff Atwood	9bd8ea4633	more long badge descriptions	2016-03-24 15:06:35 -07:00
Robin Ward	f0552af5f1	FIX: Don't log validation errors for sso	2016-03-23 14:44:34 -04:00
Régis Hanol	39863953cd	new 'enable_staged_users' site setting	2016-03-23 18:56:03 +01:00
jomaxro	cc07f421f1	Update automated account blocked by staff PM ... When a user's account is blocked by staff, they receive an automated PM informing them of such. Unlike the new user too many flags PM, this PM does not inform that user what blocked means. This PR adds two lines to the PM, one explaining what blocking means, the other informing the user to contact staff with questions.	2016-03-23 00:21:15 -04:00
Sam	c095304d6d	FEATURE: limit daily emails per user to 100 per day via site setting ... - controlled via max_emails_per_day_per_user, 0 to disable - when limit is reached user is warned	2016-03-23 15:08:48 +11:00
Robin Ward	a9320f668c	FIX: Invalid YAML	2016-03-22 11:15:15 -04:00
Jeff Atwood	69268786c4	lots more + better long badge descriptions	2016-03-22 04:19:45 -07:00
Régis Hanol	afacc70fbe	improve error message when trying to change email address to one used by a staged user	2016-03-21 19:36:26 +01:00
Arpit Jalan	34469e725b	FEATURE: separate API endpoints for public and private posts	2016-03-21 18:21:15 +05:30
Gerhard Schlager	81e174c47a	Fix Permalink normalization regex example	2016-03-19 22:37:29 +01:00
Arpit Jalan	bd83cf7f4c	FEATURE: add group posts and mentions RSS	2016-03-18 22:29:10 +05:30
Sam	77242e4680	FEATURE: in:pinned and in:unpinned search filters	2016-03-18 16:26:54 +11:00
Neil Lalonde	213950e4cf	FEATURE: add option to include topics from trust level 0 users in digest emails	2016-03-17 17:35:23 -04:00
Régis Hanol	99b1059537	improve 'private_email_time_window_seconds' site setting helper text	2016-03-17 16:29:23 +01:00
Sam	a8dbba9a01	warn about setting	2016-03-17 17:03:12 +11:00
Régis Hanol	20ce7f29e0	FEATURE: new 'manual_polling_enabled' site setting	2016-03-16 22:28:01 +01:00
Sam	84d234a98a	Merge pull request #4076 from scossar/locale-from-header-setting ... FEATURE: add site setting for setting locale from header	2016-03-17 07:53:20 +11:00
Régis Hanol	162fcb75da	FEATURE: admin dashboard check when email polling errored in the past 24 hours	2016-03-16 21:17:48 +01:00
Arpit Jalan	9b3218b041	update tl3 settings description	2016-03-16 14:31:50 +05:30
scossar	1914495e88	make error message translatable	2016-03-15 10:02:10 -07:00
scossar	0cbeda8414	add site setting for setting locale from header	2016-03-14 16:18:19 -07:00
Régis Hanol	4a3cb4a000	FIX: use MD5 of the email_string when there's no 'Message-Id'	2016-03-14 18:18:58 +01:00
Sam Saffron	e00850a1ab	FEATURE: implement before and after filters in search remove max_age and min_age ... supports - before:monday - after:june - before:2001 - before:2001-01-22	2016-03-14 23:27:02 +11:00
Arpit Jalan	01f2f05f2d	Merge pull request #4070 from techAPJ/revert-post ... FEATURE: revert post to a specific revision	2016-03-11 23:00:13 +05:30
Régis Hanol	6d84a8a1b3	FIX: don't send out elided message in email notifications ... UX: improved details tag for elided messages	2016-03-11 17:51:16 +01:00
Arpit Jalan	89248580dc	FEATURE: revert post to a specific revision	2016-03-11 02:46:55 +05:30
Robin Ward	5771d2aee2	SECURITY: Support for confirm old as well as new email accounts	2016-03-08 14:52:22 -05:00
Régis Hanol	031146a821	FIX: ensure email in address insn't used it both Groups & Categories	2016-03-08 20:52:04 +01:00
Guo Xiang Tan	ee8be3d1a8	Merge pull request #4059 from gdpelican/feature/disable-mailing-list-mode ... FEATURE: Add site setting for disabling mailing list mode site wide	2016-03-08 16:27:09 +08:00
James Kiesel	2f00e2179f	Don't use unnecessary stubs; site setting language update	2016-03-08 19:40:16 +13:00
Régis Hanol	622d804d46	FEATURE: Add rejection message on rejected IncomingEmail ... FIX: Better RateLimit description in rejected IncomingEmail FEATURE: Send email when hitting a rate limit	2016-03-07 16:56:17 +01:00
Sam	fe6ea48123	Merge pull request #4038 from markbiegel/instagram-login ... FEATURE: Instagram OmniAuth login methods	2016-03-07 14:05:07 +11:00
James Kiesel	54b4fb69db	FEATURE: Add site setting for disabling mailing list mode site wide	2016-03-05 11:08:31 +13:00
Robin Ward	be257225b6	Adjustment: New User Posts must be reviewed at TL0 + TL1	2016-03-02 14:54:03 -05:00
Guo Xiang Tan	f32f0d6337	Merge pull request #4017 from tgxworld/add_admin_banner_for_logster ... FEATURE: Admin Banner when Logster logs is getting flooded.	2016-03-02 23:44:56 +08:00
Guo Xiang Tan	fdd6920ae7	FEATURE: Admin Banner when Logster logs is getting flooded.	2016-03-02 22:03:16 +08:00
Sam Saffron	5f4075a6cf	FEATURE: users can select how frequently they are notified on likes ... - first time - first time and daily (default) - always	2016-03-02 23:16:52 +11:00
Arpit Jalan	50e65634d7	FEATURE: new setting min_admin_password_length and better default	2016-03-02 14:43:26 +05:30
Arpit Jalan	8349669f8e	streamline topic_invite locale	2016-03-02 00:39:17 +05:30
Robin Ward	618eef680e	FEATURE: Disable removal of backups from S3	2016-03-01 14:02:10 -05:00
Arpit Jalan	41a0f9b7fd	UX: better error message when inviting user to a topic	2016-03-02 00:30:31 +05:30
David García-Navas López de Cuéllar	a66c236adb	very little typo [ci skip] ... [ci skip]	2016-03-01 12:06:27 +01:00
Régis Hanol	be5a54d67d	FEATURE: new 'allow_all_attachments_for_group_messages' site setting	2016-02-29 22:39:24 +01:00
Arpit Jalan	01e1bb53f1	FEATURE: add RSS feed for top topics	2016-02-29 23:46:36 +05:30
Jeff Atwood	f2c67a5010	remove mandrill RIP	2016-02-27 15:21:17 -08:00
Régis Hanol	21b51090bf	FIX: don't tell staged users they can visit topics in email notifications	2016-02-26 23:56:56 +01:00
Sam Saffron	820a435af8	FEATURE: add "email in-reply-to user option" ... We no longer include previous replies as "context", instead we include and excerpt of the post being replied to at the bottom of notifications, this information was previously missing. Users may opt in to emailing previous replies if they wish or opt out of "in-reply-to" which makes sense in some email clients that are smarter about displaying a tree of replies.	2016-02-26 00:05:59 +11:00
Ubuntu	5c603bf8ec	Added Instagram login method	2016-02-25 12:13:59 +10:00
Régis Hanol	f7432d8ec9	FEATURE: add support for multiple incoming emails for groups & categories	2016-02-24 19:47:58 +01:00
Jeff Atwood	0097dc55b5	more entertaining 404 header copy	2016-02-24 02:00:12 -08:00
Robin Ward	ee1aec6766	Merge branch 'vdom'	2016-02-23 15:30:40 -05:00
Arpit Jalan	9de5c340b0	FIX: invite link should not auto-accept invitation if user is already logged in	2016-02-23 12:10:25 -05:00
Arpit Jalan	72784d23e7	improved already_logged_in copy	2016-02-23 21:56:34 +05:30
Arpit Jalan	1253afdf95	FIX: invite link should not auto-accept invitation if user is already logged in	2016-02-23 19:49:58 +05:30
Sam Saffron	d0a86f8032	Merge branch 'master' into vdom	2016-02-23 15:58:46 +11:00
Jeff Atwood	69461ec1ce	slightly better upgrade email text	2016-02-22 15:50:28 -08:00
Sam	c404da248a	Merge branch 'master' into vdom	2016-02-22 12:20:59 +11:00
Neil Lalonde	e8d837269b	FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting.	2016-02-19 15:21:18 -05:00
Jeff Atwood	6c684944c5	add link to mail-tester.com in test email	2016-02-19 09:19:36 -08:00
Sam	29c2423daf	Merge branch 'master' into vdom ... # Conflicts: # app/assets/javascripts/discourse/views/post.js.es6	2016-02-19 14:09:31 +11:00
Sam	ab06f86fbe	FEATURE: allow users to control how many previous replies they get ... - always means we always send previous replies with every email - never means we do not - "unless previously sent" ... is the default, in which we only email you each reply once The default_email_previous_replies site setting can control this toggle	2016-02-19 13:57:07 +11:00
Régis Hanol	e204144a58	UsernameValidator error messages weren't matching the code	2016-02-18 23:19:14 +01:00
Sam	e8f76c335a	Merge branch 'master' into vdom	2016-02-17 18:10:12 +11:00
Régis Hanol	63b9d1c645	FIX: sends an email notifcation when a user's post is linked	2016-02-16 18:29:23 +01:00
Sam	1dc168a7e6	Merge branch 'master' into vdom	2016-02-15 19:29:59 +11:00
Jeff Atwood	2c0b36cb72	omit needless words	2016-02-13 15:58:52 -08:00
Robin Ward	d1e85bdd8b	FEATURE: Use virtual dom framework for faster post rendering	2016-02-11 11:00:40 -05:00
Régis Hanol	cad7fc1062	FIX: don't allow blocked user to send emails in	2016-02-11 10:39:57 +01:00
Régis Hanol	91bb38626c	FEATURE: new incoming email details modal	2016-02-10 22:00:27 +01:00
Régis Hanol	8944d62aa6	add validator for the 'reply_by_email_enabled' site setting	2016-02-09 23:35:40 +01:00
Arpit Jalan	82a75c00c0	UX: change 'Visit Topic' to 'Visit Message' for message notification email	2016-02-09 13:39:10 +05:30
Jeff Atwood	1a1dcb59f9	this period bothered me and it had to go	2016-02-08 15:37:49 -08:00
Régis Hanol	460665895c	properly name purge emails/email logs site settings	2016-02-08 22:18:52 +01:00
Régis Hanol	ac863bab91	FEATURE: new 'suppress_email_logs_after_days' site setting	2016-02-08 18:47:35 +01:00
Régis Hanol	2d170712d7	new 'private_email_time_window_seconds' site setting	2016-02-04 17:22:16 +01:00
Régis Hanol	49d1f88f6e	FIX: support incoming emails with no subject	2016-02-01 12:16:15 +01:00
Jeff Atwood	9cf57e3ca4	more email rejection copy edits	2016-01-28 15:42:05 -08:00
Jeff Atwood	223e324eb9	some copyedits on mail rejection text	2016-01-28 12:20:59 -08:00
Gerhard Schlager	f4f87921c2	Replace uncategorized_description setting with translation	2016-01-28 00:26:25 +01:00
David García-Navas López de Cuéllar	954e3be7cf	little typo	2016-01-21 15:05:03 +01:00
Arpit Jalan	1cee914565	FEATURE: make top criteria formula multipliers controlled by site ... setting	2016-01-21 10:30:06 +05:30
Régis Hanol	c2c01cdb5d	FIX: username suggester to account for the more relaxed username rules (closes #3907)	2016-01-20 15:37:34 +01:00
James Kiesel	c7283751a3	Unsubscribe via email	2016-01-20 22:25:25 +13:00
Régis Hanol	29fbc2d7bc	FIX: add missing 'user_replied_pm' translation	2016-01-19 15:47:38 +01:00
Régis Hanol	3083657358	FEATURE: better email in support ... FEATURE: new incoming_email model FEATURE: infinite scrolling in emails admin FEATURE: new 'emails:import' rake task	2016-01-19 00:57:55 +01:00
Jeff Atwood	28cbeaf6be	add reply formatting info to new user tips	2016-01-18 14:10:14 -08:00
Jeff Atwood	ffb24bf82d	omit needless words	2016-01-14 00:31:57 -08:00
Arpit Jalan	e676974f16	Merge pull request #3953 from techAPJ/wiki ... FEATURE: allow users to wikify their own posts based on trust level	2016-01-13 09:53:33 +05:30
Arpit Jalan	06bac23e5f	FEATURE: allow users to wikify their own posts based on trust level	2016-01-12 08:44:25 +05:30
Jeff Atwood	14c1100209	make "Visit the Topic" first text / buttonon email line	2016-01-11 16:49:28 -08:00
Arpit Jalan	51ced7aeae	make site setting for read time word count per minute	2015-12-30 12:15:30 +05:30
Neil Lalonde	cee4da82d8	FIX: remove max value of tl3 requires days visited site setting because tl3 time period is configurable now. Setting tl3 requires days visited higher than tl3 time period will disable tl3 promotions.	2015-12-29 12:59:59 -05:00
Arpit Jalan	6ef1537ee0	FEATURE: better unfurling of Discourse topics on Slack	2015-12-28 19:10:19 +05:30
Arpit Jalan	f40249faad	FEATURE: make trust level 3 time period admin setting	2015-12-22 23:26:19 +05:30
Jeff Atwood	e83f050454	shorter email footer copy	2015-12-20 23:38:08 -08:00
Neil Lalonde	05b12d108f	FIX: broken links to user profile on subfolder install	2015-12-15 14:26:23 -05:00
Jeff Wong	bffdc5907a	username as from in emails ... Add a site setting to display name in from header for emails	2015-12-15 00:34:04 -08:00
Arpit Jalan	e65a7370ef	FIX: disable avatar education message when 'allow_uploaded_avatars' is ... disabled FEATURE: setting to disable avatar education message	2015-12-14 22:47:35 +05:30
Régis Hanol	978a1539fa	new pop3_polling_enabled setting validator to ensure credentials are working before enabling it	2015-12-10 22:23:54 +01:00
Régis Hanol	1d70434de5	use light email template for staged users	2015-12-09 19:45:46 +01:00
Régis Hanol	c447900e3b	fix build	2015-12-09 12:33:09 +01:00
Jeff Atwood	ccd8865bf3	make email unsubscribe footer a single line	2015-12-09 00:55:54 -08:00
Robin Ward	b781b6aea3	Add header_instructions overridable translation for email headers.	2015-12-07 16:52:33 -05:00
Régis Hanol	578f606a1a	add 'incoming_email' to groups	2015-12-07 12:39:28 +01:00
Sam	8d49091572	PERF: stop running VACUUM FULL only run VACUUM	2015-12-07 20:14:26 +11:00
Jeff Atwood	18c9d966a1	reverse order of unsubscribe link options ... should be in order that we want the user to do it	2015-12-03 16:14:43 -08:00
Jeff Atwood	89d7c56fb2	email footer copy improvements	2015-12-03 16:00:24 -08:00
Jeff Atwood	daada2b0d1	minor copyedits on flagging	2015-12-03 15:13:29 -08:00
Arpit Jalan	19f1314a3a	remove unused locale strings	2015-12-02 13:07:58 +05:30
Sam	ad3dd161e7	FEATURE: first class group mentions built in ... If you allow a group to be mentioned it can be mentioned with the @ symbol. Keep in mind as a safety mechanism max_users_notified_per_group_mention is set to 100	2015-11-30 17:08:43 +11:00
Arpit Jalan	5a7831265a	add search example for category name with space	2015-11-29 02:07:24 +05:30
Robin Ward	5e93140f85	FEATURE: Can override any translation via an admin interface	2015-11-27 11:35:19 -05:00
Arpit Jalan	6354324f2f	FIX: validate automatic membership email domains	2015-11-27 12:35:33 +05:30
Sam	f74a6457ee	FEATURE: allow CJK to be tokenized in non CJK sites. ... Meaning a mixed English/Chinese site can still have a functioning search.	2015-11-27 16:35:27 +11:00
Robin Ward	d65ec1af2e	Rename ninja_edit_window to editing_grace_period :'(	2015-11-24 14:28:42 -05:00
Arpit Jalan	db2799507b	FIX: admin trust level user list URL should be consistent with new naming	2015-11-23 14:28:56 +05:30
Neil Lalonde	523138f1fd	FEATURE: add setting pending_users_reminder_delay to configure when to send reminders to moderators about user approvals based on how long new users have been waiting	2015-11-20 16:06:07 -05:00
Arpit Jalan	bb1d0dea8a	UX: better flagging options	2015-11-20 22:23:29 +05:30
Jeff Wong	cf86f27415	FEATURE: New setting to allow all caps posts ... Adds a setting to ignore text_sentinel's check on all caps content.	2015-11-18 09:50:50 -08:00
Robin Ward	bb76c389fd	Merge pull request #3817 from gschlager/locale-pluralization ... FIX: Pluralizations in English locale files	2015-11-17 12:35:24 -05:00
Régis Hanol	92ba6125c4	FEATURE: new 'automatically_unpin_topics' user preference	2015-11-17 18:21:40 +01:00
Jeff Atwood	c3724bd2cb	add note about UTC time to backup time of day	2015-11-13 16:38:59 -08:00
Gerhard Schlager	6e33a21a7a	FIX: Replace invalid pluralizations in locale files	2015-11-13 21:25:15 +01:00
Régis Hanol	de95573d23	FEATURE: new 'backup_with_uploads' site setting	2015-11-12 16:23:59 +01:00
Régis Hanol	72a7bd38e1	FEATURE: new 'backup_time_of_day' site setting	2015-11-12 16:14:49 +01:00
Robin Ward	8ba7c06b7d	Merge pull request #3735 from riking/patch-4 ... FIX: Discourse.BaseUri should not default to /	2015-11-06 14:52:19 -05:00
Régis Hanol	6b197179c9	FEATURE: new 'automatically_unpin_topics' site setting	2015-11-06 17:12:12 +01:00
Robin Ward	d00762dcd5	Merge pull request #3787 from gschlager/locale-keys ... FIX: Some strings in locale files were not translatable	2015-11-02 13:40:22 -05:00
Régis Hanol	bb79e6aff7	FEATURE: new hide_user_profiles_from_public site setting	2015-10-28 19:56:08 +01:00
Jeff Atwood	9e01a7d834	copyedits on category description topic text	2015-10-16 13:12:34 -07:00
Régis Hanol	37c5909a31	FIX: use the first image in the first post in the topic as opengraph image ... FEATURE: new 'default_opengraph_image_url' setting	2015-10-15 11:00:47 +02:00
Robin Ward	7802757306	FIX: Username for topic creation is required	2015-10-13 16:33:26 -04:00
Sam	e29fe77b45	FEATURE: make trust level for message sending configurable ... - add min_trust_to_send_messages site setting (default 1) to allow admins to configure when messages can be sent between members	2015-10-12 11:15:48 +11:00
cpradio	8cabc14099	FEATURE: Allow default period to be set for Top Page	2015-10-06 12:04:31 -04:00
Dan Dascalescu	cce830e42c	Fix run-on sentence re. entering HTML tables	2015-10-03 20:54:10 -07:00
Jeff Atwood	083bdcc8aa	mild copyedits on rate limiting messages	2015-09-29 02:44:03 -07:00
Sam	2f3bc60e59	FIX: whispers should not be revealed in reply to, or reply expansion ... FEATURE: mark whisper as experimental FIX: badges should never apply to whispers	2015-09-25 12:47:38 -04:00
Sam	b2e3703ae7	Revert "UX: always show logout link in user menu, use CSS to hide" ... oops was on wrong branch This reverts commit 2cbb49baec.	2015-09-25 12:16:17 +10:00
Sam	7ca75a88ce	UX: always show logout link in user menu, use CSS to hide ... .menu-panel .logout-link {display: none}	2015-09-25 12:15:34 +10:00
Sam	2cbb49baec	UX: always show logout link in user menu, use CSS to hide ... .menu-panel .logout-link {display: none}	2015-09-25 12:14:20 +10:00
Sam	2422289c8b	FIX: whispers should not be revealed in reply to, or reply expansion ... FEATURE: mark whisper as experimental FIX: badges should never apply to whispers	2015-09-25 10:16:19 +10:00
Robin Ward	0b4cb5cf0d	Add better error messages for rate limits.	2015-09-24 13:52:46 -04:00
Neil Lalonde	5ca26a7707	FEATURE: add site setting use_admin_ip_whitelist to enable/disable the whitelisting of admins by IP address	2015-09-23 12:15:08 -04:00
Régis Hanol	36309e50cc	Merge pull request #3767 from tgxworld/track_user_profile_views ... Track user profile views	2015-09-23 11:38:18 +02:00
Neil Lalonde	65e159b073	Merge master	2015-09-22 15:00:32 -04:00
Gerhard Schlager	ade31c4468	FIX: Remove duplicate keys from locale files	2015-09-19 00:14:26 +02:00
Jeff Atwood	f37f6f7673	minor embed style tweak	2015-09-18 02:44:13 -07:00
Régis Hanol	07e7b07b63	FIX: refreshing gravatar wasn't working	2015-09-17 19:42:44 +02:00
Kane York	390af7118a	Merge branch 'master' into signup-cta ... Conflicts: app/assets/javascripts/discourse/templates/topic.hbs	2015-09-16 10:06:47 -07:00
Régis Hanol	5277ec1ac0	FIX: ensure we have a bucket before enabling backups to S3	2015-09-16 15:55:26 +02:00
Guo Xiang Tan	21725cc907	FEATURE: Admin dashboard data for user profile views.	2015-09-16 14:48:31 +08:00
Guo Xiang Tan	7acc93b2a0	FEATURE: Track user profile views.	2015-09-16 14:48:31 +08:00
Sam	b2ef9a02bf	Less words, correct copy	2015-09-16 11:37:56 +10:00
Sam	75e8fa3ee0	document new search predicates	2015-09-16 08:51:28 +10:00
Jeff Atwood	a60a251c93	we actually support inline replies, mostly	2015-09-15 15:04:28 -07:00
Kane York	2e2fa693f5	You need to translate the site settings, dummy	2015-09-15 12:42:14 -07:00
Guo Xiang Tan	d49f382dcc	[CI SKIP] Typo.	2015-09-15 15:55:23 +08:00
David García-Navas López de Cuéllar	6891c7f8aa	little typo?	2015-09-13 22:45:26 +02:00
Robin Ward	5af0f5f80e	FEATURE: Whisper posts	2015-09-11 14:05:21 -04:00
Sam	6437cd0341	FEATURE: add support for generic external avatar services ... This changes it so we only ship an avatar template down to the client it has no magic, all it knows is how to plug in size	2015-09-11 15:10:56 +02:00
ismail-arilik	8ca2ab1b3b	Update some strings to meet referred options lists ... The options which changed strings are referred, were changed to lists so these strings were supposed to be generalized.	2015-09-11 15:02:12 +03:00
Arpit Jalan	d73d4d4769	FIX: UserNameSuggester should not suggest usernames with a sequence of 2 or more special chars	2015-09-11 16:53:26 +05:30
Kane York	aca70805f1	FIX: Discourse.BaseUri should not default to /	2015-09-10 17:34:08 -07:00
Régis Hanol	2742602254	FEATURE: support for external letter avatars service	2015-09-11 02:12:40 +02:00
Régis Hanol	e43034f08f	Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)" ... This reverts commit cd77465788.	2015-09-11 00:23:52 +02:00
Régis Hanol	cd77465788	FEATURE: SVG letter avatars (based on @eviltrout's spike)	2015-09-11 00:11:48 +02:00
Régis Hanol	9a999bfe84	FIX: ensure we never have a string when an enum is Fixnum	2015-09-09 12:59:49 +02:00
Régis Hanol	76fac18085	FIX: link to COPPA in Privacy Policy	2015-09-04 17:14:42 +02:00
Tobias Eigen	85154422f1	Fix typo about table settings in server.en.yml ... Intrepid n00b pull request at encouragement by @zogstrip. Fixing a small typo, as discussed on meta: https://meta.discourse.org/t/typo-in-description-of-allow-html-tables-admin-setting/32835?u=tobiaseigen	2015-09-02 12:46:47 -07:00
Sam	262f561a87	FEATURE: relax username rules to allow - and . and leading _ ... This relaxes our very strict username rules to allow for some long asked for requests - leading _ is now allowed - . is allowed except for trailing char and confusing extensions like .gif .json - dash (-) is now permitted	2015-09-02 12:13:44 +10:00
Jeff Atwood	5925155394	make Activate your Account more CLICK HERE-y	2015-09-01 00:11:23 -07:00
Sam	a13e7d10cf	FEATURE: site setting for show log out in header	2015-09-01 07:44:21 +10:00
Sam	b736b56e97	hide site setting that was causing confusion	2015-08-26 11:02:21 +10:00
Sam	00e59bdc62	FIX: display warning when user is tracking too many topics ... FEATURE: allow admins to bump up number of tracked topics if needed using max_tracked_new_unread	2015-08-25 15:40:50 +10:00
Sam	2c59ad3dd3	FIX: favicon update broken when favicon lived on a CDN	2015-08-25 11:54:23 +10:00
Régis Hanol	bef80633b1	FEATURE: global admin override of most of the user preferences	2015-08-21 20:39:21 +02:00
Kane York	2363897a25	FEATURE: Arbitrary validations for site settings	2015-08-20 18:27:19 -07:00
Robin Ward	d1c69189f3	FEATURE: Can edit category/host relationships for embedding	2015-08-20 15:56:04 -04:00
Régis Hanol	4c2df814de	FIX: ensure a file is present when creating an upload	2015-08-18 11:39:51 +02:00
Jeff Atwood	ddd3a8d340	change search help word to "options"	2015-08-17 03:28:40 -07:00
Jeff Atwood	5b9a01e3b6	switch to <h3> for search help headings	2015-08-17 03:23:38 -07:00
Sam	e670ebb433	FEATURE: allow backup settings to be overriden by globals ... FEATURE: allow backup interval of up to 30 days FIX: if a custom file exists in backup directory look at its date FEATURE: site setting automatic_backups_enabled default true	2015-08-14 16:28:29 +10:00
Régis Hanol	6669a2d94d	FEATURE: per-topic unsubscribe option in emails	2015-08-12 23:00:16 +02:00
Régis Hanol	15418f3d44	FEATURE: new 'backup_frequency' site setting	2015-08-07 17:34:58 +02:00
Neil Lalonde	a4a14e6d5a	add back the warning based on Sidekiq queue size, but only when the queue size is 100k or more	2015-08-06 16:46:49 -04:00
Sam	ca393bcc53	FEATURE: optional regex to be applied against first posts ... for spam prevention you can add a regex to auto_block_first_post_regex this will be applied against all first posts, if it matches post will go into the approval queue and user will be blocked	2015-08-05 13:08:21 +10:00
Sam	6fdd53e3d6	FEATURE: auto block fast typers ... if tl0 enter text too fast they get automatically blocked, configurable	2015-08-04 12:56:37 +10:00
Sam	01ad88f1ed	FEATURE: min_first_post_typing_time ... If a user spends less than 3 seconds typing first post they will automatically enter the approval queue	2015-08-04 10:57:34 +10:00
Jeff Atwood	5d40695908	improved copy for logo help ... and put it in the correct translation this time...	2015-08-02 15:42:25 -07:00
Jeff Atwood	4f60344a9f	copyedit on avatar reminder	2015-07-31 14:46:23 -07:00
Robin Ward	76aa0795b3	Use small actions for moving posts	2015-07-31 16:30:18 -04:00
Jeff Atwood	3a6bb64d97	copyedit on password link expired	2015-07-31 02:00:36 -07:00
Jeff Atwood	89d6d91c73	better copy for set password emails	2015-07-31 01:55:52 -07:00
Sam	6f9dc135ba	FEATURE: allow logging of raw body of all unprocessable email ... set log_mail_processing_failures to true to enable	2015-07-31 15:10:35 +10:00
Jeff Atwood	888d0a3bbf	fix minor copy typos	2015-07-21 13:53:21 -07:00
Sam	e93665b9f7	FEATURE: site setting to allow html tables (which may come from imports) ... (allow_html_tables , disabled by default)	2015-07-20 16:56:46 +10:00
Jeff Atwood	1727f77c0b	this was matching TVD_PH_SUBJ_ACCOUNTS_POST bad!	2015-07-17 02:41:04 -07:00
Kane York	61ea8c6f72	FIX: Allow to change ownership on deleted users' posts	2015-07-15 15:29:35 -07:00
Régis Hanol	b0802abae2	FIX: crop & optimize user background profile/card images	2015-07-15 17:15:43 +02:00
Sam	b772d96f7a	FEATURE: permalink normalization ... Optionally allow admins to apply regex based normalization to permalinks prior to matching. This allows us to drop query string, or cleanly ignore slugs, etc.	2015-07-15 15:34:25 +10:00
Sam	f8ba5346c4	SECURITY: Remove email validation check bypass ... - Increase size of email column to varchar(513) - Give error message on signup when email is too large Overall impact: Low, allows signups from blocked domains. Main risk is increased spam.	2015-07-14 09:46:00 +10:00
Kane York	2a897a8a6b	SECURITY: Remove email validation check bypass ... - Increase size of email column to varchar(513) - Give error message on signup when email is too large Overall impact: Low, allows signups from blocked domains. Main risk is increased spam.	2015-07-13 15:36:17 -07:00
Jeff Atwood	0f9d2d2d96	first pass on longer badge descriptions	2015-07-11 14:07:51 -07:00
Neil Lalonde	782dd13e78	FEATURE: track user visits on mobile and display on admin dashboard in a new Mobile section	2015-07-07 14:06:42 -04:00
Jeff Atwood	df55596907	add link oneboxing animation to new user tips	2015-07-04 16:38:44 -07:00
Neil Lalonde	86cd1a19cc	FEATURE: page view stats for mobile view	2015-07-03 17:19:33 -04:00
Robin Ward	be664857be	Merge pull request #3585 from riking/patch-3 ... FEATURE: Reserved usernames	2015-07-03 10:02:24 -04:00
Arpit Jalan	0e74c46d74	FIX: add missing translaton key	2015-07-02 18:42:45 +05:30
Kane York	df988a20eb	FEATURE: Reserved usernames ... A list of usernames that will be blocked from being used to sign up.	2015-07-01 13:50:55 -07:00
Kane York	418718c416	Copy changes for "sso overrides" settings	2015-06-29 22:22:05 -07:00
Jeff Atwood	92b2bf425d	change Meta default name to "Site Feedback"	2015-06-29 00:33:53 -07:00
Jeff Atwood	db066b5d3f	off/on	2015-06-26 14:51:42 -07:00
Jeff Atwood	f841523bc2	add warning to "allow uncategorized"	2015-06-26 14:51:09 -07:00
Sam	542e796fb0	FEATURE: daily performance reports	2015-06-26 13:37:05 +10:00
Sam	28a8b886c0	typo in help	2015-06-25 09:49:16 +10:00
Neil Lalonde	7d8fcc0969	FIX: subfolder support: welcome messages and emails have broken images	2015-06-23 14:41:49 -04:00
Sam	63351d5629	FEATURE: in:first for searching first post	2015-06-23 13:39:40 +10:00
Sam	e85df6b876	FEATURE: min_age and max_age search operators	2015-06-23 13:21:50 +10:00
Régis Hanol	b25a16ee3e	FEATURE: 2 new reports: time to first response, topics with no response ... FIX: relativeAgeMediumSpan was off by 1 REFACTOR: extracted decimalAdjust & round functions from the poll plugin	2015-06-22 19:46:51 +02:00
Kane York	72db917169	Fix copy error in temporarily_closed_due_to_flags	2015-06-19 11:30:46 -07:00
Jeff Atwood	e7c8f5bb2b	minor copyedit	2015-06-18 15:31:35 -07:00
Robin Ward	42bd9b6199	FEATURE: Show time gap between posts if more than a few days	2015-06-18 17:06:25 -04:00
Neil Lalonde	77595bcaa9	FEATURE: notify by email when there are posts from new users waiting to be reviewed	2015-06-18 15:47:35 -04:00
Sam	7b8786e14f	FIX: maintain category ordering when position is fixed for browsing ... FEATURE: allow mods to set category ordering for topic creation dialog using fixed_category_positions_on_create	2015-06-16 09:31:41 +10:00
Jeff Atwood	73d9ab1685	minor copyedits on welcome pm	2015-06-12 13:01:04 -07:00
Jeff Atwood	c67a3b23cd	minor copyedit	2015-06-12 12:50:03 -07:00
Jeff Atwood	9028c1d908	more copyedits on welcome PM	2015-06-11 01:07:03 -07:00
Jeff Atwood	54df781f28	more improvements to new user welcome PM	2015-06-10 23:19:38 -07:00
Jeff Atwood	a14ea757a1	improvements to new user welcome copy	2015-06-10 17:07:29 -07:00
Jeff Atwood	677cdbbda0	updated welcome usage tips and images	2015-06-10 02:26:31 -07:00
Robin Ward	7b6d6b76eb	FEATURE: Multiple embeddable hosts ... - Also refactors two site settings components into one, with tests	2015-06-09 13:25:43 -04:00
Arpit Jalan	71ee84f848	FEATURE: latest posts RSS feed	2015-06-09 21:45:06 +05:30
Neil Lalonde	8fec29ab32	Merge master	2015-06-03 16:51:28 -04:00
Jeff Atwood	fa963e8f38	Revert "Revert "FIX: new task to delete old drafts weekly"" ... This reverts commit c987a1d571.	2015-06-02 04:26:01 -07:00
Sam Saffron	c987a1d571	Revert "FIX: new task to delete old drafts weekly" ... This reverts commit fcaed7a00d.	2015-06-02 20:30:06 +10:00
Jeff Atwood	afafa30989	Merge pull request #3514 from techAPJ/patch-1 ... FIX: new task to delete old drafts weekly	2015-06-01 20:21:05 -07:00
Arpit Jalan	fcaed7a00d	FIX: new task to delete old drafts weekly	2015-06-02 08:39:27 +05:30
Arpit Jalan	b7ac8448c6	Improve IP blocking error message	2015-06-02 07:48:26 +05:30
Jeff Atwood	e89541862e	minor copy improvements in email reply errors	2015-06-01 16:37:04 -07:00
Neil Lalonde	3e317b40da	Merge master	2015-06-01 15:27:35 -04:00
Régis Hanol	296b8b1a35	Merge pull request #3508 from techAPJ/patch-2 ... Better error message when new registration limit from an IP address is reached	2015-06-01 09:57:24 +02:00
Jeff Atwood	728a530d2d	remove extra "posts" text from digest	2015-05-31 23:13:00 -07:00
Jeff Atwood	644c9b437c	avoid html tags in setting descriptions	2015-05-31 23:08:18 -07:00
Jeff Atwood	c853342aeb	stronger warning in SSO around validated emails	2015-05-31 23:05:49 -07:00
Arpit Jalan	6bf680882c	Better error message when new registration limit from an IP address is reached	2015-06-01 10:16:25 +05:30
Arpit Jalan	e1ae436711	FIX: month was not showing in user suspended error message	2015-05-29 13:10:39 +05:30
Jeff Atwood	e475f8631a	Revert "shorter suspension copy for 1-line fit"	2015-05-28 16:05:31 -07:00
Neil Lalonde	1b96a3acc1	Move exclude_rel_nofollow_domains setting to the Required setting and improve copy.	2015-05-27 18:37:41 -04:00
Jeff Atwood	47360eddf4	fix copy around coldmapping, increase defaults	2015-05-27 01:04:50 -07:00
Sam	02fa7448ca	FEATURE: custom url to redirect to on account pending approval for sso	2015-05-27 14:06:45 +10:00
Arpit Jalan	d21944a0b6	FIX: add missing translation keys	2015-05-26 19:11:37 +05:30
Sam	90eaad336d	FEATURE: allow users to pick a CDN for s3 assets	2015-05-26 11:13:12 +10:00
Neil Lalonde	eaa1afeaf5	remove Google OpenID auth, since Google doesn't support it anymore	2015-05-25 15:13:44 -04:00
Régis Hanol	bb0c2813ac	FEATURE: generate (avatar) thumbnails in a background task ... FIX: keep the "uploading..." indicator until the server replies via the MessageBus FIX: text was disapearing when uploading an avatar PERF: always use a region for S3 (defaults to 'us-east-1') FEATURE: ApplyCDN middleware when using S3 FIX: use the same pattern to store files on S3 and locally PERF: keep a local cache of uploads when generating thumbnails FEATURE: migrate_to_s3 rake task	2015-05-25 17:59:00 +02:00
Régis Hanol	d40d308e45	Merge pull request #3445 from lukegb/bug/anonymous-emails ... Don't send emails to anonymous users	2015-05-15 14:28:37 +02:00
Arpit Jalan	4324a157e0	FIX: rate limit topic invitations	2015-05-13 14:44:37 +05:30
Sam	27b1e173fd	Revert "S3 deprecation warning" ... This reverts commit 1095e165d5.	2015-05-12 08:34:17 +10:00
Sam	5ef641126f	remove s3 deprecation warning, we will continue to support it	2015-05-12 08:27:25 +10:00
Luke Granger-Brown	9f9825bb6b	FIX: don't send emails to anonymous users ... Also changes behaviour of real to not return anonymous users. This means user counts will no longer include them, and the mailing list system will ignore them even if they somehow end up with the feature turned on.	2015-05-11 00:56:34 +01:00
Sam	77cc087b13	FIX: proper error message when account created is hit with no session	2015-05-07 11:00:22 +10:00
Erick Guan	b772ff6e13	FEATURE: add slug geneartion options	2015-05-05 18:08:30 +08:00
Jeff Atwood	b84c4ef0c6	add warning around must_approve_users	2015-05-04 11:33:03 -07:00
Jeff Atwood	8f706f11cb	remove trust level reference from flag unhide PM	2015-05-04 01:19:04 -07:00
Jeff Atwood	80003e0821	improve copy for password change token expired	2015-05-01 01:39:53 -07:00
Jeff Atwood	bafcfa5b6a	Improve password reset expired link copy	2015-05-01 01:30:13 -07:00
Jeff Atwood	7c42cb7c22	"reset password" doesn't exist, forgot does.	2015-05-01 00:52:50 -07:00
Jeff Atwood	6139090e9e	improvement to accept invite password instructions	2015-05-01 00:51:17 -07:00
Sam	729aaa826b	Merge pull request #3404 from techAPJ/patch-1 ... FEATURE: magic login route for admin when SSO is enabled	2015-04-28 07:47:50 +10:00
Robin Ward	ecafbb0a63	Can delete users via the moderation queue	2015-04-27 15:06:20 -04:00
Arpit Jalan	2932284293	FEATURE: magic login route for admin when SSO is enabled	2015-04-27 22:54:48 +05:30
Jeff Atwood	444fe5757d	improve new topic copy	2015-04-21 17:10:49 -07:00
Jeff Atwood	dac4c646d5	add warning on default trust level	2015-04-17 15:29:40 -07:00
Robin Ward	a61c202ac4	Rewrite /private-messages to /messages	2015-04-17 12:01:50 -04:00
Arpit Jalan	866d1cd8e3	FIX: handle error for duplicate email_in address	2015-04-16 16:23:22 +05:30
Sam	a5b25ad2af	FEATURE: scale up likes per day as users increase trust level ... tl2 = 1.5 times the likes tl3 = 2 times the likes tl4 = 3 times the likes configurable via tl[234]_additional_likes_per_day_multiplier site setting	2015-04-16 09:44:30 +10:00
Jeff Atwood	17696e8c6f	Merge pull request #3379 from betson/pipe-delimited-indicator ... indicate that lists can be pasted if pipe-delimited	2015-04-15 14:06:48 -07:00
Neil Lalonde	dcb9d6e16a	remove queue_size_check	2015-04-15 15:52:39 -04:00
Robin Ward	af1571a58f	Site Settings for post approval	2015-04-15 14:54:37 -04:00
betson	b28a004413	indicate that lists can be pasted if pipe-delimited ... In the configuration for a list-setting component, the Select2 component is initialized with a pipe ("|") as the separator. (app/assets/javascripts/admin/components/list-setting.js.es6) This should be communicated to the user in the event they want to paste a list of domains for the blacklist/whitelist.	2015-04-15 11:42:39 -04:00
Arpit Jalan	499bed69e2	FIX: show error message if user already exist in group	2015-04-15 14:15:58 +05:30
Arpit Jalan	e6df97f01d	FIX: add email reply error message for topic not getting created in restricted category	2015-04-10 17:11:52 +05:30
Sam	4bfca12b11	FEATURE: anonymous_account_duration_minutes , cycle anon accounts after N minutes from last post ... fixes it so anon users can not like stuff	2015-04-08 12:30:02 +10:00
Sam	f5d89169e2	FEATURE: initial implemenation of anonymous posting mode	2015-04-07 18:05:31 +10:00
Arpit Jalan	d5db44da87	FIX: include topic excerpt in topic/message invite mail for existing user	2015-04-07 12:02:04 +05:30
Régis Hanol	33879e1311	Merge pull request #3199 from fantasticfears/seo ... FEATURE: add microdata prop and more links for crawler	2015-04-06 11:18:34 +02:00
Régis Hanol	0e1c4a0a44	Merge pull request #3313 from techAPJ/patch-1 ... FEATURE: invite existing user to a topic	2015-04-03 11:41:10 +02:00
Arpit Jalan	8c2d7dcaac	FEATURE: invite existing user to a topic	2015-04-03 15:00:04 +05:30
Neil Lalonde	30b063c08b	FEATURE: make full names a required field of user profiles with the full_name_required setting	2015-04-02 17:08:04 -04:00
Régis Hanol	a799f6f8d9	Merge pull request #3321 from techAPJ/patch-2 ... FIX: include site name in email reply error subject	2015-04-02 13:55:49 +02:00
Arpit Jalan	a80c742855	FIX: include site name in email reply error subject	2015-04-02 15:46:22 +05:30
Jeff Atwood	a51cb6c8d5	add placeholders for all long badge descs	2015-04-02 02:24:36 -07:00
Sam	1f59375c82	rename max_word_length to title_max_word_length	2015-04-02 16:46:53 +11:00
Jeff Atwood	801d04997a	FIX: staff message color was wrong on mobile	2015-04-01 01:07:22 -07:00
Jeff Atwood	39f284ac26	remove date from digest email subject field	2015-04-01 00:29:26 -07:00
Jeff Atwood	d5eed540ea	fix minor site setting copy mistake	2015-03-26 16:58:37 -07:00
Jeff Atwood	6875a09f79	Change "Private Message" to "Message" (server side)	2015-03-26 16:56:08 -07:00
Jeff Atwood	adc9e68e66	remove SSO full name override warning not needed	2015-03-26 16:19:00 -07:00
Robin Ward	2cc5858163	Add site setting to disable User Directory, include restricted info	2015-03-26 11:26:19 -04:00
Régis Hanol	1095e165d5	S3 deprecation warning	2015-03-25 18:35:48 +01:00
Régis Hanol	90de61ee3d	S3 deprecation warning	2015-03-25 18:34:07 +01:00
Régis Hanol	5084e2bdf1	Merge pull request #3284 from techAPJ/patch-1 ... FEATURE: new site setting min_first_post_length	2015-03-19 19:55:27 +01:00
Arpit Jalan	b706307ac7	FEATURE: new site setting min_first_post_length	2015-03-20 00:20:38 +05:30
Jeff Atwood	b2845a3dec	make link to mailjet https	2015-03-18 15:05:21 -07:00
Jeff Atwood	4bc101d40c	increase urgency of Google warning	2015-03-18 10:11:30 -07:00
Erick Guan	c955907f60	FEATURE: add microdata prop and more links for crawler ... - add microdata based on schema.org - add breadcrumb on the top of topic - add navigations link on the bottom of every pages - add category description on the category list	2015-03-16 22:52:10 +08:00
Arpit Jalan	484ae8b6b7	FIX: return proper error message when replying to a closed or deleted topic	2015-03-16 16:43:22 +05:30
Sam	a82530012a	FEATURE: Allow selection of highlight js languages ... PERF: stop loading highlight js on load To get latest highlight js run bin/rake highlightjs:update	2015-03-13 16:18:59 +11:00
Jeff Atwood	f3b5a4c888	better validation / desc for embeddable_host	2015-03-11 15:31:27 -07:00
Régis Hanol	afd2417945	FEATURE: new 'auto_respond_to_flag_actions' site setting	2015-03-11 19:29:09 +01:00
Sam	09e470c98a	FEATURE: start counting repeat topic views (default is one per 8 hours) ... configurable with topic_view_duration_hours site setting	2015-03-05 15:25:05 +11:00
Dan Dascalescu	32d6080d15	Typo fix: publically -> publicly	2015-03-04 01:33:32 -08:00
Robin Ward	84b84a9d7c	Support for url_list site setting.	2015-03-03 16:19:29 -05:00
Sam	9698447e89	FEATURE: support staff only custom user fields	2015-03-03 17:51:01 +11:00
Neil Lalonde	7c14db44cc	UX: improve message when admin login is blocked because of admin ip address whitelisting	2015-03-02 12:13:22 -05:00
Sam	79249a8d5f	Merge pull request #3244 from gschlager/german_umlauts ... FEATURE: Adds transliteration of German umlauts in slugs	2015-03-02 10:19:30 +11:00
Gerhard Schlager	8a236c06e2	FEATURE: Adds transliteration of German umlauts in slugs ... - Moves the already existing transliteration rules into `transliterations.en.yml` (there's no need to translate this for every language). The same goes for the stringex configuration. - Doesn't calculate the default slug for *zh_CN* and *ja* anymore. It hasn't been used anyway since stringex is used instead. - Removes a wrong comment from the Russion transliteration file (I hate wrong comments)	2015-02-27 23:53:58 +01:00
Neil Lalonde	c04b214910	FEATURE: don't allow username and email to be the same	2015-02-27 13:47:43 -05:00
Sam	f555bbb416	FEATURE: long descriptions for badges to help teach people	2015-02-27 17:19:18 +11:00
Sam	0742f340f9	FEATURE: allow for a localized error when a regex fails in site settings ... FEATURE: apply string validation to list site settings (so we get regex)	2015-02-27 11:45:56 +11:00
Neil Lalonde	cf81b3f86d	FEATURE: don't allow username and password to be the same	2015-02-25 12:00:13 -05:00
Arpit Jalan	a25e3cca8e	FEATURE: new site setting contact_url	2015-02-23 23:09:13 +05:30
Robin Ward	0f4693b7eb	Merge pull request #3225 from techAPJ/patch-3 ... UX: unified About / Privacy / ToS / FAQ topnav	2015-02-23 11:51:55 -05:00
Arpit Jalan	ddb8378ab0	UX: unified About / Privacy / ToS / FAQ topnav	2015-02-23 18:26:19 +05:30
Jeff Atwood	7bb80928ac	minor copy tweak	2015-02-23 02:09:48 -08:00
Sam	5266ad4539	Merge pull request #3183 from riking/json-errors-2 ... Consolidate custom exception handling	2015-02-23 16:58:05 +11:00
Régis Hanol	92e6446f0f	FEATURE: new site setting	2015-02-21 18:37:37 +01:00
Neil Lalonde	16bea87fd3	Merge master	2015-02-19 16:17:51 -05:00
Arpit Jalan	c2ce45668c	UX: change user visits stat position	2015-02-19 01:11:09 +05:30
Arpit Jalan	f3daae6dec	Improve auto generated email reply error message	2015-02-18 18:58:51 +05:30
Jeff Atwood	fe31d45131	edited the wrong language file ... DOH	2015-02-17 15:22:56 -08:00
Jeff Atwood	73a59322d5	"Page Views" is confusing; say "API Requests"	2015-02-16 23:35:41 -08:00
Jeff Atwood	c1d93b2713	move private reply welcome notice to bottom	2015-02-09 17:26:58 -08:00
Jeff Atwood	e14f38f19e	make relative links absolute in welcome PM/email	2015-02-09 16:42:05 -08:00
Arpit Jalan	cf1815ca40	Remove group names warning	2015-02-10 00:17:05 +05:30
riking	8cf21f2363	FEATURE: Refactor error returns in application_controller	2015-02-08 13:40:38 -08:00
Arpit Jalan	8bbd36f40e	Add rails error translation strings	2015-02-06 20:30:00 +05:30
Régis Hanol	f7d2fc0524	FEATURE: 'reply by email address' validator ... Prevent infinite email loophole when the 'reply_by_email_address' site setting is the same as the 'notification_email'.	2015-02-06 12:08:37 +01:00
Sam	820ce8765e	refactor traffic report ... split traffic report in 2, page view vs raw traffic hide raw traffic report by default improve flushing logic for application reqs	2015-02-06 14:39:16 +11:00
Régis Hanol	2fcd199f48	FIX: send a PM to moderators when a post has been flagged as sockpuppet	2015-02-05 19:58:49 +01:00
Sam	970b160eef	typo	2015-02-05 16:39:56 +11:00
Sam	08b790b3c2	improve metrics gathered using in our traffic section ... this also pulls out the middleware into its own home and inserts in front	2015-02-05 16:08:52 +11:00
Sam	16465edd88	FEATURE: search your bookmarks using in:bookmarks	2015-02-05 11:50:20 +11:00
Sam	c9adfa65a0	FEATURE: dashboard stats for application traffic	2015-02-05 11:18:21 +11:00
Jeff Atwood	4a2786dbf2	better copy on enable names setting	2015-01-29 13:42:15 -08:00
Sam	844467015d	FEATURE: allow simple selection for category badge styles ... clean up category badge styling	2015-01-29 17:49:14 +11:00
Régis Hanol	cd2c9edb46	FIX: 🐛 upload on IE9 wasn't working :'( ... - FIX: make sure we set a default name to a pasted image only on Chrome (the only browser that supports it) - FIX: use ".json" extension to uploads endpoints since IE9 doesn't pass the correct header - FIX: pass the CSRF token in a query parameter since IE9 doesn't pass it in the headers - FIX: display error messages comming from the server when there is one over the default error message - FIX: HACK around IE9 security issue when clicking a file input via JavaScript (use a label and set `visibility:hidden` on the input) - FIX: hide the "cancel" upload on IE9 since it's not supported - FIX: return "text/plain" content-type when uploading a file for IE9 in order to prevent it from displaying the save dialog - FIX: check the maximum file size on the server 💥 - update jQuery File Upload Plugin to v. 5.42.2 - update JQuery IFram Transport Plugin to v. 1.8.5 - update jQuery UI Widget to v. 1.11.1	2015-01-28 19:43:20 +01:00
Sam	3483c8318f	FEATURE: logging out logs you out everywhere ... can be disabled by changing the setting "log_out_strict" to false	2015-01-28 12:56:41 +11:00
Arpit Jalan	12c82bed59	Disable digest emails site setting	2015-01-27 22:41:36 +05:30
Jeff Atwood	20411649e1	remove needless email test footer	2015-01-26 17:24:43 -08:00
Jeff Atwood	246c376f48	Merge pull request #3131 from pda/hmac-not-encryption ... sso_secret: cryptographically authenticate, not encrypt.	2015-01-26 14:28:55 -08:00
Paul Annesley	bf2bbfb06e	sso_secret: cryptographically authenticate, not encrypt. ... The sso_secret is an input to HMAC, which is a hash-based message authentication code, not encryption.	2015-01-26 13:52:02 -08:00
Arpit Jalan	5c2ee8ec2a	FEATURE: suppress digest emails for users not seen on the site for more than (n) days.	2015-01-26 22:04:02 +05:30
Sam	ba186b25a7	FEATURE: optional top level bookmarks tab	2015-01-25 15:53:11 +11:00
Robin Ward	f3c9310e12	Merge pull request #3117 from techAPJ/patch-1 ... FEATURE: rate limit invites for non-staff users	2015-01-20 10:45:00 -05:00
Arpit Jalan	5e751ce90a	FEATURE: 🎁 rate limit invites for non-staff users	2015-01-20 01:12:24 +05:30
Alex Williams	23fe0cfb4e	Fix spelling in contact_email_missing message.	2015-01-19 10:52:02 -05:00
Arpit Jalan	7687c95e7b	UX: add file size in CSV export notification	2015-01-19 19:21:53 +05:30
Jeff Atwood	d0a32b28b9	remove max_stars_per_day site setting	2015-01-19 00:07:26 -08:00
Jeff Atwood	8fe2dd9186	copy improvement on invites	2015-01-19 00:03:22 -08:00
Erick Guan	eedb977c58	Fix guidelines_topic anchor point	2015-01-17 21:45:36 +08:00
Arpit Jalan	7771d2fb31	remove enable_email_names setting	2015-01-13 13:35:40 +05:30
Jeff Atwood	3cea85e09a	correct "is is" copy	2015-01-12 17:30:14 -08:00
Jeff Atwood	dc0ecc8f2c	add better enable_sso description	2015-01-12 00:54:24 -08:00
Erick Guan	22d580fe76	allow to translate image's exceprt	2015-01-23 17:58:14 +08:00
Jeff Atwood	e948dc88d1	Merge pull request #3120 from techAPJ/patch-3 ... FIX: months were not getting translated	2015-01-22 04:22:33 -08:00
Arpit Jalan	91d36b2532	FIX: months were not getting translated	2015-01-22 15:46:52 +05:30
Jeff Atwood	356ad4459b	add unhandled flags to the contact email help	2015-01-22 00:30:30 -08:00
Jeff Atwood	af2dde9996	clarify that image logos not *required*	2015-01-09 14:25:00 -08:00
Jeff Atwood	14daf622d0	tweaks to flagging explanation copy	2015-01-07 04:34:15 -08:00
Jeff Atwood	3a9199995a	simplify new site default warning copy a bit	2015-01-07 02:02:30 -08:00
Jeff Atwood	d1b0939e02	add contact info to /about	2015-01-05 22:42:13 -08:00
Sam	e6dba8adc2	SECURITY: don't echo the "strategy" param returned by auto provider	2015-01-06 16:28:45 +11:00
Jeff Atwood	e37f7d50ec	I like "powered" better than "operated"	2015-01-05 16:44:22 -08:00
Jeff Atwood	a3dab3a635	add deep link to /faq	2015-01-05 16:38:46 -08:00
Jeff Atwood	77f5c74ddd	FEATURE: add std /staff page link from /faq	2015-01-05 16:33:21 -08:00
Neil Lalonde	4975fc2890	Remove old access_password_removal cruft from 1.5 years ago	2015-01-05 12:04:27 -05:00
Neil Lalonde	024b88e9c2	FIX: dashboard should be warning about invalid notification_email site setting	2015-01-05 12:04:27 -05:00
Jeff Atwood	d2d8f13932	improve new site nag copy	2015-01-04 00:29:51 -08:00
Jeff Atwood	46dcc9f257	improve essential site settings descriptions	2015-01-04 00:28:25 -08:00
Jeff Atwood	1c709ea5a9	clarify site nag on contact email	2015-01-04 00:19:56 -08:00
Jeff Atwood	0affda4818	improve new site nag copy	2015-01-04 00:16:10 -08:00
Jeff Atwood	f2db1af0d3	add /about link to welcome PM reply note	2014-12-30 20:44:47 -08:00
Jeff Atwood	09ecd905e4	add reply note to welcome PM	2014-12-30 20:40:03 -08:00
Sam	d0fe1725c8	FIX: users should be allowed to add @ to the to field of a PM	2014-12-30 13:26:39 +11:00
Arpit Jalan	96608e0ef0	FEATURE: add more details in user posts archive	2014-12-30 00:00:26 +05:30
Jeff Atwood	3b945920d4	copy improvements on data export	2014-12-24 15:41:21 -08:00
Régis Hanol	45dbdb6896	FEATURE: custom emojis	2014-12-23 01:12:26 +01:00
Sam	4cd9243888	FEATURE: topics per page should not be configurable ... Can lead to severe performance issues	2014-12-15 11:24:16 +11:00
Sam	ae16186100	FEATURE: post chunk size should not be configurable ... If people need to configure post chunk size use a plugin Core only supports out of the box settings, if changed can lead to severe performance issues.	2014-12-15 10:57:34 +11:00
Robin Ward	768027f0e3	Merge pull request #3046 from gdpelican/feature/insensitive-group-names ... Remove group name validation case sensitivity	2014-12-17 10:52:45 -05:00
James Kiesel	84bed4f9ce	Remove group name validation case sensitivity	2014-12-17 18:44:30 +13:00
Robin Ward	b1bc4741b1	FEATURE: Load fewer topics in the topic list on slow platforms (Android)	2014-12-15 11:54:26 -05:00
Robin Ward	2d6b15a34d	Load fewer posts when the android platform is detected	2014-12-12 11:47:39 -05:00
Régis Hanol	cd170ca548	FEATURE: auto-close topics based on community flags	2014-12-05 19:37:43 +01:00
Jeff Atwood	3aaa7d5b03	update search help with in:private	2014-12-04 13:37:47 -08:00
Neil Lalonde	5f2c746853	remove unused site settings company_domain, company_full_name, company_name	2014-12-03 15:39:53 -05:00
Jeff Atwood	a05408ac9d	minor copyedit	2014-12-02 21:39:54 -08:00
Jeff Atwood	ea269ccfb2	rename purge_inactive to purge_unactivated	2014-12-02 21:36:25 -08:00
Sam	c10e3df012	FEATURE: implement SSO provider on Discourse so Auth can be farmed to it ... FEATURE: pass return_sso_url to SSO endpoints, for easier return	2014-11-26 17:26:27 +11:00
Régis Hanol	e23a25994d	FEATURE: clean up unmatched email/ip entries after a year	2014-11-25 17:12:49 +01:00
Régis Hanol	1023191315	FEATURE: roll up function for 123.456.789.* ranges	2014-11-24 17:25:48 +01:00
Sam	9e1e3df6c9	FEATURE: Localize SSO error messages	2014-11-24 12:16:23 +11:00
Régis Hanol	e0a4a7a9cd	FEATURE: don't limit registration from an IP address if a staff member has that IP address	2014-11-21 00:34:31 +01:00
Régis Hanol	ced35cb3bb	FEATURE: don't limit registration from an IP address if a staff member has that IP address	2014-11-21 00:25:44 +01:00
Jeff Atwood	27801287ac	add TL2 note to max new accounts per reg ip	2014-11-18 03:59:27 -08:00
David García-Navas López de Cuéllar	fd0ba997d0	little typo	2014-11-17 19:01:08 +01:00
Régis Hanol	7641d88224	FEATURE: new 'maximum new user accounts per registration IP' site setting	2014-11-17 12:04:29 +01:00
Jeff Atwood	11ae3caeff	I hated that period	2014-11-14 14:16:41 -08:00
Jeff Atwood	e56e35d7ab	minor digest copyedits	2014-11-14 00:54:11 -08:00
Jeff Atwood	2713cb61a1	flag copy tweak	2014-11-13 14:40:57 -08:00
Régis Hanol	bf666f8553	FEATURE: allow animated thumbnails	2014-11-13 23:30:34 +01:00
Jeff Atwood	be87ada474	Minor copy tweaks	2014-11-13 14:05:02 -08:00
Jeff Atwood	64140c5fe0	digest email style tweak	2014-11-13 13:44:53 -08:00
Jeff Atwood	8783ff11be	minor copyedit	2014-11-12 14:33:52 -08:00
Régis Hanol	7244266174	FIX: support for underscores in URLs (when using S3 storage)	2014-11-12 17:08:11 +01:00
Jeff Atwood	d1b2361b5e	minor copyedit on hidden posts	2014-11-12 02:18:00 -08:00
Jeff Atwood	71f571a593	I suck at quotes, apparently	2014-11-12 01:12:32 -08:00
Jeff Atwood	402ef9ae49	missed the "other" flag for topics	2014-11-12 01:10:39 -08:00
Jeff Atwood	4a1953ec48	minor flag dialog tweaks	2014-11-12 01:02:25 -08:00
Jeff Atwood	eb2df53e95	copyedits on upload; fix single quote	2014-11-12 00:47:23 -08:00
Jeff Atwood	0953183128	try some flag dialog copy changes	2014-11-12 00:09:15 -08:00
Sam	a2ba9a735e	Merge pull request #2943 from fantasticfears/slug ... Add stringex for Chinese slug generation	2014-11-12 08:57:59 +11:00
Erick Guan	667758ff40	Add stringex for Chinese slug generation	2014-11-11 21:12:07 +08:00
Régis Hanol	ec76be964e	UX: better footer handling	2014-11-10 21:51:55 +01:00
Jeff Atwood	435cd37021	copyedits; email image auto for > 250 width/height	2014-11-09 01:27:09 -08:00
Jeff Atwood	8e38c129c5	minor login copy tweaks	2014-11-06 02:27:27 -08:00
Jeff Atwood	20fa95801c	tighten up flag copy for off-topic and notify mods	2014-11-05 14:19:50 -08:00
Sam	cc9b040502	Revert "FEATURE: display github profile links on user card and profile" ... This reverts commit 95c518329a.	2014-11-05 07:45:35 +11:00
Sam	95c518329a	FEATURE: display github profile links on user card and profile ... Can be disabled by unchecking "public_github_screen_name"	2014-11-04 13:33:58 +11:00
Régis Hanol	7e94f9d6f9	FIX: insert different message when auto-closing a topic based on the last post	2014-10-29 21:26:32 +01:00
Robin Ward	f47ab30b04	Use a site setting for maximum summary results	2014-10-28 16:03:43 -04:00
Arpit Jalan	b37d845dd3	FIX: email replies should not be accepted for deleted topics	2014-10-27 13:05:33 +05:30
Sam	1cc37e32b9	FEATURE: add max_reply_history to limit number of replies ... that can be expanded, when clicking "in-reply-to"	2014-10-27 09:44:42 +11:00
Arpit Jalan	08dc0e6ee6	FIX: email replies to closed topic should not be accepted	2014-10-25 23:47:13 +05:30
Sam	aa9b3bb35a	FEATURE: allow long polling to go to a different url ... Added the site setting long_polling_base_url , this allows you to farm long polling to a different server. This setting is very important if a CDN is serving dynamic content.	2014-10-24 13:38:38 +11:00
Sam	73486b8ddd	FIX: respect anon_polling_interval ... FIX: only poll background message bus pages once a minute FEATURE: background_polling_interval FEATURE: long polling pushed back to 25 seconds FEATURE: force a poll when a bg page returns to foreground also improve copy of message bus settings a bit	2014-10-22 12:49:10 +11:00
Jeff Atwood	0e3c06cf61	better email bouncy reply titles	2014-10-21 14:56:25 -07:00
Jeff Atwood	aca437d071	improve email bounce reply copy	2014-10-21 14:41:18 -07:00
Neil Lalonde	7659d491fd	Merge pull request #2897 from techAPJ/patch-1 ... FEATURE: show full user name in emails	2014-10-21 15:47:31 -04:00
Jeff Atwood	58187086b6	improve copy to reduce confusion	2014-10-21 12:39:01 -07:00
Arpit Jalan	8700716fcd	separate site setting for showing full name in emails	2014-10-22 00:50:39 +05:30
Jeff Atwood	13ea9d655d	tighten up search help	2014-10-20 10:05:53 -07:00
Arpit Jalan	42714d7d25	Hide google search when the instance is private	2014-10-20 16:50:42 +05:30
Sam	bfbfc16cca	Correct hard coded URL, implement missing features	2014-10-18 18:09:45 +11:00
Jeff Atwood	41be68ec6a	improve search help copy	2014-10-19 23:53:17 -07:00
Jeff Atwood	92b615b503	reorganize site settings a bit	2014-10-19 23:14:50 -07:00
Sam	53feb1d2d0	copy	2014-10-18 15:44:38 +11:00
Sam	de71477405	FEATURE: order:views order by views	2014-10-18 15:38:58 +11:00
Sam	e6cc4cba8b	FEATURE: in:tracking and in:watching search filters	2014-10-18 15:34:05 +11:00
Sam	8afd7a7f21	FEATURE: in:likes and in:posted search filters	2014-10-18 15:19:08 +11:00
Sam	cbc132eca9	FEATURE: added status:noreplies and status:archived to advanced search	2014-10-18 14:54:11 +11:00
Sam	840b68003c	copy	2014-10-18 14:28:29 +11:00
Sam	742c5e29c9	FEATURE: advanced search help	2014-10-18 14:27:33 +11:00
Sam	10db8f21d7	FEATURE: experimental reply-to expansion which hides intermediate posts ... experimental_reply_expansion	2014-10-15 18:13:13 +11:00
Neil Lalonde	f88075cbba	FEATURE: CORS settings per-site in a multisite env	2014-10-15 15:20:39 -04:00
Neil Lalonde	4762b4ac24	FIX: on completion of external auth, window.close may fail because of iOS Safari bug. Prompt user to manually close the window.	2014-10-15 11:00:34 -04:00
Sam	a34ed4d3e5	FEATURE: Make it easier to localize "email has been taken"	2014-10-13 14:18:53 +11:00
Robin Ward	366d7e892c	Merge pull request #2867 from techAPJ/patch-1 ... FEATURE: send `set password` instructions after invite redemption	2014-10-14 11:01:07 -04:00
Régis Hanol	9c0321dc53	forgot to rename these strings when renaming import to restore	2014-10-14 16:58:21 +02:00
Arpit Jalan	861f321263	FEATURE: send set password instructions after invite redemption	2014-10-11 14:13:05 +05:30
Régis Hanol	5504622c1b	rename export/import in favor of backup/restore for better consistency	2014-10-10 20:04:07 +02:00
Ionut Staicu	ca5095d3e1	Added transliteration for extra diacritics	2014-10-08 09:17:04 +03:00
Sam	b47c1defe0	FIX: add missing transliteration rules	2014-10-08 12:27:51 +11:00
Neil Lalonde	96e4d2b662	remove the notification_email_top customization	2014-10-06 17:00:20 -04:00
Neil Lalonde	ad387a1150	FEATURE: posts will be deleted immediately if delete_removed_posts_after is set to 0	2014-10-06 16:30:07 -04:00
Robin Ward	318286dc7c	Merge pull request #2847 from techAPJ/patch-2 ... Improve email_subject setting copy	2014-10-06 13:33:15 -04:00
Sam	54281d5944	badge system is not experimental	2014-10-06 09:36:56 +11:00
Arpit Jalan	f3b05993e0	Improve email_subject setting copy	2014-10-05 23:15:37 +05:30
Jeff Atwood	e7bc896210	add spam hiding ability to lounge welcome	2014-10-02 13:44:55 -07:00
Robin Ward	9564ecde76	FEATURE: Site setting for words to censor in posts	2014-10-02 13:58:58 -04:00
Sam	29bb9eaa89	Merge pull request #2835 from techAPJ/patch-2 ... add user email on account created page	2014-10-02 17:29:26 +10:00
Arpit Jalan	41af2d79b5	add user email on account created page	2014-10-02 12:43:44 +05:30
Neil Lalonde	85d71ba362	improve description of the purge_inactive_users_grace_period_days site setting	2014-10-01 13:46:44 -04:00
Robin Ward	be93f224a6	Revert "add user email on account created page" ... This reverts commit 164fc1108a.	2014-10-01 10:30:26 -04:00
Arpit Jalan	164fc1108a	add user email on account created page	2014-10-01 13:53:50 +05:30
Robin Ward	8b5a1cd20f	Migrate tosAccepted to new user fields	2014-09-30 10:45:18 -04:00
Robin Ward	edb34c178a	FEATURE: Show user fields when the user is signing up	2014-09-30 10:45:18 -04:00
Sam	0fc6c751cb	FEATURE: implement lock/unlock trust level mechanics	2014-09-30 13:16:34 +10:00
riking	c8111ada6e	FEATURE: Allow admins to lock users from TL3 promotion/demotion ... Also, update the display logic for the leader promotion screen to account for the demotion grace period.	2014-09-30 13:15:13 +10:00
Robin Ward	ff795a267d	Merge pull request #2826 from techAPJ/patch-1 ... FEATURE: add site preference for standard subjects, including support for Re	2014-09-29 15:29:22 -04:00
Neil Lalonde	6e11ae4f5c	remove deprecated TOS text content	2014-09-29 14:04:53 -04:00
Arpit Jalan	330b7ba54a	FEATURE: add site preference for standard subjects, including support for Re	2014-09-29 21:54:29 +05:30
Jeff Atwood	d26227ae3d	minor copy improvement	2014-09-26 10:50:32 -07:00
Jeff Atwood	3d80b25f39	improve banner copy	2014-09-25 14:02:27 -07:00
Jeff Atwood	a3e2e1fa6e	better link to emoji lookups	2014-09-25 12:42:38 -07:00
Régis Hanol	69400a802f	FEATURE: auto-delete any hidden posts that stay hidden for more than 30 days	2014-09-25 19:51:00 +02:00
Sam	c248d28c38	FEATURE: display associated accounts in admin user	2014-09-25 16:15:01 +10:00
Régis Hanol	bfdbb70b3b	FIX: automatic backup uploads to S3 when using a region	2014-09-24 22:52:09 +02:00
Robin Ward	84cf402482	Merge pull request #2805 from techAPJ/patch-1 ... Suppress images for short emails	2014-09-24 15:27:34 -04:00
Arpit Jalan	0a64657fab	Suppress images for short emails	2014-09-24 23:52:27 +05:30
Jeff Atwood	b2c4cd8aa5	a bit more new user welcome tweaks	2014-09-24 10:24:08 -07:00
Jeff Atwood	5d9756a2ac	tweaks to new user welcome	2014-09-23 16:19:13 -07:00
Robin Ward	d073b908a9	Merge pull request #2818 from techAPJ/patch-4 ... Trigger browser password manager after signing up	2014-09-23 15:43:31 -04:00
Arpit Jalan	b3838c2c1c	Trigger browser password manager after sigining up	2014-09-24 01:04:36 +05:30
Régis Hanol	5681338b08	FIX: log a staff action + send a private message when disabling the 'download_remote_images_to_local' site setting	2014-09-23 19:11:43 +02:00
Robin Ward	dc789502f9	FEATURE: Site setting to enable displaying email on user profiles for ... staff users (and the user themselves.)	2014-09-23 13:01:44 -04:00
Jeff Atwood	19bdf7be90	improve HTML plain text email error copy	2014-09-22 13:04:10 -07:00
Kamil Bielawski	dca1394b86	removed typo in invitation email template	2014-09-22 02:08:50 +02:00
Jeff Atwood	cf4bd67946	UX: rename "invisible" to "unlisted"	2014-09-13 01:26:18 -07:00
Arpit Jalan	eddaaa5040	Rename elder to leader	2014-09-13 11:05:54 +05:30
riking	2c6d03f87f	SECURITY: Limit passwords to 200 characters ... Prevents layer 8 attack.	2014-09-12 12:07:11 -04:00
Jeff Atwood	8da4deba42	whoops duplicate text in welcome PM	2014-09-11 10:11:13 -07:00
Jeff Atwood	1c40d649fa	copyedits to welcome PM	2014-09-11 10:06:34 -07:00
Neil Lalonde	0a9e284277	FIX: rake admin:invite sends an email that makes it clear that an account was created for the recipient	2014-09-11 12:49:01 -04:00
Jeff Atwood	f95611aba1	make PM welcome images local, and smaller	2014-09-11 00:11:55 -07:00
Sam	45e8337a29	FEATURE: renames forgot_password_verbose, forgot_password_strict	2014-09-11 15:53:29 +10:00
Sam	61bcde6284	FEATURE: inform users if forgot password works or not ... FIX: flash dialog in forgot password often had wrong color (this can be disabled by setting forgot_password_verbose to false)	2014-09-11 12:04:44 +10:00
Jeff Atwood	d8f66a3eee	asset warning on anon download prevention setting	2014-09-09 15:33:15 -07:00
Jeff Atwood	1ef48f6af3	clarify copy on disable_edit_notifications	2014-09-09 15:17:48 -07:00
Jeff Atwood	b2460d7395	improve test email copy	2014-09-09 14:29:41 -07:00
Régis Hanol	eb34ecfc0c	FEATURE: new 'prevent anons from download files' site setting	2014-09-09 18:41:13 +02:00
Robin Ward	56eda5abf9	FIX: Don't allow profile bios longer than 3k chars	2014-09-08 15:23:21 -04:00
Robin Ward	334e21a03a	Revert "Revert "FEATURE: Can create warnings for users via PM"" ... This reverts commit 1c7559380c.	2014-09-08 11:11:56 -04:00
Robin Ward	1c7559380c	Revert "FEATURE: Can create warnings for users via PM" ... This reverts commit b0bfc1f93f.	2014-09-08 10:38:59 -04:00
Robin Ward	b0bfc1f93f	FEATURE: Can create warnings for users via PM	2014-09-08 10:27:06 -04:00
Gerhard Schlager	970aafecb4	FIX: Some default group names could not be translated	2014-09-07 14:48:03 +02:00
Neil Lalonde	ca5f361d0a	FEATURE: restrict admin access based on IP address	2014-09-05 12:06:01 -04:00
Jeff Atwood	7466af9786	more renaming of trust level settings	2014-09-04 13:22:17 -07:00
Jeff Atwood	fcca64c0cf	rename site settings for trust levels as numbers	2014-09-04 13:16:51 -07:00
Jeff Atwood	cfb92b6e5b	UX: clarify notify user flag option is just a PM	2014-09-02 03:37:21 -07:00
Jeff Atwood	3ebc67244a	copyedits on Welcome to Lounge	2014-09-02 02:31:24 -07:00
Sam	69e418facf	FEATURE: wider search with more context	2014-09-01 17:04:57 +10:00
Jeff Atwood	6221a84ce8	minor copy updates	2014-08-31 04:46:20 -07:00
Jeff Atwood	111b35f613	UX: rename "Leader" to "Veteran" (more)	2014-08-29 17:09:54 -07:00
Jeff Atwood	324c0eb7e4	UX: improve default new user guidance	2014-08-29 15:47:53 -07:00
Jeff Atwood	2c7d694c34	UX: extremely confusing copy on setting	2014-08-28 23:09:37 -07:00
Sam	c07d76677d	Merge pull request #2701 from riking/email-pr-ssl ... Rename POP3 settings, fix multisite SSL state leak	2014-08-29 10:02:05 +10:00
riking	9090df63ba	Fix pop3 settings in locale file	2014-08-28 10:45:40 -07:00
Robin Ward	0ae3c327de	Add a message to the staff logs indicating why a user was purged	2014-08-27 16:05:07 -04:00
Jeff Atwood	d50b34b825	"earned" vs "you were granted"	2014-08-26 23:46:48 -07:00
Sam	16c34c206d	FEATURE: verbose localization option	2014-08-27 14:12:11 +10:00
Jeff Atwood	db0b6703a3	better copy on S3 upload settings	2014-08-23 17:01:05 -07:00
Régis Hanol	77ba2015eb	FEATURE: new disable_emails site setting	2014-08-23 11:07:37 +02:00
Neil Lalonde	bbb358b356	Add likes given and likes received requirement for being TL3. Configure with site settings leader_requires_likes_given and leader_requires_likes_received.	2014-08-22 17:33:39 -04:00
Sam	ac4f6d9c97	Merge pull request #2647 from riking/multiple-addresses ... Allow processing of email sent to multiple addresses	2014-08-22 10:32:42 +10:00
Sam	c865bf0d71	Merge pull request #2670 from Wilhansen/sso_override_avatar ... Implement SSO overriding avatars.	2014-08-22 10:22:06 +10:00
Jeff Atwood	86fcc72546	minor top copy tweak	2014-08-20 01:09:32 -07:00
Jeff Atwood	f8ae2f5378	update new user tips for less columns , emoji	2014-08-19 14:28:34 -07:00
Wilhansen Li	e0f970326f	Implement SSO overriding avatars. ... Implemented by having Discourse download the image from the provided URL and treating it as a custom upload. Adds two more parameters to the SSO site’s response: * `avatar_url` specifies the URL of the overriding avatar. * `avatar_force_update` Discourse does not re-download avatars that has already been download from the same URL. Setting this to true forces Discourse to re-download the avatar in `avatar_url` Note that both parameters are ignored if `sso_overrides_avatar` is set to false.	2014-08-19 15:53:34 +08:00
Neil Lalonde	13891292d3	FIX: a missing quote in server.en.yml	2014-08-18 17:10:04 -04:00
Jeff Atwood	57becf156b	improvement to site_settings help text	2014-08-18 14:03:40 -07:00
Régis Hanol	e1191a5fcf	Merge pull request #2511 from windhamg/s3_iam_role ... support for EC2 IAM roles with Amazon S3 file store/backup	2014-08-18 16:14:14 +02:00
Jeff Atwood	d09b30775c	better copy on a few default topics	2014-08-18 01:51:44 -07:00
Jeff Atwood	e2aa3e9616	better description of hidden flagged content	2014-08-17 23:27:05 -07:00
Jeff Atwood	ad17a315ec	clarify flag-to-hide second round requires staff	2014-08-17 23:02:15 -07:00
Sam	e0a82d3088	FIX: rate limit password reset email	2014-08-18 10:55:30 +10:00
Jeff Atwood	6795d378b4	remove a few strings on admin in favor of glyphs	2014-08-16 22:53:41 -07:00
Robin Ward	0ce2df36e0	Merge pull request #2662 from techAPJ/patch-3 ... FEATURE: add additional fields in user list export	2014-08-15 16:03:16 -04:00
Jeff Atwood	7e5678abd5	/admin/docker --> /admin/upgrade	2014-08-15 12:31:43 -07:00
Arpit Jalan	8d7f4c1944	FEATURE: add additional fields in user list export	2014-08-16 00:39:28 +05:30
Robin Ward	f7b0c31418	Post history heatmap should use site settings for thresholds	2014-08-15 12:22:06 -04:00
Robin Ward	2f4f5d56e1	Use Site Settings for the cold date ranges	2014-08-15 12:09:31 -04:00
Robin Ward	26ca197be9	Adds Site settings to configure post:like ratio thresholds	2014-08-15 12:02:29 -04:00
Sam	465c2a2ba8	FEATURE: logout redirect support ... Allow users to also logout on an external site after logging out locally	2014-08-15 12:57:29 +10:00
Jeff Atwood	ec4e268703	friendlier email rejection message	2014-08-14 15:05:15 -07:00
Arpit Jalan	d0736a06b6	FEATURE: export user list	2014-08-15 01:46:57 +05:30
Robin Ward	7ed969f0c7	Site Setting to customize how frequently inactive users are purged	2014-08-13 15:11:19 -04:00
riking	b4dc8e7115	Add error reply for new error	2014-08-13 11:47:21 -07:00
Jeff Atwood	6d919d75cc	clarify New User Tips = Guidance	2014-08-13 02:43:12 -07:00
Jeff Atwood	94f407cb24	simplify account required copy	2014-08-12 02:36:41 -07:00
Jeff Atwood	5dc35488d2	few more "Sign In/Out" reverts to "Log In/Out"	2014-08-11 16:29:02 -07:00
Jeff Atwood	a51bf08346	change "Sign In" back to "Log In" for now	2014-08-11 16:08:55 -07:00
Jeff Atwood	f15d106eb9	remove all version stats	2014-08-11 12:42:03 -07:00
Régis Hanol	85570ddc77	TRIVIAL: fix grammar on 'deferred' columns	2014-08-11 11:56:54 +02:00
Jeff Atwood	f8528b12d3	improved version_checks copy	2014-08-10 23:13:44 -07:00
Jeff Atwood	cad5c424d8	Shorten PM message titles a tad	2014-08-09 15:18:36 -07:00
Sam	ae2d80501a	PERF: run full vacuum every 90 days (during migration) ... Will reclaim space and improve perf	2014-08-07 11:07:30 +10:00
Sam	33cfbb5c33	By should never appear in translation file like this ... connectors can not be translated without context.	2014-08-06 16:26:59 +10:00
Robin Ward	06c681b0de	Merge pull request #2617 from techAPJ/patch-2 ... FEATURE: dynamically load more invites	2014-08-05 12:54:06 -04:00
Arpit Jalan	4cd8abc905	FEATURE: dynamically load invites	2014-08-05 22:20:23 +05:30
Jeff Atwood	0d154ecf7b	add warnings to min/max username length	2014-08-04 16:50:43 -07:00
riking	d87edce6c3	Pass rejection message along in rejection mail if present	2014-08-01 09:56:15 -07:00
Jeff Atwood	71aa41ccac	copyedits on new flagging behaviors	2014-07-31 16:17:38 -07:00
Jeff Atwood	875ee29478	fix copy on necromancy warning	2014-07-31 15:14:22 -07:00
Jeff Atwood	7856c7538f	correct SPF/TXT record docs	2014-07-31 15:00:51 -07:00
Sam	138d013e56	FIX: Suspended users should not be allowed to post	2014-07-31 13:15:16 +10:00
Sam	e9a1af0113	FIX: Do not suppress reply-to when other posts quoted	2014-07-31 11:40:02 +10:00
Sam	87dd681497	FEATURE: setting suppress reply when quoting	2014-07-30 10:55:49 +10:00
Régis Hanol	5bd1dbd953	Merge pull request #2600 from fantasticfears/patch-8 ... typo	2014-07-29 12:45:09 +02:00
Régis Hanol	cd06224e82	TRIVIAL: fix flag disposition auto messages	2014-07-29 09:27:53 +02:00
Erick Guan	faaecabc62	typo	2014-07-29 11:22:28 +08:00
Régis Hanol	bddffa7f9a	FEATURE: flag dispositions normalization ... All flags should end up in one of the three dispositions - Agree - Disagree - Defer In the administration area, the *active* flags section displays 4 buttons - Agree (hide post + send PM) - Disagree - Defer - Delete Clicking "Delete" will open a modal that offer to - Delete Post & Defer Flags - Delete Post & Agree with Flags - Delete Spammer (if available) When the flag has a list associated, the list will now display 1 response and 1 reply and a "show more..." link if there are more in the conversation. Replying to the conversation will NOT give a disposition. Moderators must click the buttons that does that. If someone clicks one buttons, this will add a default moderator message from that moderator saying what happened. The *old* flags section now displays the proper dispositions and is super duper fast (no more N+9999 queries). FIX: the old list includes deleted topics FIX: the lists now properly display the topic states (deleted, closed, archived, hidden, PM) FIX: flagging a topic that you've already flagged the first post	2014-07-28 19:28:07 +02:00
Neil Lalonde	5a33e6f00c	Move FAQ, Terms of Service, and Privacy Policy into topics in the Staff category. First post of those topics will be rendered on their respective pages. Site settings and content are not used for these documents anymore. Translations of the default text is moved into the standard YML files.	2014-07-25 14:41:20 -04:00
Neil Lalonde	b4ad70d767	FEATURE: Continue to Discourse links are now buttons, and those pages will redirect automatically after 5 seconds	2014-07-23 12:32:12 -04:00
Jeff Atwood	aad5d439d0	we were burying the lede on hide flag notify	2014-07-22 16:12:40 -07:00
Jeff Atwood	b3316b9f68	minor copy error	2014-07-22 01:46:58 -07:00
Jeff Atwood	5efca54bee	yet more New User Welcome Tip edits	2014-07-21 23:45:04 -07:00
Jeff Atwood	a82cad78af	more New User Welcome Tip improvements	2014-07-21 22:16:10 -07:00
Jeff Atwood	a4cdf33b22	don't need giant screenshot there	2014-07-21 16:52:49 -07:00
Jeff Atwood	7f55a6b78c	improved New User Welcome tips with pictures	2014-07-21 16:42:07 -07:00
Jeff Atwood	880c16982b	add note about possibly losing TL3 designation	2014-07-21 15:26:10 -07:00
Neil Lalonde	7c898f2e61	FIX: topic_exists_no_oldest translation	2014-07-21 10:36:41 -04:00
riking	c8d322d1be	Include the email subject line in rejection messages ... This change has a tradeoff. It increases our backscatter vulnerability - the subject could have spammy content - but it's extremely valuable to the user to know exactly which message was rejected. If you sent two at the same time, and only one was rejected, you would have no way of knowing which worked and which to resend without going to the website (which is what email-in is trying to avoid, kinda).	2014-07-17 10:25:53 -07:00
riking	1682f5d584	Fix message, and add test, for EmailUnparseableError	2014-07-17 10:25:53 -07:00
riking	17db265b41	Remove use of email_in_address and email_in_category	2014-07-17 10:25:13 -07:00
Jeff Atwood	f2093fb4de	omit needless words	2014-07-17 03:00:29 -07:00
Neil Lalonde	5c70d878a7	FEATURE: show a reason why a category can't be deleted	2014-07-16 15:43:51 -04:00
Neil Lalonde	939e8505a9	Remove hub username integration	2014-07-16 12:25:24 -04:00
Robin Ward	f2dd35ab08	Improve the unsubscribe to digest experience. Give a link in case it ... fails, provide a different message if you are logged in as a different user, increase expiry to 2 months from 1 week.	2014-07-15 17:20:59 -04:00
Robin Ward	c6df00a5cc	FIX: You shouldn't be able to add a parent to Uncategorized	2014-07-15 15:19:39 -04:00
Jeff Atwood	1d717088c3	improve test email copy help	2014-07-14 17:01:22 -07:00
Neil Lalonde	4f6d5d9215	FEATURE: add site settings rate_limit_new_user_create_topic and rate_limit_new_user_create_post to have different rate limits for topic and post creation for new users	2014-07-14 16:58:16 -04:00
Neil Lalonde	766196af87	FEATURE: add site setting allow_new_registrations which can be used to block all new account registrations	2014-07-14 15:42:22 -04:00
Neil Lalonde	42dcb77d93	FEATURE: add site setting leader_links_no_follow to control whether users with trust level 3 or higher have nofollow on their links	2014-07-14 13:34:29 -04:00
Robin Ward	cce7cf8c85	FEATURE: Require Javascript to activate an account via email link	2014-07-14 12:26:10 -04:00
Gary Windham	3f6bd0606a	support for EC2 IAM roles with Amazon S3 file store/backup	2014-07-14 09:14:16 -07:00
Jeff Atwood	49dbded250	remove title_sanitize setting	2014-07-14 00:18:02 -07:00
Jeff Atwood	a9ff3ab9ff	copyedit pass on all Site Settings	2014-07-14 00:03:06 -07:00
Régis Hanol	edba5c631f	FEATURE: reject accounts created with an email address similar to a known spammer email	2014-07-12 01:59:43 +02:00
Régis Hanol	b526cdc55c	Revert "FEATURE: reject accounts created with an email address similar to a known spammer email" ... This reverts commit 39be48a441. Conflicts: spec/models/screened_email_spec.rb	2014-07-12 01:01:37 +02:00
Régis Hanol	39be48a441	FEATURE: reject accounts created with an email address similar to a known spammer email	2014-07-11 15:09:46 +02:00
Jeff Atwood	ed3bebfebe	switch /faq to /guidelines in a bunch of places	2014-07-10 15:30:58 -07:00
Jeff Atwood	93c4067ab3	initial "Welcome to the Lounge" copyedit	2014-07-10 14:08:09 -07:00
Neil Lalonde	fd55a3fd66	FEATURE: add a welcome topic to the Lounge category. Copy needs to be improved.	2014-07-10 15:13:18 -04:00
Neil Lalonde	e565ae2528	FEATURE: /guidelines route will always show our FAQ, ignoring the faq_url site setting	2014-07-10 12:58:41 -04:00
Neil Lalonde	21d3785622	Merge pull request #2517 from ninjasphere/fix_avatar_refresh_task_name ... FIX: avatars:regenerate rake task is now avatars:refresh	2014-07-10 11:31:52 -04:00
Neil Lalonde	c6a313d458	Seed categories with capitalized names	2014-07-10 11:28:49 -04:00
Jeff Atwood	a56db77172	copyedit	2014-07-10 00:43:41 -07:00
Jeff Atwood	4654bb3688	Merge pull request #2524 from techAPJ/patch-3 ... Improve invite email copy	2014-07-09 22:47:23 -07:00
Jeff Atwood	3deba15c18	minor copyedits	2014-07-09 22:35:50 -07:00
Arpit Jalan	2f6c984c8c	Improve invite email copy	2014-07-10 10:57:40 +05:30
Jeff Atwood	95282a4c6d	add badge glyph to edit button	2014-07-09 22:01:03 -07:00
Arpit Jalan	8395da5bd0	FIX: include topic title and domain name in topic invite mail	2014-07-10 10:05:28 +05:30
Neil Lalonde	362adb0498	FIX: add site setting email_site_title, which overrides title in reply by email address in case the title has invalid characters	2014-07-09 16:44:18 -04:00
Jeff Atwood	0a643353cf	slight improvements to invite email copy	2014-07-09 12:57:04 -07:00
Arpit Jalan	223bbc3da3	FEATURE: include topic context in topic invite	2014-07-09 21:23:20 +05:30
Jeff Atwood	0317e503b3	minor copyedit	2014-07-08 17:00:50 -07:00
Jeff Atwood	1c3dff2013	we don't use %{site_password} any more	2014-07-08 16:58:39 -07:00
Neil Lalonde	df8b25d2f5	FEATURE: don't demote trust level 3 users who were promoted less than SiteSetting.leader_promotion_min_duration days ago	2014-07-08 17:39:49 -04:00
Jeff Atwood	aca592b99c	a few copyedits on bulk user invites	2014-07-08 11:09:43 -07:00
Elliot Shepherd	2762bc7be5	FIX: avatars:regenerate rake task is now avatars:refresh	2014-07-08 15:17:48 +10:00
riking	680f057d8b	Add notes about invites to SSO and local login settings	2014-07-05 12:55:48 -07:00
Sam	5b310c21b4	FIX: less crazy error when post exceeds max length.	2014-07-04 16:39:15 +10:00
Jeff Atwood	35bd25c626	very minor copyedit	2014-07-03 16:50:03 -07:00
Jeff Atwood	c74e60ec51	add Discourse site link to version emails	2014-07-03 12:53:00 -07:00
Jeff Atwood	fba2a00265	very minor copy update	2014-07-03 12:50:50 -07:00
Arpit Jalan	85ba55dc26	FEATURE: support txt file to be uploaded for bulk invite	2014-07-02 19:21:15 +05:30
Jeff Atwood	df59f0a6e1	add one more SPF syntax link to email test	2014-07-02 01:03:30 -07:00
Jeff Atwood	89adbae3ca	better email deliverability guidance	2014-07-02 01:01:04 -07:00
Sam	60d93a62f6	FIX: tighten up email token durations	2014-07-02 09:08:25 +10:00
Jeff Atwood	c40d999407	better generic "posting error" in email replies	2014-07-01 15:40:12 -07:00
Robin Ward	1f829c4e70	WIP: New site setting to show subcategory list on category list	2014-07-01 17:12:03 -04:00
Neil Lalonde	292e9bb611	TL3: Add requirements for min all-time topics viewed, and min all-time posts read	2014-07-01 13:34:57 -04:00
Robin Ward	d9e583af1a	FEATURE: Add new site setting to restrict how many times you can click on an ... invite to "passthrough" as logged in, with a default of 0 hours. Also changes default invite expiry from 7 days to 1.	2014-07-01 12:52:52 -04:00
Régis Hanol	dcd0b8fecf	BUGFIX: no translation for email_error_notifications to admin users	2014-06-30 15:21:26 +02:00
Neil Lalonde	807bfbd9bb	FEATURE: Trust level 3 promotion and demotion. Job is disabled for now.	2014-06-27 18:42:03 -04:00
riking	da9048f3ea	Fix email code & tests	2014-06-27 12:04:31 -07:00
Jeff Atwood	0051cd8919	better copy for email errors	2014-06-26 16:05:14 -07:00
Arpit Jalan	dad2d34d02	Refactor methods post feedback	2014-06-26 22:50:09 +05:30
Sam	67804cb56b	Merge pull request #2465 from riking/email_rejections ... Give specific message for each kind of email rejection	2014-06-26 09:55:24 +10:00
Jeff Atwood	18a2e7901e	add note about dupe spf and txt records	2014-06-25 13:38:41 -07:00
Neil Lalonde	27fb65b562	Add uncategorized_description site setting	2014-06-24 17:45:34 -04:00
Jeff Atwood	2d2e12fd08	minor copyedits on 404 page	2014-06-24 13:16:22 -07:00
riking	222db71dd7	Cleanup	2014-06-23 17:48:51 -07:00
riking	8b5d2b835a	Add case for bad reply key	2014-06-23 17:46:22 -07:00
riking	d2823fc5ee	More detailed email rejection responses	2014-06-23 17:17:53 -07:00
riking	edc17dddb3	Let's see if this works	2014-06-23 17:17:53 -07:00
Jeff Atwood	30cf666f88	clarify feed polling is for embedding	2014-06-23 16:22:32 -07:00
Neil Lalonde	4321ccd761	Add a note to pop3s_polling_period_mins saying that it requires restart	2014-06-23 10:54:53 -04:00
Peter N Lewis	5da2eac1bb	Add a SiteSetting to control the pop3 polling period. ... The default 5 minutes may add too much lag for some sites used to mailing list performance. Unfortunately, this seems to require restarting the server for the change to be noticed - is there any way to avoid that, or otherwise should this be noted in the setting text?	2014-06-21 15:57:49 +08:00
Jeff Atwood	109107e7b7	minor copyedits on community flag hide pm	2014-06-19 23:50:43 -07:00
Neil Lalonde	f0a0be1c2c	Merge pull request #2454 from riking/mobile-logo ... Allow a sepearate mobile logo URL	2014-06-19 14:14:32 -04:00
riking	6d182e7c43	Forgot translation for description	2014-06-18 13:13:33 -07:00
Michael Downey	c74e0cea47	Fixing grammar problem in dismissable banner msg ... Changed "pages" to "page" and "users" to "user".	2014-06-18 15:03:09 -04:00
Régis Hanol	5238a95efb	add make/remove banner topic actions	2014-06-18 20:05:18 +02:00
Neil Lalonde	3eb65885d1	Add validation of string site settings with regex, and min and max lengths	2014-06-18 11:15:40 -04:00
Robin Ward	1147b9d2e5	Merge pull request #2408 from peternlewis/pop3_insecure ... Support for insecure POP3 (without SSL)	2014-06-16 11:51:44 -04:00
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