Browse code Merge pull request #43 from DMPRoadmap/development Rebase with latest bug fixes and tests dev
commit 2031fb93f71f515e26f0a49fa87f2caa2df78a1b 2 parents c80adc0 + 4efe56d Brian Riley authored on 10 Apr 2017 GitHub committed on 10 Apr 2017

Showing 46 changed files

• .travis.yml
• app/controllers/application_controller.rb
• app/controllers/contacts_controller.rb
• app/controllers/guidance_groups_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/home_controller.rb
• app/controllers/notes_controller.rb
• app/controllers/orgs_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/sections_controller.rb
• app/controllers/templates_controller.rb
• app/controllers/users_controller.rb
• app/models/guidance.rb
• app/models/perm.rb
• app/models/role.rb
• app/models/user.rb
• app/policies/plan_policy.rb
• app/views/phases/admin_show.html.erb
• app/views/plans/_answer_form_ro.html.erb
• app/views/plans/edit.html.erb
• db/seeds.rb
• test/functional/answers_controller_test.rb
• test/functional/application_controller_test.rb
• test/functional/confirmations_controller_test.rb
• test/functional/guidance_groups_controller_test.rb
• test/functional/guidances_controller_test.rb
• test/functional/home_controller_test.rb
• test/functional/notes_controller_test.rb
• test/functional/organisations_controller_test.rb
• test/functional/orgs_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/sections_controller_test.rb
• test/functional/static_pages_controller_test.rb
• test/functional/templates_controller_test.rb
• test/functional/users/omniauth_callbacks_controller_test.rb
• test/test_helper.rb
• test/unit/role_test.rb
• test/unit/user_test.rb

Ignore Space Show notes View .travis.yml

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

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

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

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

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

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

Ignore Space Show notes View app/controllers/orgs_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/questions_controller.rb

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

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

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

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

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

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

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

Ignore Space Show notes View app/models/role.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/views/phases/admin_show.html.erb

Ignore Space Show notes View app/views/plans/_answer_form_ro.html.erb 0 → 100644

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

Ignore Space Show notes View db/seeds.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View test/test_helper.rb

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

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

Show line notes below