nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/controllers
History
danielgrippi 60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
2011-05-12 15:49:51 -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 The specs are green on my dev machine, let's see if CI is still red 2011-04-13 15:19:17 -07:00
application_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
aspect_memberships_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
aspects_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
comments_controller.rb fixed js error on new comments on statusmessage show page 2011-05-06 15:29:39 -07:00
contacts_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
conversation_visibilities_controller.rb made flash messages for conversations translatable 2011-03-30 16:52:43 +02:00
conversations_controller.rb people.diaspora_handle, not profiles.diaspora_handle 2011-05-03 11:39:34 -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 Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
messages_controller.rb some better http status codes 2011-04-06 17:16:39 +02:00
notifications_controller.rb Notifications should be sorted by updated_at 2011-04-12 14:06:58 -07:00
people_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
photos_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -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 Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
sessions_controller.rb basic functionality done, fixing rough edges 2011-03-28 18:11:59 -07:00
sockets_controller.rb Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
status_messages_controller.rb Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
tags_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
users_controller.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00