Browse code Merge pull request #1332 from DMPRoadmap/development Bug fixes and enhancements for Sprint ending on 3/28/18 dev
commit a59c966035bdc68ee0b44a288ccbb63e2afb926e 2 parents 9351617 + 3837a61 Brian Riley authored on 28 Mar 2018 GitHub committed on 28 Mar 2018

Showing 63 changed files

• CONTRIBUTING.md
• Gemfile
• Gemfile.lock
• app/controllers/concerns/paginable.rb
• app/controllers/paginable/plans_controller.rb
• app/controllers/paginable/users_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/public_pages_controller.rb
• app/controllers/super_admin/orgs_controller.rb
• app/controllers/super_admin/users_controller.rb
• app/controllers/users_controller.rb
• app/mailers/user_mailer.rb
• app/models/plan.rb
• app/models/user.rb
• app/policies/plan_policy.rb
• app/policies/user_policy.rb
• app/views/devise/registrations/_personal_details.html.erb
• app/views/guidances/admin_index.html.erb
• app/views/layouts/_paginable.html.erb
• app/views/paginable/plans/_privately_visible.html.erb
• app/views/paginable/users/_index.html.erb
• app/views/phases/_guidances_notes.html.erb
• app/views/plans/_navigation.html.erb
• app/views/plans/_share_form.html.erb
• app/views/public_pages/plan_index.html.erb
• app/views/public_pages/template_export.docx.erb
• app/views/public_pages/template_export.pdf.erb
• app/views/shared/_my_org.html.erb
• app/views/shared/_search.html.erb
• app/views/shared/export/_plan_coversheet.erb
• app/views/super_admin/users/edit.html.erb
• app/views/users/_admin_grant_permissions.html.erb
• app/views/users/admin_index.html.erb
• config/locale/en_US/app.po
• 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/20171024214257_add_links_to_orgs.rb
• db/migrate/20171124133802_add_links_to_templates.rb
• db/migrate/20180315161757_add_active_to_users.rb
• db/schema.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/utils/ariatiseForm.js
• lib/assets/javascripts/utils/autoComplete.js
• lib/assets/javascripts/utils/paginable.js
• lib/assets/javascripts/utils/validation.js
• lib/assets/javascripts/views/plans/new.js
• lib/assets/javascripts/views/questions/edit.js
• lib/assets/javascripts/views/questions/new.js
• lib/assets/javascripts/views/questions/new_edit.js
• lib/assets/javascripts/views/super_admin/users/edit.js
• lib/assets/javascripts/views/users/admin_grant_permissions.js
• lib/assets/stylesheets/overrides.scss
• lib/tasks/gettext.rake
• test/functional/plans_controller_test.rb
• test/functional/super_admin/orgs_controller_test.rb
• test/functional/super_admin/users_controller_test.rb
• test/integration/paginable_flows_test.rb
• test/integration/user_activation_test.rb
• test/unit/user_test.rb

Ignore Space Show notes View CONTRIBUTING.md

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View app/controllers/concerns/paginable.rb

Ignore Space Show notes View app/controllers/paginable/plans_controller.rb

Ignore Space Show notes View app/controllers/paginable/users_controller.rb

Ignore Space Show notes View app/controllers/plans_controller.rb

Ignore Space Show notes View app/controllers/public_pages_controller.rb

Ignore Space Show notes View app/controllers/super_admin/orgs_controller.rb

Ignore Space Show notes View app/controllers/super_admin/users_controller.rb 0 → 100644

Ignore Space Show notes View app/controllers/users_controller.rb

Ignore Space Show notes View app/mailers/user_mailer.rb

Ignore Space Show notes View app/models/plan.rb

Ignore Space Show notes View app/models/user.rb

Ignore Space Show notes View app/policies/plan_policy.rb

Ignore Space Show notes View app/policies/user_policy.rb

Ignore Space Show notes View app/views/devise/registrations/_personal_details.html.erb

Ignore Space Show notes View app/views/guidances/admin_index.html.erb

Ignore Space Show notes View app/views/layouts/_paginable.html.erb

Ignore Space Show notes View app/views/paginable/plans/_privately_visible.html.erb

Ignore Space Show notes View app/views/paginable/users/_index.html.erb

Ignore Space Show notes View app/views/phases/_guidances_notes.html.erb

Ignore Space Show notes View app/views/plans/_navigation.html.erb

Ignore Space Show notes View app/views/plans/_share_form.html.erb

Ignore Space Show notes View app/views/public_pages/plan_index.html.erb

Ignore Space Show notes View app/views/public_pages/template_export.docx.erb

Ignore Space Show notes View app/views/public_pages/template_export.pdf.erb

Ignore Space Show notes View app/views/shared/_my_org.html.erb

Ignore Space Show notes View app/views/shared/_search.html.erb

Ignore Space Show notes View app/views/shared/export/_plan_coversheet.erb

Ignore Space Show notes View app/views/super_admin/users/edit.html.erb 0 → 100644

Ignore Space Show notes View app/views/users/_admin_grant_permissions.html.erb

Ignore Space Show notes View app/views/users/admin_index.html.erb

Ignore Space Show notes View config/locale/en_US/app.po

Ignore Space Show notes View config/locales/devise/devise.de.yml

Ignore Space Show notes View config/locales/devise/devise.en_GB.yml

Ignore Space Show notes View config/locales/devise/devise.en_US.yml

Ignore Space Show notes View config/locales/devise/devise.es.yml

Ignore Space Show notes View config/locales/devise/devise.fr.yml

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20171024214257_add_links_to_orgs.rb

Ignore Space Show notes View db/migrate/20171124133802_add_links_to_templates.rb

Ignore Space Show notes View db/migrate/20180315161757_add_active_to_users.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/assets/javascripts/application.js

Ignore Space Show notes View lib/assets/javascripts/utils/ariatiseForm.js

Ignore Space Show notes View lib/assets/javascripts/utils/autoComplete.js

Ignore Space Show notes View lib/assets/javascripts/utils/paginable.js

Ignore Space Show notes View lib/assets/javascripts/utils/validation.js

Ignore Space Show notes View lib/assets/javascripts/views/plans/new.js

Show notes View lib/assets/javascripts/views/questions/edit.js 100644 → 0

Show notes View lib/assets/javascripts/views/questions/new.js 100644 → 0

Ignore Space Show notes View lib/assets/javascripts/views/questions/new_edit.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/super_admin/users/edit.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/users/admin_grant_permissions.js

Ignore Space Show notes View lib/assets/stylesheets/overrides.scss

Ignore Space Show notes View lib/tasks/gettext.rake 0 → 100644

Ignore Space Show notes View test/functional/plans_controller_test.rb

Ignore Space Show notes View test/functional/super_admin/orgs_controller_test.rb

Ignore Space Show notes View test/functional/super_admin/users_controller_test.rb 0 → 100644

Ignore Space Show notes View test/integration/paginable_flows_test.rb

Ignore Space Show notes View test/integration/user_activation_test.rb 0 → 100644

Ignore Space Show notes View test/unit/user_test.rb

Show line notes below