Browse code Merge pull request #55 from DMPRoadmap/development Development sync to Roadmap dev
commit 8850843f3db99d735cc851ce56d4d2b0bbf2410a 2 parents ae453da + 21c78ed Jimmy Angelakos authored on 8 Mar 2018 GitHub committed on 8 Mar 2018

Showing 79 changed files

• app/controllers/annotations_controller.rb
• app/controllers/answers_controller.rb
• app/controllers/concerns/paginable.rb
• app/controllers/guidances_controller.rb
• app/controllers/notes_controller.rb
• app/controllers/org_admin/plans_controller.rb
• app/controllers/org_admin/templates_controller.rb
• app/controllers/paginable/orgs_controller.rb
• app/controllers/paginable/plans_controller.rb
• app/controllers/paginable/templates_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/question_formats_controller.rb
• app/controllers/questions_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/super_admin/orgs_controller.rb
• app/helpers/application_helper.rb
• app/models/answer.rb
• app/models/concerns/exportable_plan.rb
• app/models/exported_plan.rb
• app/models/org.rb
• app/models/plan.rb
• app/models/question_format.rb
• app/models/template.rb
• app/models/user.rb
• app/views/answers/_new_edit.html.erb
• app/views/devise/registrations/_external_identifier.html.erb
• app/views/devise/registrations/_personal_details.html.erb
• app/views/guidances/admin_index.html.erb
• app/views/layouts/application.html.erb
• app/views/org_admin/plans/index.html.erb
• app/views/org_admin/templates/_admin_nav_tabs.html.erb
• app/views/org_admin/templates/_edit.html.erb
• app/views/org_admin/templates/_show_phases_sections.html.erb
• app/views/org_admin/templates/history.html.erb
• app/views/org_admin/templates/index.html.erb
• app/views/phases/_admin_show.html.erb
• app/views/phases/admin_preview.html.erb
• app/views/plans/index.html.erb
• app/views/plans/new.html.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/questions/_new_edit_question_option_based.html.erb
• app/views/questions/_show_question.html.erb
• app/views/sections/_edit_section.html.erb
• app/views/sections/_show_section.html.erb
• app/views/shared/_sign_in_form.html.erb
• app/views/shared/export/_plan.erb
• app/views/shared/export/_plan_styling.erb
• app/views/shared/export/_plan_txt.erb
• app/views/super_admin/orgs/index.html.erb
• app/views/super_admin/themes/index.html.erb
• app/views/usage/index.html.erb
• app/views/user_mailer/feedback_complete.html.erb
• app/views/users/admin_index.html.erb
• config/branding_example.yml
• config/environment.rb
• config/environments/production.rb
• config/routes.rb
• db/schema.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/constants.js
• lib/assets/javascripts/utils/ariatiseForm.js
• lib/assets/javascripts/utils/isValidInputType.js
• lib/assets/javascripts/utils/passwordHelper.js
• lib/assets/javascripts/utils/validation.js
• lib/assets/javascripts/views/answers/rda_metadata.js
• lib/assets/javascripts/views/orgs/shibboleth_ds.js
• lib/assets/javascripts/views/plans/edit_details.js
• lib/assets/javascripts/views/plans/index.js
• lib/assets/javascripts/views/plans/new.js
• lib/assets/javascripts/views/questions/sharedEventHandlers.js
• lib/assets/javascripts/views/shared/sign_in_form.js
• lib/assets/stylesheets/overrides.scss
• lib/tasks/bugfix.rake
• lib/tasks/initialize_data.rake
• test/functional/annotations_controller_test.rb
• test/integration/paginable_flows_test.rb
• test/unit/user_test.rb

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

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

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

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

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

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

Ignore Space Show notes View app/controllers/org_admin/templates_controller.rb

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/helpers/application_helper.rb

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

Ignore Space Show notes View app/models/concerns/exportable_plan.rb

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

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

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

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

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

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

Ignore Space Show notes View app/views/answers/_new_edit.html.erb

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

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/application.html.erb

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

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

Ignore Space Show notes View app/views/org_admin/templates/_edit.html.erb

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

Ignore Space Show notes View app/views/org_admin/templates/history.html.erb

Ignore Space Show notes View app/views/org_admin/templates/index.html.erb

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

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

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

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

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

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

Ignore Space Show notes View app/views/questions/_new_edit_question_option_based.html.erb

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

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

Ignore Space Show notes View app/views/sections/_show_section.html.erb

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

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

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

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

Ignore Space Show notes View app/views/super_admin/orgs/index.html.erb

Ignore Space Show notes View app/views/super_admin/themes/index.html.erb

Ignore Space Show notes View app/views/usage/index.html.erb

Ignore Space Show notes View app/views/user_mailer/feedback_complete.html.erb

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

Ignore Space Show notes View config/branding_example.yml

Ignore Space Show notes View config/environment.rb

Ignore Space Show notes View config/environments/production.rb

Ignore Space Show notes View config/routes.rb

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/constants.js

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

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

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

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

Ignore Space Show notes View lib/assets/javascripts/views/answers/rda_metadata.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/orgs/shibboleth_ds.js

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

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

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

Ignore Space Show notes View lib/assets/javascripts/views/questions/sharedEventHandlers.js

Ignore Space Show notes View lib/assets/javascripts/views/shared/sign_in_form.js

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

Ignore Space Show notes View lib/tasks/bugfix.rake

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

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

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

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

Show line notes below