nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views
History
Raphael d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
2010-10-29 12:06:14 -07:00
..
albums user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show 2010-10-29 10:38:17 -07:00
aspects copy in manage page by clicking 'add a new friend' for now 2010-10-28 11:28:58 -07:00
comments removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments. 2010-10-24 14:44:43 -07:00
devise collapsed layout views 2010-10-27 13:33:42 -07:00
invitations Revert "Revert "Merge remote branch 'upstream/master'"" 2010-10-20 09:51:55 -07:00
js removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments. 2010-10-24 14:44:43 -07:00
layouts collapsed layout views 2010-10-27 13:33:42 -07:00
notifier MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
people user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show 2010-10-29 10:38:17 -07:00
photos user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show 2010-10-29 10:38:17 -07:00
posts
publics EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
registrations removed real name from signup process. 2010-10-27 16:25:22 -07:00
requests copy in manage page by clicking 'add a new friend' for now 2010-10-28 11:28:58 -07:00
services posts don't socket into services#index anymore. 2010-10-27 22:55:58 -07:00
shared upload a photo button next to publisher 2010-10-29 10:38:53 -07:00
status_messages a person now has a photos#index page. 2010-10-29 10:38:17 -07:00
users Merge remote branch 'ed0h/309-user-choose-language' 2010-10-29 12:06:14 -07:00