Browse code Merge pull request #27 from DMPRoadmap/development Pull latest CDL changes through to DCC dev
commit 82ad2bee82f8d4ae630afe4ea1997a29cc1a03db 2 parents 02ec675 + 4efe56d Ray Carrick authored on 10 Apr 2017 GitHub committed on 10 Apr 2017

Showing 75 changed files

• .travis.yml
• Gemfile
• Gemfile.lock
• 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/guidances/_add_guidance.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/guidances/admin_show.html.erb
• app/views/guidances/update_phases.js.erb
• app/views/guidances/update_questions.js.erb
• app/views/guidances/update_sections.js.erb
• app/views/guidances/update_versions.js.erb
• app/views/layouts/application.html.erb
• app/views/phases/admin_show.html.erb
• app/views/plans/_answer_form_ro.html.erb
• app/views/plans/edit.html.erb
• config/initializers/gettext_i18n_rails_js.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
• db/seeds.rb
• lib/assets/javascripts/admin.js
• lib/assets/javascripts/application.js
• lib/assets/javascripts/export_configure.js
• lib/assets/javascripts/jquery.timeago.js
• lib/assets/javascripts/locale/de/app.js
• lib/assets/javascripts/locale/en_GB/app.js
• lib/assets/javascripts/locale/en_US/app.js
• lib/assets/javascripts/locale/es/app.js
• lib/assets/javascripts/locale/fr/app.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/toolbar.js
• 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 Gemfile

Ignore Space Show notes View Gemfile.lock

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

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

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

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

Show notes View app/views/guidances/update_phases.js.erb 100644 → 0

Show notes View app/views/guidances/update_questions.js.erb 100644 → 0

Show notes View app/views/guidances/update_sections.js.erb 100644 → 0

Show notes View app/views/guidances/update_versions.js.erb 100644 → 0

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

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 config/initializers/gettext_i18n_rails_js.rb 0 → 100644

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

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

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

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

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

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

Ignore Space Show notes View db/seeds.rb

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

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

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

Ignore Space Show notes View lib/assets/javascripts/jquery.timeago.js

Ignore Space Show notes View lib/assets/javascripts/locale/de/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/en_GB/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/en_US/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/es/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/fr/app.js 0 → 100644

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

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

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