|
Merge branch 'DMPRoadmap-master' into dmpopidor_branding
|
|---|
| CONTRIBUTING.md |
|---|
| app/controllers/concerns/paginable.rb |
|---|
| app/controllers/org_admin/questions_controller.rb |
|---|
| app/controllers/orgs_controller.rb |
|---|
| app/controllers/plans_controller.rb |
|---|
| app/controllers/roles_controller.rb |
|---|
| app/helpers/feedbacks_helper.rb 0 → 100644 |
|---|
| app/helpers/mailer_helper.rb |
|---|
| app/helpers/orgs_helper.rb 0 → 100644 |
|---|
| app/mailers/user_mailer.rb |
|---|
| app/models/plan.rb |
|---|
| app/views/branded/guidance_groups/admin_new.html.erb |
|---|
| app/views/branded/guidances/new_edit.html.erb |
|---|
| app/views/branded/layouts/application.html.erb |
|---|
| app/views/branded/org_admin/plans/index.html.erb |
|---|
| app/views/branded/plans/_edit_details.html.erb |
|---|
| app/views/branded/shared/_create_account_form.html.erb |
|---|
| app/views/devise/passwords/edit.html.erb |
|---|
| app/views/devise/registrations/_password_confirmation.html.erb |
|---|
| app/views/guidance_groups/_guidance_group_form.html.erb |
|---|
| app/views/guidance_groups/admin_new.html.erb |
|---|
| app/views/guidances/new_edit.html.erb |
|---|
| app/views/layouts/_footer.html.erb |
|---|
| app/views/layouts/application.html.erb |
|---|
| app/views/org_admin/phases/_overview.html.erb |
|---|
| app/views/org_admin/plans/index.html.erb |
|---|
| app/views/org_admin/question_options/_option_fields.html.erb |
|---|
| app/views/org_admin/shared/_theme_selector.html.erb |
|---|
| app/views/orgs/_feedback_form.html.erb |
|---|
| app/views/orgs/_profile_form.html.erb |
|---|
| app/views/paginable/guidance_groups/_index.html.erb |
|---|
| app/views/paginable/guidances/_index.html.erb |
|---|
| app/views/paginable/notifications/_index.html.erb |
|---|
| app/views/paginable/orgs/_index.html.erb |
|---|
| app/views/paginable/plans/_org_admin.html.erb |
|---|
| app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb |
|---|
| app/views/paginable/plans/_privately_visible.html.erb |
|---|
| app/views/paginable/plans/_publicly_visible.html.erb |
|---|
| app/views/paginable/templates/_customisable.html.erb |
|---|
| app/views/paginable/templates/_history.html.erb |
|---|
| app/views/paginable/templates/_index.html.erb |
|---|
| app/views/paginable/templates/_organisational.html.erb |
|---|
| app/views/paginable/templates/_publicly_visible.html.erb |
|---|
| app/views/paginable/themes/_index.html.erb |
|---|
| app/views/paginable/users/_index.html.erb |
|---|
| app/views/plans/_download_form.html.erb |
|---|
| app/views/plans/_edit_details.html.erb |
|---|
| app/views/plans/_share_form.html.erb |
|---|
| app/views/shared/_create_account_form.html.erb |
|---|
| app/views/user_mailer/_email_signature.html.erb |
|---|
| app/views/user_mailer/feedback_complete.html.erb |
|---|
| app/views/user_mailer/feedback_notification.html.erb |
|---|
| app/views/user_mailer/sharing_notification.html.erb |
|---|
| app/views/users/_notification_preferences.html.erb |
|---|
| app/views/users/admin_grant_permissions.html.erb |
|---|
| bin/bundle |
|---|
| bin/rails |
|---|
| bin/rake |
|---|
| bin/setup |
|---|
| lib/assets/javascripts/utils/ariatiseForm.js |
|---|
| lib/assets/javascripts/utils/isValidInputType.js |
|---|
| lib/assets/javascripts/utils/validation.js |
|---|
| lib/assets/javascripts/views/devise/registrations/edit.js |
|---|
| lib/assets/javascripts/views/guidances/new_edit.js |
|---|
| lib/assets/javascripts/views/org_admin/phases/new_edit.js |
|---|
| lib/assets/javascripts/views/org_admin/question_options/index.js |
|---|
| lib/assets/javascripts/views/orgs/admin_edit.js |
|---|
| lib/assets/javascripts/views/shared/create_account_form.js |
|---|
| lib/assets/javascripts/views/super_admin/notifications/edit.js |
|---|
| lib/assets/stylesheets/overrides.scss |
|---|
| lib/tasks/upgrade.rake |
|---|
| test/mailers/previews/user_mailer_preview.rb |
|---|