Kris Aubuchon 5c3f12f369 merging ... Merge remote-tracking branch 'upstream/master'		2013-11-04 12:59:17 -05:00
..
assets	merging	2013-11-04 12:59:17 -05:00
controllers	Merge pull request #1605 from vikhyat/fix-activerecord-associations-collectionproxy-serialization	2013-11-04 07:16:52 -08:00
helpers	Show mobile view as default for nexus 7 tablet	2013-09-23 17:13:29 -07:00
jobs	FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available.	2013-11-04 12:51:09 -05:00
mailers	remove "via sitename" from senders	2013-09-12 15:38:18 +10:00
models	FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available.	2013-11-04 12:51:09 -05:00
serializers	When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs.	2013-11-01 10:47:26 -04:00
services	When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs.	2013-11-01 10:47:26 -04:00
views	shorter message for untranslated strings	2013-11-04 11:52:12 +01:00