danielvincent fa66162de5 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/helpers/application_helper.rb app/views/comments/_comment.html.haml app/views/people/_person.html.haml app/views/shared/_stream_element.html.haml		2010-11-30 13:19:17 -08:00
..
application_helper.rb	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-30 13:19:17 -08:00
aspects_helper.rb	comment streams rendered expanded/collapsed initially by server.	2010-11-25 20:23:33 -05:00
error_messages_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
language_helper.rb	allow user to change his language in his settings	2010-10-28 17:29:17 +02:00
layout_helper.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
mobile_helper.rb	MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent	2010-11-21 19:56:35 -08:00
people_helper.rb	fixed issue with photos#index not recognizing an already sent request.	2010-11-23 21:03:35 -08:00
publics_helper.rb	Mini refactor, removed terse_url function	2010-11-29 23:23:51 +01:00
requests_helper.rb	made the checking for already connected more explicit. also, the check itself had a bug when we were calling self.to_id on a request, rather than self.to.id	2010-11-29 10:57:54 -08:00
sockets_helper.rb	Clean up people/person	2010-11-30 13:07:02 -08:00
status_messages_helper.rb	Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'"	2010-11-02 12:14:12 -07:00
stream_helper.rb	try at fixing a translation	2010-11-26 18:33:52 +01:00
users_helper.rb	display a users username in the final step	2010-11-21 16:13:02 -08:00