diaspora/app/controllers
Raphael Sofaer 9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
..
activity_streams Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
admins_controller.rb Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
apis_controller.rb WIP auth form and more oauth stuff 2011-06-08 11:55:11 -07:00
application_controller.rb Some view helper cleanup 2011-07-04 07:36:01 -07:00
apps_controller.rb Fix pagination in AppsController 2011-06-09 16:23:15 -07:00
aspect_memberships_controller.rb made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
aspects_controller.rb Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
authorizations_controller.rb corrected authorizations_controller_spec to assert on response codes 2011-06-29 17:10:43 -07:00
comments_controller.rb Make comments index ajaxy 2011-07-11 14:03:59 -07:00
contacts_controller.rb Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
conversation_visibilities_controller.rb made flash messages for conversations translatable 2011-03-30 16:52:43 +02:00
conversations_controller.rb start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
home_controller.rb remove remember aspects feature 2011-06-03 17:35:27 -07:00
invitations_controller.rb Fix specs after merge 2011-07-11 14:38:51 -07:00
likes_controller.rb cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
messages_controller.rb some better http status codes 2011-04-06 17:16:39 +02:00
notifications_controller.rb Use an explicit per_page param instead of switching on format 2011-07-03 21:16:58 -07:00
people_controller.rb fix peoples#aspect_membership_dropdown 2011-07-12 20:04:55 +02:00
photos_controller.rb Some view helper cleanup 2011-07-04 07:36:01 -07:00
post_visibilities_controller.rb fix the specs; pull back guid in post_visibilities_controller 2011-07-12 15:18:28 -07:00
posts_controller.rb Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
profiles_controller.rb Added test for new plantext tag without a # symbol and fixed broken code. 2011-06-25 23:37:51 -07:00
publics_controller.rb Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -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 A admin is now able to allow open invitations 2011-07-11 13:32:02 -07:00
sessions_controller.rb Reenable sessionscontroller after_filter 2011-07-12 17:01:40 -07:00
sockets_controller.rb fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
status_messages_controller.rb Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
tag_followings_controller.rb Pending spec for 500 on capital letters 2011-07-05 17:31:49 -07:00
tags_controller.rb Don't show commented tags in the tag stream for now, until we optimize that 2011-07-07 15:39:28 -07:00
tokens_controller.rb fix the build. 2011-07-04 16:53:43 -07:00
users_controller.rb Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 2011-07-19 10:44:00 -07:00
vanna_controller.rb Some view helper cleanup 2011-07-04 07:36:01 -07:00