Browse code Merge pull request #11 from DMPRoadmap/master rebase with DCC changes dev
commit 6a9b8e4ada9f9040848e88522d1ff55b8b197c6b 2 parents d0f0ee4 + 1444def Brian Riley authored on 28 Sep 2016 GitHub committed on 28 Sep 2016

Showing 33 changed files

• Gemfile.lock
• app/controllers/answers_controller.rb
• app/controllers/application_controller.rb
• app/controllers/comments_controller.rb
• app/controllers/dmptemplates_controller.rb
• app/controllers/guidance_groups_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/home_controller.rb
• app/controllers/organisations_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/project_groups_controller.rb
• app/controllers/projects_controller.rb
• app/controllers/settings.rb
• app/controllers/settings/plans_controller.rb
• app/controllers/settings/projects_controller.rb
• app/controllers/themes_controller.rb
• app/controllers/user_org_roles_controller.rb
• app/controllers/user_role_types_controller.rb
• app/controllers/user_statuses_controller.rb
• app/controllers/user_types_controller.rb
• app/controllers/users_controller.rb
• app/policies/answer_policy.rb
• app/policies/application_policy.rb
• app/policies/comment_policy.rb
• app/policies/dmptemplate_policy.rb
• app/policies/organisation_policy.rb
• app/policies/plan_policy.rb
• app/policies/project_group_policy.rb
• app/policies/project_policy.rb
• app/policies/settings/plan_policy.rb
• app/policies/settings/project_policy.rb
• app/views/dmptemplates/_show_phases_sections.html.erb
• config/routes.rb

Ignore Space Show notes View Gemfile.lock

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/controllers/settings/projects_controller.rb

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

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

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

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

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

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

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

Ignore Space Show notes View app/policies/application_policy.rb

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

Ignore Space Show notes View app/policies/dmptemplate_policy.rb

Ignore Space Show notes View app/policies/organisation_policy.rb

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

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

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

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

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

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

Ignore Space Show notes View config/routes.rb

Show line notes below