zhitomirskiyi 9b00b2c786 Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends' ... Conflicts: app/models/user.rb spec/integration/receiving_spec.rb spec/models/mention_spec.rb spec/models/status_message_spec.rb		2011-03-10 19:59:12 -08:00
..
config	Add rcov task	2011-03-01 18:12:42 -08:00
controllers	just use tag search for now	2011-03-10 19:42:24 -08:00
fixtures	Fix data conversion, fixture generation in publicscontroller	2011-01-26 18:39:09 -08:00
helpers	added PrivateMessage and PrivateMessageVisibility models and migrations	2011-03-01 12:14:31 -08:00
integration	Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends'	2011-03-10 19:59:12 -08:00
javascripts	generate jasmine fixture with posts	2011-03-10 19:12:16 -06:00
lib	fixed ostatus builder + spec	2011-03-10 15:17:56 +01:00
mailers	added the email notification, the notification is not persisted, fixed the receive callback spec	2011-03-08 18:24:56 -08:00
models	Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends'	2011-03-10 19:59:12 -08:00
shared_behaviors	LOG MORE STUFF	2011-03-09 14:29:49 -08:00
support	Merge branch 'private_messages'	2011-03-08 21:23:41 -08:00
factories.rb	posts now have authors instead of people	2011-03-01 18:05:05 -08:00
helper_methods.rb	Remove mocha	2011-01-26 11:52:14 -08:00
misc_spec.rb	posts now have authors instead of people	2011-03-01 18:05:05 -08:00
spec_helper.rb	Fix public posts page when signed in	2011-03-10 15:26:55 -08:00