maxwell e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import ... Conflicts: app/controllers/users_controller.rb		2010-10-13 23:09:48 -07:00
..
albums	DG MS; moved change password to account page; fixed the styling on password inputs	2010-10-07 18:52:46 -07:00
aspects	the invited user keeps track of who invited them, limit on invites,	2010-10-13 16:52:33 -07:00
comments	more stream tweaks	2010-10-07 23:25:49 -07:00
devise	added another attack vector spec	2010-10-13 18:43:22 -07:00
invitations	DG MS; invite is now a lightbox on feed and manage pages	2010-10-11 14:16:24 -07:00
js	Add or later to license notice	2010-10-07 16:25:34 -07:00
layouts	killed the public tab. made a broadcast button in everyone tab	2010-10-08 14:06:49 -07:00
people	Add or later to license notice	2010-10-07 16:25:34 -07:00
photos	fixed photo partial	2010-10-08 12:25:42 -07:00
posts	Add or later to license notice	2010-10-07 16:25:34 -07:00
publics	scratch that last commit	2010-10-05 20:37:28 -07:00
registrations	MS DG; basic view support; it works, but it is ugly	2010-10-13 18:42:24 -07:00
requests	Add or later to license notice	2010-10-07 16:25:34 -07:00
shared	the invited user keeps track of who invited them, limit on invites,	2010-10-13 16:52:33 -07:00
status_messages	minor tweaks	2010-10-08 00:36:55 -07:00
users	Invitations contains the inviters	2010-10-13 13:29:45 -07:00