fixed merge conflicts in schema.rb and test_helper.rb
dev
commit 7fda899a9ed2b42d12fd3ef43bda12357b7628f4
2 parents 0342aee + 7185a57
@briley briley authored on 28 Feb 2017
Showing 248 changed files
View
Gemfile
Too large
View
Gemfile.lock
Too large
View
app/admin/organisation_type.rb 100644 → 0
Too large
View
app/controllers/answers_controller.rb
Too large
View
app/controllers/api/v0/base_controller.rb
Too large
View
app/controllers/api/v0/plans_controller.rb
Too large
View
app/controllers/api/v0/statistics_controller.rb
Too large
View
app/controllers/application_controller.rb
Too large
View
app/controllers/guidance_groups_controller.rb
Too large
View
app/controllers/guidances_controller.rb
Too large
View
app/controllers/home_controller.rb
Too large
View
app/controllers/notes_controller.rb
Too large
View
app/controllers/phases_controller.rb 0 → 100644
Too large
View
app/controllers/plans_controller.rb
Too large
View
app/controllers/projects_controller.rb
Too large
View
app/controllers/settings/plans_controller.rb
Too large
View
app/controllers/static_pages_controller.rb
Too large
View
app/controllers/templates_controller.rb
Too large
View
app/controllers/users/omniauth_callbacks_controller.rb
Too large
View
app/controllers/users/omniauth_shibboleth_request_controller.rb
Too large
View
app/helpers/application_helper.rb
Too large
View
app/helpers/plans_helper.rb 0 → 100644
Too large
View
app/helpers/projects_helper.rb 100644 → 0
Too large
View
app/models/ability.rb 100644 → 0
Too large
View
app/models/admin_user.rb 100644 → 0
Too large
View
app/models/answer.rb
Too large
View
app/models/exported_plan.rb
Too large
View
app/models/file_upload.rb 100644 → 0
Too large
View
app/models/guidance.rb
Too large
View
app/models/guidance_group.rb
Too large
View
app/models/new_plan.rb 100644 → 0
Too large
View
app/models/note.rb
Too large
View
app/models/org.rb
Too large
View
app/models/org_token_permission.rb 100644 → 0
Too large
View
app/models/organisation_type.rb 100644 → 0
Too large
View
app/models/perm.rb
Too large
View
app/models/phase.rb
Too large
View
app/models/plan.rb
Too large
View
app/models/plan_guidance_group.rb 0 → 100644
Too large
View
app/models/question.rb
Too large
View
app/models/question_format.rb
Too large
View
app/models/question_option.rb
Too large
View
app/models/region.rb
Too large
View
app/models/region_group.rb 100644 → 0
Too large
View
app/models/role.rb
Too large
View
app/models/section.rb
Too large
View
app/models/settings/plan_list.rb
Too large
View
app/models/suggested_answer.rb
Too large
View
app/models/template.rb
Too large
View
app/models/theme.rb
Too large
View
app/models/token_permission_type.rb
Too large
View
app/models/user.rb
Too large
View
app/models/users_perm.rb 100644 → 0
Too large
View
app/policies/guidance_policy.rb
Too large
View
app/policies/note_policy.rb
Too large
View
app/policies/plan_policy.rb
Too large
View
app/policies/template_policy.rb
Too large
View
app/validators/answer_for_correct_template_validator.rb 0 → 100644
Too large
View
app/validators/email_validator.rb
Too large
View
app/views/admin/dmptemplates/settings.html.erb
Too large
View
app/views/api/v0/statistics/plans.json.jbuilder
Too large
View
app/views/api/v0/statistics/plans_by_template.json.jbuilder
Too large
View
app/views/dmptemplates/_add_question.html.erb 100644 → 0
Too large
View
app/views/dmptemplates/_admin_nav_tabs.html.erb 100644 → 0
Too large
View
app/views/home/index.html.erb
Too large
View
app/views/layouts/_footer.html.erb
Too large
View
app/views/layouts/_navigation.html.erb
Too large
View
app/views/layouts/_signin_signout.html.erb
Too large
View
app/views/layouts/application.html.erb
Too large
View
app/views/phases/_add_note.html.erb 0 → 100644
Too large
View
app/views/phases/_answer_form.html.erb 0 → 100644
Too large
View
app/views/phases/_answer_form_ro.html.erb 0 → 100644
Too large
View
app/views/phases/_archive_note.html.erb 0 → 100644
Too large
View
app/views/phases/_edit_note.html.erb 0 → 100644
Too large
View
app/views/phases/_list_notes.html.erb 0 → 100644
Too large
View
app/views/phases/_note.html.erb 0 → 100644
Too large
View
app/views/phases/_view_note.html.erb 0 → 100644
Too large
View
app/views/phases/edit.html.erb 0 → 100644
Too large
View
app/views/plans/_add_note.html.erb 100644 → 0
Too large
View
app/views/plans/_archive_note.html.erb 100644 → 0
Too large
View
app/views/plans/_dropdowns_new_plan.html.erb 0 → 100644
Too large
View
app/views/plans/_edit_note.html.erb 100644 → 0
Too large
View
app/views/plans/_export.html.erb
Too large
View
app/views/plans/_list_notes.html.erb 100644 → 0
Too large
View
app/views/plans/_note.html.erb 100644 → 0
Too large
View
app/views/plans/_plan_details.html.erb 0 → 100644
Too large
View
app/views/plans/_plan_list_head.html.erb 0 → 100644
Too large
View
app/views/plans/_plan_list_item.html.erb 0 → 100644
Too large
View
app/views/plans/_plan_nav_tabs.html.erb 0 → 100644
Too large
View
app/views/plans/_plan_title.html.erb 0 → 100644
Too large
View
app/views/plans/_toolbar.html.erb 0 → 100644
Too large
View
app/views/plans/_view_note.html.erb 100644 → 0
Too large
View
app/views/plans/create.html.erb 0 → 100644
Too large
View
app/views/plans/edit.html.erb
Too large
View
app/views/plans/export.html.erb
Too large
View
app/views/plans/index.html.erb
Too large
View
app/views/plans/new.html.erb 0 → 100644
Too large
View
app/views/plans/share.html.erb 0 → 100644
Too large
View
app/views/plans/show.html.erb
Too large
View
app/views/projects/_dropdowns_new_project.html.erb
Too large
View
app/views/projects/_project_list_head.html.erb 100644 → 0
Too large
View
app/views/projects/_project_list_item.html.erb 100644 → 0
Too large
View
app/views/projects/_toolbar.html.erb 100644 → 0
Too large
View
app/views/projects/index.html.erb 100644 → 0
Too large
View
app/views/projects/new.html.erb 100644 → 0
Too large
View
app/views/settings/phases/._export_formatting_form.html.erb.swp 0 → 100644
Too large
View
app/views/settings/phases/_export_formatting_form.html.erb 0 → 100644
Too large
View
app/views/settings/phases/show.html.erb 0 → 100644
Too large
View
app/views/settings/phases/show.partial.erb 0 → 100644
Too large
View
app/views/settings/plans/_export_formatting_form.html.erb 100644 → 0
Too large
View
app/views/settings/plans/show.html.erb
Too large
View
app/views/settings/plans/show.partial.erb 100644 → 0
Too large
View
app/views/settings/projects/show.html.erb 100644 → 0
Too large
View
app/views/shared/_export_links.html.erb
Too large
View
app/views/shared/_login_form.html.erb
Too large
View
app/views/shared/_register_form.html.erb
Too large
View
app/views/static_pages/public_plans.html.erb
Too large
View
app/views/templates/_add_guidance.html.erb
Too large
View
app/views/templates/_add_section.html.erb
Too large
View
app/views/templates/_admin_nav_tabs.html.erb
Too large
View
app/views/templates/_edit_annotations.html.erb 0 → 100644
Too large
View
app/views/templates/_edit_guidance.html.erb
Too large
View
app/views/templates/_edit_phase.html.erb
Too large
View
app/views/templates/_edit_question.html.erb
Too large
View
app/views/templates/_edit_section.html.erb
Too large
View
app/views/templates/_edit_suggested_answer.html.erb
Too large
View
app/views/templates/_edit_template.html.erb
Too large
View
app/views/templates/_edit_version.html.erb 100644 → 0
Too large
View
app/views/templates/_guidance_display.html.erb
Too large
View
app/views/templates/_option_fields.html.erb
Too large
View
app/views/templates/_preview_question.html.erb
Too large
View
app/views/templates/_show_phase.html.erb
Too large
View
app/views/templates/_show_phases_sections.html.erb
Too large
View
app/views/templates/_show_question.html.erb
Too large
View
app/views/templates/_show_section.html.erb
Too large
View
app/views/templates/_show_suggested_answer.html.erb
Too large
View
app/views/templates/_show_template.html.erb
Too large
View
app/views/templates/_show_version.html.erb 100644 → 0
Too large
View
app/views/templates/_versions_table.html.erb 100644 → 0
Too large
View
app/views/templates/admin_addphase.html.erb
Too large
View
app/views/templates/admin_index.html.erb
Too large
View
app/views/templates/admin_new.html.erb
Too large
View
app/views/templates/admin_phase.html.erb
Too large
View
app/views/templates/admin_previewphase.html.erb
Too large
View
app/views/templates/admin_template.html.erb
Too large
View
app/views/templates/admin_template_history.html.erb 0 → 100644
Too large
View
config/environments/development.rb
Too large
View
config/initializers/fast_gettext.rb 0 → 100644
Too large
View
config/initializers/locale.rb
Too large
View
config/locale/app.pot 0 → 100644
Too large
View
config/locale/de/app.po 0 → 100644
Too large
View
config/locale/en-UK/app.po 0 → 100644
Too large
View
config/locale/en-US/app.po 0 → 100644
Too large
View
config/locale/es/app.po 0 → 100644
Too large
View
config/locale/fr/app.po 0 → 100644
Too large
View
config/locales/de.yml
Too large
View
config/locales/en-UK.yml
Too large
View
config/locales/en-US.yml
Too large
View
config/locales/es.yml
Too large
View
config/locales/fr.yml
Too large
View
config/routes.rb
Too large
View
db/migrate/20131118094629_change_versions_published.rb
Too large
View
db/migrate/20150809210811_add_field_to_questions.rb
Too large
View
db/migrate/20151208142029_add_field_to_guidances.rb
Too large
View
db/migrate/20151208142836_update_field_in_guidance_groups.rb
Too large
View
db/migrate/20161021100420_single_organisation_for_users.rb
Too large
View
db/migrate/20161122152339_new_plan_template_structure.rb
Too large
View
db/migrate/20161205095624_replacing_organisation_types_with_bitflags.rb
Too large
View
db/migrate/20161205095625_replacing_plan_roles_with_bitflags.rb
Too large
View
db/migrate/20161206122926_add_foreign_keys.rb
Too large
View
db/migrate/20161208122123_single_group_for_guidance.rb
Too large
View
db/migrate/20170124235829_add_visibility_to_plans.rb 0 → 100644
Too large
View
db/migrate/20170124235829_add_visibility_to_projects.rb 100644 → 0
Too large
View
db/migrate/20170130105546_create_plan_guidance_groups.rb 0 → 100644
Too large
View
db/migrate/20170130111947_add_selected_to_plan_guidance_groups.rb 0 → 100644
Too large
View
db/migrate/20170130173049_add_option_based_to_question_formats.rb 0 → 100644
Too large
View
db/migrate/20170130173612_move_orcid_id_from_users_to_user_identifiers.rb 0 → 100644
Too large
View
db/migrate/20170201194502_remove_region_group_and_add_super_region_id_to_regions.rb 0 → 100644
Too large
View
db/schema.rb
Too large
View
db/seeds.rb
Too large
View
lib/assets/javascripts/application.js
Too large
View
lib/assets/javascripts/plans.js
Too large
View
lib/assets/javascripts/projects.js
Too large
View
lib/assets/stylesheets/bootstrap_and_overrides.css.less
Too large
View
test/functional/answers_controller_test.rb 0 → 100644
Too large
View
test/functional/application_controller_test.rb
Too large
View
test/functional/registrations_controller_test.rb
Too large
View
test/functional/static_pages_controller_test.rb
Too large
View
test/functional/users/omniauth_callbacks_controller_test.rb
Too large
View
test/helpers/application_helper_test.rb
Too large
View
test/helpers/plans_helper_test.rb 0 → 100644
Too large
View
test/models/plan_guidance_group_test.rb 0 → 100644
Too large
View
test/routing_test.rb
Too large
View
test/test_helper.rb
Too large
View
test/unit/answer_test.rb
Too large
View
test/unit/comment_test.rb 100644 → 0
Too large
View
test/unit/dmptemplate_test.rb 100644 → 0
Too large
View
test/unit/exported_plan_test.rb
Too large
View
test/unit/guidance_group_test.rb
Too large
View
test/unit/guidance_test.rb
Too large
View
test/unit/helpers/answers_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/dmptemplates_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/file_types_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/file_uploads_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/guidances_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/home_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/organisation_types_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/organisations_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/pages_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/phases_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/plan_sections_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/plans_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/project_groups_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/project_partners_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/projects_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/question_themes_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/questions_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/sections_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/themes_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/user_org_roles_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/user_role_types_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/user_statuses_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/user_types_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/users_helper_test.rb 100644 → 0
Too large
View
test/unit/helpers/versions_helper_test.rb 100644 → 0
Too large
View
test/unit/language_test.rb
Too large
View
test/unit/note_test.rb 0 → 100644
Too large
View
test/unit/option_test.rb 100644 → 0
Too large
View
test/unit/option_warning_test.rb 100644 → 0
Too large
View
test/unit/org_test.rb 0 → 100644
Too large
View
test/unit/organisation_test.rb 100644 → 0
Too large
View
test/unit/organisation_type_test.rb 100644 → 0
Too large
View
test/unit/perm_test.rb 0 → 100644
Too large
View
test/unit/phase_test.rb
Too large
View
test/unit/plan_test.rb 0 → 100644
Too large
View
test/unit/question_format_test.rb
Too large
View
test/unit/question_option_test.rb 0 → 100644
Too large
View
test/unit/question_test.rb 0 → 100644
Too large
View
test/unit/region_test.rb 0 → 100644
Too large
View
test/unit/role_test.rb 0 → 100644
Too large
View
test/unit/section_test.rb 0 → 100644
Too large
View
test/unit/settings/plan_test.rb 0 → 100644
Too large
View
test/unit/settings/template_test.rb 0 → 100644
Too large
View
test/unit/suggested_answer_test.rb 0 → 100644
Too large
View
test/unit/template_test.rb 0 → 100644
Too large
View
test/unit/theme_test.rb 0 → 100644
Too large
View
test/unit/token_permission_type_test.rb
Too large
View
test/unit/user_test.rb
Too large