danielgrippi 775e7b6b2b Merge branch 'master' into follow ... Conflicts: features/step_definitions/user_steps.rb		2011-05-17 11:33:35 -07:00
..
user	added a pane for people sharing with you on all aspect page	2011-05-04 17:57:42 -07:00
encryptable.rb	Relayable retractions pretty much done	2011-03-25 16:09:37 -07:00
exporter.rb	Fix stream on pages other than 1, rename raw_visible_posts to visible_posts	2011-04-13 14:35:20 -07:00
guid.rb	58 failures with mysql	2010-12-21 17:14:52 -08:00
ostatus_builder.rb	small fix to make atom valid	2011-04-22 11:01:38 -07:00
parser.rb	IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive	2010-11-02 12:38:30 -07:00
relayable.rb	Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable?	2011-03-25 16:09:37 -07:00
taggable.rb	added \b (word ending) to tag regex to exclude :;?! etc.; allow : in tags	2011-04-30 00:08:33 +02:00
user.rb	MS DG made receive encapsulated in an object	2011-01-11 14:23:19 -08:00
web_socket.rb	rescue redis connection attempts in websocket	2011-05-16 18:34:37 -07:00
webhooks.rb	DG MS moved receive methods to their respective models	2011-01-11 14:23:18 -08:00