Browse code Merge branch 'development' into vyruss/bugfixes dev
commit 2de12d4691164bcc9413365df8dff17fe6d7ccab 2 parents e1fc9c2 + 1b30e80 Jimmy Angelakos authored on 19 May 2017

Showing 63 changed files

• app/controllers/admin/annotations_controller.rb
• app/controllers/admin/suggested_answers_controller.rb
• app/controllers/annotations_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/questions_controller.rb
• app/controllers/suggested_answers_controller.rb
• app/controllers/templates_controller.rb
• app/dashboards/annotation_dashboard.rb
• app/dashboards/org_dashboard.rb
• app/dashboards/question_dashboard.rb
• app/dashboards/suggested_answer_dashboard.rb
• app/models/annotation.rb
• app/models/org.rb
• app/models/plan.rb
• app/models/question.rb
• app/models/suggested_answer.rb
• app/models/template.rb
• app/policies/annotation_policy.rb
• app/policies/suggested_answer_policy.rb
• app/views/annotations/_add_annotation.html.erb
• app/views/annotations/_edit_annotation.html.erb
• app/views/annotations/_show_annotation.html.erb
• app/views/guidances/_edit_guidance.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_answer_form_ro.html.erb
• app/views/phases/_show_phase.html.erb
• app/views/phases/admin_show.html.erb
• app/views/plans/_answer_form.html.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/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/_show_phases_sections.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
• config/application.rb
• config/routes.rb
• db/schema.rb
• db/seeds.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/shared/register_form.js
• lib/assets/stylesheets/roadmap-form.scss
• lib/tasks/migrate.rake
• test/functional/annotations_controller_test.rb
• test/functional/questions_controller_test.rb
• test/functional/suggested_answers_controller_test.rb
• test/functional/templates_controller_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

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

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

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

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

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

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

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

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

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

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

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

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

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.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View test/test_helper.rb

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

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

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

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

Show line notes below