Merge branch 'close_account_rework'
No related branches found
No related tags found
Showing
- app/controllers/people_controller.rb 5 additions, 2 deletionsapp/controllers/people_controller.rb
- app/controllers/publics_controller.rb 12 additions, 0 deletionsapp/controllers/publics_controller.rb
- app/controllers/users_controller.rb 2 additions, 4 deletionsapp/controllers/users_controller.rb
- app/helpers/aspects_helper.rb 2 additions, 0 deletionsapp/helpers/aspects_helper.rb
- app/models/account_deleter.rb 112 additions, 0 deletionsapp/models/account_deleter.rb
- app/models/account_deletion.rb 50 additions, 0 deletionsapp/models/account_deletion.rb
- app/models/contact.rb 12 additions, 2 deletionsapp/models/contact.rb
- app/models/invitation.rb 11 additions, 0 deletionsapp/models/invitation.rb
- app/models/jobs/delete_account.rb 3 additions, 4 deletionsapp/models/jobs/delete_account.rb
- app/models/person.rb 16 additions, 5 deletionsapp/models/person.rb
- app/models/profile.rb 12 additions, 0 deletionsapp/models/profile.rb
- app/models/share_visibility.rb 7 additions, 0 deletionsapp/models/share_visibility.rb
- app/models/status_message.rb 4 additions, 0 deletionsapp/models/status_message.rb
- app/models/user.rb 28 additions, 5 deletionsapp/models/user.rb
- app/views/users/edit.html.haml 39 additions, 10 deletionsapp/views/users/edit.html.haml
- config/locales/diaspora/en.yml 13 additions, 1 deletionconfig/locales/diaspora/en.yml
- db/migrate/20111103184050_add_closed_account_flag_to_person.rb 9 additions, 0 deletions...grate/20111103184050_add_closed_account_flag_to_person.rb
- db/migrate/20111109023618_create_account_deletions.rb 12 additions, 0 deletionsdb/migrate/20111109023618_create_account_deletions.rb
- db/schema.rb 11 additions, 5 deletionsdb/schema.rb
- features/closes_account.feature 12 additions, 8 deletionsfeatures/closes_account.feature
Loading
Please register or sign in to comment