diaspora/app/views
Gonzalo Rodriguez e0ffd7c63e Merge branch 'master' into aspect_nav_rework
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
2011-09-27 00:08:05 -03:00
..
admins added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
apps MS DG update copyright 2011-09-14 11:23:12 -07:00
aspect_memberships MS DG update copyright 2011-09-14 11:23:12 -07:00
aspects Merge branch 'master' into aspect_nav_rework 2011-09-27 00:08:05 -03:00
authorizations MS DG update copyright 2011-09-14 11:23:12 -07:00
comments MS DG update copyright 2011-09-14 11:23:12 -07:00
contacts MS DG update copyright 2011-09-14 11:23:12 -07:00
conversations MS DG update copyright 2011-09-14 11:23:12 -07:00
devise Need to define mailer_name in the mailer wrapper class, or devise can't find the email templates. 2011-08-21 19:11:46 -07:00
home MS DG update copyright 2011-09-14 11:23:12 -07:00
invitations MS DG update copyright 2011-09-14 11:23:12 -07:00
js MS DG update copyright 2011-09-14 11:23:12 -07:00
layouts MS DG update copyright 2011-09-14 11:23:12 -07:00
likes MS DG update copyright 2011-09-14 11:23:12 -07:00
messages MS DG update copyright 2011-09-14 11:23:12 -07:00
notifications MS DG update copyright 2011-09-14 11:23:12 -07:00
notifier reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
people MS DG update copyright 2011-09-14 11:23:12 -07:00
photos MS DG update copyright 2011-09-14 11:23:12 -07:00
post_visibilities DG MS; updated text to reflect the fact that hiding posts now 2011-09-09 10:52:19 -07:00
posts MS DG update copyright 2011-09-14 11:23:12 -07:00
profiles MS DG update copyright 2011-09-14 11:23:12 -07:00
publics change Base64.encode64 to Base64.encode64s (encode without newlines) 2011-09-16 08:53:13 -07:00
registrations made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -07:00
requests MS DG update copyright 2011-09-14 11:23:12 -07:00
reshares MS DG update copyright 2011-09-14 11:23:12 -07:00
services fix a bug with emailing in posts going to tumblr 2011-09-16 13:57:38 -07:00
sessions MS DG update copyright 2011-09-14 11:23:12 -07:00
shared added an email link to the right section 2011-09-21 14:40:59 -07:00
status_messages MS DG update copyright 2011-09-14 11:23:12 -07:00
tags in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
tokens compress png 2011-07-04 17:26:34 -07:00
users added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00