Browse code resolved merge conflicts from merging development 2016-06-09 into CDL-MVP dev
commit 0e4e7f509bd075029e5717a2f23a8331d4310aca 2 parents 3d7bbc0 + 3f531ca Brian Riley authored on 9 Jun 2017

Showing 173 changed files

• Gemfile
• Gemfile.lock
• app/controllers/admin/annotations_controller.rb
• app/controllers/admin/answers_controller.rb
• app/controllers/admin/exported_plans_controller.rb
• app/controllers/admin/guidance_groups_controller.rb
• app/controllers/admin/guidances_controller.rb
• app/controllers/admin/identifier_schemes_controller.rb
• app/controllers/admin/languages_controller.rb
• app/controllers/admin/notes_controller.rb
• app/controllers/admin/orgs_controller.rb
• app/controllers/admin/perms_controller.rb
• app/controllers/admin/phases_controller.rb
• app/controllers/admin/plans_controller.rb
• app/controllers/admin/question_formats_controller.rb
• app/controllers/admin/question_options_controller.rb
• app/controllers/admin/questions_controller.rb
• app/controllers/admin/regions_controller.rb
• app/controllers/admin/roles_controller.rb
• app/controllers/admin/sections_controller.rb
• app/controllers/admin/splash_logs_controller.rb
• app/controllers/admin/suggested_answers_controller.rb
• app/controllers/admin/templates_controller.rb
• app/controllers/admin/themes_controller.rb
• app/controllers/admin/token_permission_types_controller.rb
• app/controllers/admin/user_identifiers_controller.rb
• app/controllers/admin/users_controller.rb
• app/controllers/annotations_controller.rb
• app/controllers/answers_controller.rb
• app/controllers/application_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/questions_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/roles_controller.rb
• app/controllers/suggested_answers_controller.rb
• app/controllers/templates_controller.rb
• app/controllers/users/omniauth_callbacks_controller.rb
• app/dashboards/annotation_dashboard.rb
• app/dashboards/org_dashboard.rb
• app/dashboards/question_dashboard.rb
• app/dashboards/suggested_answer_dashboard.rb
• app/dashboards/user_dashboard.rb
• app/models/annotation.rb
• app/models/answer.rb
• app/models/exported_plan.rb
• app/models/org.rb
• app/models/phase.rb
• app/models/plan.rb
• app/models/question.rb
• app/models/question_format.rb
• app/models/question_option.rb
• app/models/section.rb
• app/models/suggested_answer.rb
• app/models/template.rb
• app/models/user.rb
• app/policies/annotation_policy.rb
• app/policies/phase_policy.rb
• app/policies/plan_policy.rb
• app/policies/suggested_answer_policy.rb
• app/policies/template_policy.rb
• app/views/admin/application/_admin_header.html.erb
• app/views/admin/application/_sidebar.html.erb
• app/views/administrate/application/_admin_header.html.erb
• app/views/administrate/application/_navigation.html.erb
• app/views/administrate/application/_search.html.erb
• app/views/annotations/_add_annotation.html.erb
• app/views/annotations/_edit_annotation.html.erb
• app/views/annotations/_show_annotation.html.erb
• app/views/answers/_form_fields.html.erb
• app/views/answers/_locking.html.erb
• app/views/answers/_new_edit.html.erb
• app/views/answers/_status.html.erb
• app/views/answers/update.js.erb
• app/views/devise/registrations/_external_identifier.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.html.erb
• app/views/guidances/_add_guidance.html.erb
• app/views/guidances/_edit_guidance.html.erb
• app/views/guidances/_guidance_display.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/orgs/admin_edit.html.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/_answer.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_answer_form_ro.html.erb
• app/views/phases/_edit_phase.html.erb
• app/views/phases/_show_phase.html.erb
• app/views/phases/admin_add.html.erb
• app/views/phases/admin_show.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_answer_form.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/_progress.html.erb
• app/views/plans/edit.html.erb
• app/views/plans/export.docx.caracal
• app/views/plans/export.docx.erb
• app/views/plans/export.html.erb
• app/views/plans/export.pdf.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/questions/_preview_question.html.erb
• app/views/questions/_show_question.html.erb
• app/views/sections/_add_section.html.erb
• app/views/sections/_edit_section.html.erb
• app/views/sections/_progress.html.erb
• app/views/shared/_accessible_combobox.html.erb
• app/views/shared/_register_form.html.erb
• app/views/suggested_answers/_add_suggested_answer.html.erb
• app/views/suggested_answers/_edit_suggested_answer.html.erb
• app/views/suggested_answers/_show_suggested_answer.html.erb
• app/views/templates/_admin_nav_tabs.html.erb
• app/views/templates/_edit_annotations.html.erb
• app/views/templates/_edit_template.html.erb
• app/views/templates/_show_phases_sections.html.erb
• app/views/templates/_show_template.html.erb
• app/views/templates/admin_index.html.erb
• app/views/templates/admin_new.html.erb
• app/views/templates/admin_template.html.erb
• app/views/templates/admin_template_history.html.erb
• app/views/user_mailer/permissions_change_notification.html.erb
• app/views/user_mailer/project_access_removed_notification.html.erb
• app/views/user_mailer/sharing_notification.html.erb
• app/views/users/admin_grant_permissions.html.erb
• config/application.rb
• config/initializers/fast_gettext.rb
• config/locale/app.pot
• config/locale/de/app.po
• config/locale/en_GB/app.po
• config/locale/en_US/app.po
• config/locale/es/app.po
• config/locale/fr/app.po
• config/locales/devise/devise.en_GB.yml
• config/locales/devise/devise.en_US.yml
• config/routes.rb
• config/tinymce.yml
• db/schema.rb
• db/seeds.rb
• lib/assets/bg.gif
• lib/assets/javascripts/admin.js
• lib/assets/javascripts/answers/status.js
• lib/assets/javascripts/application.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/shared/register_form.js
• lib/assets/stylesheets/admin.css.less
• lib/assets/stylesheets/bootstrap_and_overrides.css.less
• lib/assets/stylesheets/roadmap-form.scss
• lib/tasks/migrate.rake
• public/shib_logo.png
• test/functional/annotations_controller_test.rb
• test/functional/answers_controller_test.rb
• test/functional/phases_controller_test.rb
• test/functional/plans_controller_test.rb
• test/functional/questions_controller_test.rb
• test/functional/registrations_controller_test.rb
• test/functional/roles_controller_test.rb
• test/functional/sessions_controller_test.rb
• test/functional/suggested_answers_controller_test.rb
• test/functional/templates_controller_test.rb
• test/functional/users/omniauth_callbacks_controller_test.rb
• test/integration/answer_locking_test.rb
• test/integration/authentication_test.rb
• test/integration/template_selection_test.rb
• test/integration/template_versioning_test.rb
• test/test_helper.rb
• test/unit/annotation_test.rb
• test/unit/org_test.rb
• test/unit/question_test.rb
• test/unit/suggested_answer_test.rb
• test/unit/template_test.rb

Ignore Space Show notes View Gemfile
Too large

Ignore Space Show notes View Gemfile.lock
Too large

Ignore Space Show notes View app/controllers/admin/annotations_controller.rb 0 → 100644
Too large

Ignore Space Show notes View app/controllers/admin/answers_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/exported_plans_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/guidance_groups_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/guidances_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/identifier_schemes_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/languages_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/notes_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/orgs_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/perms_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/phases_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/plans_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/question_formats_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/question_options_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/questions_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/regions_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/roles_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/sections_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/splash_logs_controller.rb
Too large

Show notes View app/controllers/admin/suggested_answers_controller.rb 100644 → 0
Too large

Ignore Space Show notes View app/controllers/admin/templates_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/themes_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/token_permission_types_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/user_identifiers_controller.rb
Too large

Ignore Space Show notes View app/controllers/admin/users_controller.rb
Too large

Ignore Space Show notes View app/controllers/annotations_controller.rb 0 → 100644
Too large

Ignore Space Show notes View app/controllers/answers_controller.rb
Too large

Ignore Space Show notes View app/controllers/application_controller.rb
Too large

Ignore Space Show notes View app/controllers/phases_controller.rb
Too large

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

Ignore Space Show notes View app/controllers/questions_controller.rb
Too large

Ignore Space Show notes View app/controllers/registrations_controller.rb
Too large

Ignore Space Show notes View app/controllers/roles_controller.rb
Too large

Show notes View app/controllers/suggested_answers_controller.rb 100644 → 0
Too large

Ignore Space Show notes View app/controllers/templates_controller.rb
Too large

Ignore Space Show notes View app/controllers/users/omniauth_callbacks_controller.rb
Too large

Ignore Space Show notes View app/dashboards/annotation_dashboard.rb 0 → 100644
Too large

Ignore Space Show notes View app/dashboards/org_dashboard.rb
Too large

Ignore Space Show notes View app/dashboards/question_dashboard.rb
Too large

Show notes View app/dashboards/suggested_answer_dashboard.rb 100644 → 0
Too large

Ignore Space Show notes View app/dashboards/user_dashboard.rb
Too large

Ignore Space Show notes View app/models/annotation.rb 0 → 100644
Too large

Ignore Space Show notes View app/models/answer.rb
Too large

Ignore Space Show notes View app/models/exported_plan.rb
Too large

Ignore Space Show notes View app/models/org.rb
Too large

Ignore Space Show notes View app/models/phase.rb
Too large

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

Ignore Space Show notes View app/models/question.rb
Too large

Ignore Space Show notes View app/models/question_format.rb
Too large

Ignore Space Show notes View app/models/question_option.rb
Too large

Ignore Space Show notes View app/models/section.rb
Too large

Show notes View app/models/suggested_answer.rb 100644 → 0
Too large

Ignore Space Show notes View app/models/template.rb
Too large

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

Ignore Space Show notes View app/policies/annotation_policy.rb 0 → 100644
Too large

Ignore Space Show notes View app/policies/phase_policy.rb
Too large

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

Show notes View app/policies/suggested_answer_policy.rb 100644 → 0
Too large

Ignore Space Show notes View app/policies/template_policy.rb
Too large

Show notes View app/views/admin/application/_admin_header.html.erb 100644 → 0
Too large

Show notes View app/views/admin/application/_sidebar.html.erb 100644 → 0
Too large

Ignore Space Show notes View app/views/administrate/application/_admin_header.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/administrate/application/_navigation.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/administrate/application/_search.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/annotations/_add_annotation.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/annotations/_edit_annotation.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/annotations/_show_annotation.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/answers/_form_fields.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/answers/_locking.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/answers/_new_edit.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/answers/_status.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/answers/update.js.erb
Too large

Ignore Space Show notes View app/views/devise/registrations/_external_identifier.html.erb
Too large

Ignore Space Show notes View app/views/devise/registrations/edit.html.erb
Too large

Ignore Space Show notes View app/views/guidance_groups/admin_edit.html.erb
Too large

Ignore Space Show notes View app/views/guidance_groups/admin_new.html.erb
Too large

Ignore Space Show notes View app/views/guidances/_add_guidance.html.erb
Too large

Ignore Space Show notes View app/views/guidances/_edit_guidance.html.erb
Too large

Ignore Space Show notes View app/views/guidances/_guidance_display.html.erb
Too large

Ignore Space Show notes View app/views/guidances/admin_edit.html.erb
Too large

Ignore Space Show notes View app/views/guidances/admin_new.html.erb
Too large

Ignore Space Show notes View app/views/layouts/_signin_signout.html.erb
Too large

Ignore Space Show notes View app/views/orgs/admin_edit.html.erb
Too large

Ignore Space Show notes View app/views/phases/_add_note.html.erb
Too large

Show notes View app/views/phases/_answer.html.erb 100644 → 0
Too large

Ignore Space Show notes View app/views/phases/_answer_form.html.erb
Too large

Show notes View app/views/phases/_answer_form_ro.html.erb 100644 → 0
Too large

Ignore Space Show notes View app/views/phases/_edit_phase.html.erb
Too large

Ignore Space Show notes View app/views/phases/_show_phase.html.erb
Too large

Ignore Space Show notes View app/views/phases/admin_add.html.erb
Too large

Ignore Space Show notes View app/views/phases/admin_show.html.erb
Too large

Ignore Space Show notes View app/views/phases/edit.html.erb
Too large

Show notes View app/views/plans/_answer_form.html.erb 100644 → 0
Too large

Ignore Space Show notes View app/views/plans/_plan_details.html.erb
Too large

Ignore Space Show notes View app/views/plans/_progress.html.erb
Too large

Ignore Space Show notes View app/views/plans/edit.html.erb
Too large

Show notes View app/views/plans/export.docx.caracal 100644 → 0
Too large

Ignore Space Show notes View app/views/plans/export.docx.erb
Too large

Ignore Space Show notes View app/views/plans/export.html.erb
Too large

Ignore Space Show notes View app/views/plans/export.pdf.erb
Too large

Ignore Space Show notes View app/views/questions/_add_question.html.erb
Too large

Ignore Space Show notes View app/views/questions/_edit_question.html.erb
Too large

Ignore Space Show notes View app/views/questions/_preview_question.html.erb
Too large

Ignore Space Show notes View app/views/questions/_show_question.html.erb
Too large

Ignore Space Show notes View app/views/sections/_add_section.html.erb
Too large

Ignore Space Show notes View app/views/sections/_edit_section.html.erb
Too large

Ignore Space Show notes View app/views/sections/_progress.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/shared/_accessible_combobox.html.erb
Too large

Ignore Space Show notes View app/views/shared/_register_form.html.erb
Too large

Show notes View app/views/suggested_answers/_add_suggested_answer.html.erb 100644 → 0
Too large

Show notes View app/views/suggested_answers/_edit_suggested_answer.html.erb 100644 → 0
Too large

Show notes View app/views/suggested_answers/_show_suggested_answer.html.erb 100644 → 0
Too large

Ignore Space Show notes View app/views/templates/_admin_nav_tabs.html.erb
Too large

Ignore Space Show notes View app/views/templates/_edit_annotations.html.erb
Too large

Ignore Space Show notes View app/views/templates/_edit_template.html.erb
Too large

Ignore Space Show notes View app/views/templates/_show_phases_sections.html.erb
Too large

Ignore Space Show notes View app/views/templates/_show_template.html.erb
Too large

Ignore Space Show notes View app/views/templates/admin_index.html.erb
Too large

Ignore Space Show notes View app/views/templates/admin_new.html.erb
Too large

Ignore Space Show notes View app/views/templates/admin_template.html.erb
Too large

Ignore Space Show notes View app/views/templates/admin_template_history.html.erb
Too large

Ignore Space Show notes View app/views/user_mailer/permissions_change_notification.html.erb
Too large

Ignore Space Show notes View app/views/user_mailer/project_access_removed_notification.html.erb
Too large

Ignore Space Show notes View app/views/user_mailer/sharing_notification.html.erb
Too large

Ignore Space Show notes View app/views/users/admin_grant_permissions.html.erb
Too large

Ignore Space Show notes View config/application.rb
Too large

Ignore Space Show notes View config/initializers/fast_gettext.rb
Too large

Ignore Space Show notes View config/locale/app.pot
Too large

Ignore Space Show notes View config/locale/de/app.po
Too large

Ignore Space Show notes View config/locale/en_GB/app.po
Too large

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

Ignore Space Show notes View config/locale/es/app.po
Too large

Ignore Space Show notes View config/locale/fr/app.po
Too large

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

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

Ignore Space Show notes View config/routes.rb
Too large

Ignore Space Show notes View config/tinymce.yml
Too large

Ignore Space Show notes View db/schema.rb
Too large

Ignore Space Show notes View db/seeds.rb
Too large

Show notes View lib/assets/bg.gif 120000 → 0
Too large

Ignore Space Show notes View lib/assets/javascripts/admin.js
Too large

Ignore Space Show notes View lib/assets/javascripts/answers/status.js 0 → 100644
Too large

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

Ignore Space Show notes View lib/assets/javascripts/plans.js
Too large

Ignore Space Show notes View lib/assets/javascripts/shared/register_form.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/admin.css.less
Too large

Ignore Space Show notes View lib/assets/stylesheets/bootstrap_and_overrides.css.less
Too large

Ignore Space Show notes View lib/assets/stylesheets/roadmap-form.scss
Too large

Ignore Space Show notes View lib/tasks/migrate.rake
Too large

Show notes View public/shib_logo.png 100644 → 0
Too large

Ignore Space Show notes View test/functional/annotations_controller_test.rb 0 → 100644
Too large

Ignore Space Show notes View test/functional/answers_controller_test.rb
Too large

Ignore Space Show notes View test/functional/phases_controller_test.rb
Too large

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

Ignore Space Show notes View test/functional/questions_controller_test.rb
Too large

Ignore Space Show notes View test/functional/registrations_controller_test.rb
Too large

Ignore Space Show notes View test/functional/roles_controller_test.rb
Too large

Ignore Space Show notes View test/functional/sessions_controller_test.rb
Too large

Show notes View test/functional/suggested_answers_controller_test.rb 100644 → 0
Too large

Ignore Space Show notes View test/functional/templates_controller_test.rb
Too large

Ignore Space Show notes View test/functional/users/omniauth_callbacks_controller_test.rb
Too large

Ignore Space Show notes View test/integration/answer_locking_test.rb
Too large

Ignore Space Show notes View test/integration/authentication_test.rb
Too large

Ignore Space Show notes View test/integration/template_selection_test.rb
Too large

Ignore Space Show notes View test/integration/template_versioning_test.rb
Too large

Ignore Space Show notes View test/test_helper.rb
Too large

Ignore Space Show notes View test/unit/annotation_test.rb 0 → 100644
Too large

Ignore Space Show notes View test/unit/org_test.rb
Too large

Ignore Space Show notes View test/unit/question_test.rb
Too large

Show notes View test/unit/suggested_answer_test.rb 100644 → 0
Too large

Ignore Space Show notes View test/unit/template_test.rb
Too large

Show line notes below