nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/controllers
History
danielgrippi 106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
..
admins_controller.rb let admin give a user 10 ma user 10 more invites 2011-04-07 17:54:22 -07:00
apis_controller.rb 8 failures left. wip. 2011-03-29 17:31:56 -07:00
application_controller.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
aspect_memberships_controller.rb green everywhere. 2011-04-08 17:10:43 -07:00
aspects_controller.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
comments_controller.rb some better http status codes 2011-04-06 17:16:39 +02:00
contacts_controller.rb dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
conversation_visibilities_controller.rb made flash messages for conversations translatable 2011-03-30 16:52:43 +02:00
conversations_controller.rb Fix redirect away from conversation 2011-03-30 17:17:16 -07:00
home_controller.rb toggle mobile site, when mobile device 2011-02-03 18:43:56 -08:00
invitations_controller.rb removed person can't be blank error message 2011-02-11 16:29:19 -08:00
likes_controller.rb likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
messages_controller.rb some better http status codes 2011-04-06 17:16:39 +02:00
notifications_controller.rb some better http status codes 2011-04-06 17:16:39 +02:00
people_controller.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
photos_controller.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
post_visibilities_controller.rb dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
posts_controller.rb drop requests table wip 2011-04-06 19:01:41 -07:00
profiles_controller.rb fix tag plugin 2011-03-29 16:53:48 -07:00
publics_controller.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
registrations_controller.rb start people off with invites if the pod is open 2011-03-22 11:27:29 -07:00
services_controller.rb Remove stray puts 2011-03-21 17:12:54 -07:00
sessions_controller.rb basic functionality done, fixing rough edges 2011-03-28 18:11:59 -07:00
sockets_controller.rb Revert "Don't socket the unsocketable" 2011-03-17 15:50:43 -07:00
status_messages_controller.rb publisher now can handle services, and is on seperate page 2011-04-01 01:18:01 -07:00
tags_controller.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
users_controller.rb drop requests table wip 2011-04-06 19:01:41 -07:00