Raphael Sofaer 1af945de11 Merge branch 'master' into oauth ... Conflicts: Gemfile Gemfile.lock app/models/app_config.rb app/models/post.rb db/schema.rb public/stylesheets/sass/application.sass spec/lib/webfinger_spec.rb		2011-06-28 17:13:38 -07:00
..
_add_contact.html.haml	Get rid of manage	2011-06-24 16:55:40 -07:00
_add_remove_services.haml	nicer auth prompt. wip.	2011-06-23 12:40:47 -07:00
_author_info.html.haml	tagging profiles complete	2011-03-15 13:21:36 -07:00
_author_info.mobile.haml	gif and delayed processing wip	2011-03-17 13:59:53 -07:00
_contact_list.html.haml	iz ms wip fixing contactController destroy	2011-02-17 18:05:21 -08:00
_footer.mobile.haml	move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz	2011-06-16 11:17:14 -07:00
_invitations.haml	add spacing	2011-05-21 14:56:11 -07:00
_mail_signup_form.erb	Added i18n for "Sign up for invite" button.	2010-11-26 01:38:08 +01:00
_public_explain.haml	correct links to atom feed	2011-04-02 17:35:23 +02:00
_publisher.html.haml	added a character count to the publisher	2011-03-30 19:11:24 -07:00
_publisher.mobile.haml	publisher now can handle services, and is on seperate page	2011-04-01 01:18:01 -07:00
_reshare.haml	Specs passing with text	2011-03-14 11:39:31 -07:00
_settings_nav.haml	nicer auth prompt. wip.	2011-06-23 12:40:47 -07:00
_stream.haml	move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz	2011-06-16 11:17:14 -07:00
_stream_element.html.haml	Don't force a query on like count	2011-06-05 00:32:10 -07:00
_stream_element.mobile.haml	small linebreak for cubbies view for mobile	2011-05-22 15:25:37 -07:00