GitBucket
|
added active flag to users and updated admin users page to allow admin to update the value
updated column text Updated inactive message updated mailers to exclude inactive users except for sharing and devise emails about their account added tests for super admin users. added functionality for super admin to edit user info added org and created columns to users table swapped in good schema.rb removed debug line added new field to schem.rb manually fixed schema.rb added button to go back to users and switched from and to && fixed typo in schema.rb |
|---|
briley
authored
on 15 Mar 2018
Brian Riley
committed
on 20 Mar 2018
|
| app/controllers/super_admin/orgs_controller.rb |
|---|
| app/controllers/super_admin/users_controller.rb 0 → 100644 |
|---|
| app/controllers/users_controller.rb |
|---|
| app/mailers/user_mailer.rb |
|---|
| app/models/user.rb |
|---|
| app/policies/user_policy.rb |
|---|
| app/views/paginable/users/_index.html.erb |
|---|
| app/views/shared/_my_org.html.erb |
|---|
| app/views/super_admin/users/edit.html.erb 0 → 100644 |
|---|
| app/views/users/_admin_grant_permissions.html.erb |
|---|
| config/locales/devise/devise.de.yml |
|---|
| config/locales/devise/devise.en_GB.yml |
|---|
| config/locales/devise/devise.en_US.yml |
|---|
| config/locales/devise/devise.es.yml |
|---|
| config/locales/devise/devise.fr.yml |
|---|
| config/routes.rb |
|---|
| db/migrate/20180315161757_add_active_to_users.rb 0 → 100644 |
|---|
| db/schema.rb |
|---|
| lib/assets/javascripts/application.js |
|---|
| lib/assets/javascripts/utils/autoComplete.js |
|---|
| lib/assets/javascripts/views/super_admin/users/edit.js 0 → 100644 |
|---|
| lib/assets/javascripts/views/users/admin_grant_permissions.js |
|---|
| lib/assets/stylesheets/overrides.scss |
|---|
| test/functional/super_admin/orgs_controller_test.rb |
|---|
| test/functional/super_admin/users_controller_test.rb 0 → 100644 |
|---|
| test/integration/user_activation_test.rb 0 → 100644 |
|---|
| test/unit/user_test.rb |
|---|