6636 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeff Atwood	fb037290ac	clarify on invite friends	2013-08-23 23:12:24 -07:00
Robin Ward	9ca0b0fe96	FIX: Emoticons were parsing twice sometimes.	2013-08-23 22:56:00 -04:00
Neil Lalonde	50bab18206	Version bump to v0.9.6.1	2013-08-23 17:51:10 -04:00
Neil Lalonde	6e79197519	Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency.	2013-08-23 17:36:25 -04:00
Jeff Atwood	ee4ffe7abe	Merge pull request #1372 from ZogStriP/site-setting-for-allowing-animated-avatars ... add a site setting for allowing animated avatars	2013-08-23 14:26:33 -07:00
Régis Hanol	43a8bff652	add a site setting for allowing animated avatars	2013-08-23 18:55:02 +02:00
Neil Lalonde	663adde90e	Users can change their own username at any time if they have no posts	2013-08-23 11:23:00 -04:00
Neil Lalonde	6a3c849067	Fix [object Object] in staff logs details modal	2013-08-23 10:08:35 -04:00
Jeff Atwood	f36fc8c41f	remove unnecessary onebox body padding	2013-08-23 02:53:14 -07:00
Jeff Atwood	5cf0c59628	remove onebox info left padding	2013-08-23 02:48:55 -07:00
Einar Jonsson	84987cd835	Extracted nickname registration into a private controller method	2013-08-23 09:46:33 +00:00
Jeff Atwood	c409d91203	add "temporarily" to flagged content hidden	2013-08-23 00:07:08 -07:00
ofGEEK	1a58bfbdc9	Update client.zh_CN.yml	2013-08-23 09:52:10 +08:00
Sam	472f0684c3	Merge pull request #1345 from salbertson/refactor-find_by_username_or_email ... Improve test coverage and refactor User.find_by_username_or_email	2013-08-22 17:14:06 -07:00
Neil Lalonde	3b15e2e58e	Banned users are not returned as pending review users	2013-08-22 19:23:49 -04:00
Neil Lalonde	25e0c3eac1	Log IP addresses with screened emails and urls	2013-08-22 19:04:35 -04:00
Robin Ward	612c0ccccb	FIX: Autolinking within a list	2013-08-22 18:03:01 -04:00
Robin Ward	513f941f50	Fixes @mentions inside of lists	2013-08-22 17:50:36 -04:00
Neil Lalonde	86012ac579	Fix a case when the wrong topic is loaded because the slug starts with a number	2013-08-22 16:23:46 -04:00
Robin Ward	f2c4b3e37f	FIX: Following a mention with a coded mention.	2013-08-22 16:13:02 -04:00
Robin Ward	6fe0d29a01	FIX: @mentions within backticks followed by proper @mentions.	2013-08-22 15:55:29 -04:00
Jeff Atwood	32655e9dad	digest email footer should say "unsubscribe"	2013-08-22 12:53:28 -07:00
Robin Ward	5e50c4624f	FIX: New lines in code blocks were somewhat unpredictable	2013-08-22 13:46:51 -04:00
Scott Albertson	1dbe1fb1bc	Refactor User.find_by_username_or_email ... * Improve test coverage	2013-08-22 09:40:07 -07:00
Robin Ward	0f27232711	FIX: Support inline code blocks with @mentions in them.	2013-08-22 12:18:36 -04:00
Neil Lalonde	10bc24b514	Add a note to allow_uncategorized_topics description	2013-08-22 12:14:41 -04:00
Neil Lalonde	24617dd776	Show empty categories with descriptions to everyone	2013-08-22 11:55:20 -04:00
voisintotoro	1983da14c3	PNG Files optimization	2013-08-22 14:00:25 +02:00
Robin Ward	ae93fcebde	FIX: Autolines were duplicating some text	2013-08-21 22:49:55 -04:00
Robin Ward	a3757016d9	FIX: Quotes with new lines were broken	2013-08-21 22:36:02 -04:00
Sam	d7596840e5	only staff should be able to see bookmarks and favs of other users ... ensure that when they click on them they see the correct topics (topics for user they are looking at, not current user)	2013-08-22 09:18:54 +10:00
Sam	38e80b999f	benching script, work in progress	2013-08-22 09:01:45 +10:00
Sam	735efd8b09	Merge pull request #1368 from johnpaulashenfelter/documentation/remove_references_to_clockwork ... Remove references to clockwork	2013-08-21 15:52:33 -07:00
Robin Ward	ff3b163a78	FIX: Another email regexp for quote lines in the format we can recognize including ... the site name.	2013-08-21 16:54:51 -04:00
John Paul Ashenfelter	cc2b0f1a5f	took a stab at other translations with help from google	2013-08-21 16:29:05 -04:00
John Paul Ashenfelter	bd2006b270	updated english translation	2013-08-21 16:28:51 -04:00
John Paul Ashenfelter	610f52b1d9	removed clockwork reference from docs	2013-08-21 16:26:39 -04:00
Neil Lalonde	adbb6a19bb	Fix 'You must choose a category' when a category is already chosen	2013-08-21 16:14:22 -04:00
Robin Ward	30cfa33629	FIX: @mentions within simple quotes	2013-08-21 16:10:16 -04:00
Robin Ward	1004edad1a	FIX: Weird markdown in digest emails	2013-08-21 13:13:19 -04:00
Neil Lalonde	e5464a4bed	Show staff action log details in a modal	2013-08-21 12:33:24 -04:00
Neil Lalonde	47add6da70	Log when a site customization is deleted	2013-08-21 12:33:24 -04:00
Neil Lalonde	a95303fcd8	Log site customization changes. Use a modal to show staff action log details for site customizations.	2013-08-21 12:33:24 -04:00
Robin Ward	7f69a58439	Replace Markdown parser.	2013-08-21 10:10:57 -04:00
Robin Ward	0d2b4aeb61	Merge pull request #1363 from johnpaulashenfelter/patch-1 ... Be consistent with bundle exec	2013-08-21 07:10:13 -07:00
Robin Ward	3760cba549	Merge pull request #1366 from ZogStriP/do-not-disable-the-radio-button ... do not disable the radio button in the avatar selection modal	2013-08-21 07:09:58 -07:00
Robin Ward	23d740d5ce	Merge pull request #1367 from einarj/cleanup_user_activation ... Moved user activation business logic out of UsersController	2013-08-21 07:07:43 -07:00
Einar Jonsson	916a3f33f2	Refactored user activation business logic out of UsersController and ... into a UserActivator class.	2013-08-21 09:22:34 +00:00
Sam	9526415789	em-redis is never used, don't require it ... hiredis was never wired up properly ... use it ... it is way faster	2013-08-21 10:23:32 +10:00
Sam	8a0a097dfb	make message bus more robust to bad inputs, correct issue where notifications channel is not susbcribed	2013-08-21 09:07:38 +10:00