Kris Aubuchon 2d928a0537 local merge ... Merge remote-tracking branch 'upstream/master'		2013-12-04 10:39:39 -05:00
..
assets	fixing the user column on the topic-list page	2013-12-04 10:38:01 -05:00
controllers	FIX: set_locale filter must be executed before check_xhr filter because check_xhr filter renders html in some cases	2013-12-04 20:49:54 +09:00
helpers	FIX: Missing styles in HTML digest emails	2013-11-29 12:21:36 -05:00
jobs	add a tombstone for extra safety	2013-11-27 22:05:11 +01:00
mailers	Small email fixes	2013-12-03 10:11:04 -05:00
models	FIX: Category description topics shouldn't auto-close	2013-12-04 10:31:25 -05:00
serializers	FIX: suspended users still appear suspended after their suspension expires	2013-12-03 15:53:30 -05:00
services	FIX: don't suggest a username that's already taken, even if hub finds a match	2013-11-20 14:56:21 -05:00
views	Fix javascript_include_tag for browser-update so it includes MD5. Needed to add .js extension for some reason.	2013-12-02 15:57:23 -05:00