nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views
History
maxwell 341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
2010-10-14 23:02:06 -07:00
..
albums moved photos link to the side bar for now 2010-10-14 14:38:19 -07:00
aspects I18ning empty_messages 2010-10-14 16:55:00 -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 requests are made on invite but perhaps they should be made on signup so that we have a person 2010-10-14 18:12:18 -07:00
js added an empty message for the case of an aspect with no friends 2010-10-14 16:23:29 -07:00
layouts merging 2010-10-14 16:32:37 -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 added an empty message for the case of an aspect with no friends 2010-10-14 16:23:29 -07:00
status_messages minor tweaks 2010-10-08 00:36:55 -07:00
users merging 2010-10-14 16:32:37 -07:00