Browse code Merge pull request #33 from DMPRoadmap/master Rebasing off of master branch dev
commit 7ff3b906c88cdec9ab1c0960e0f45dedaa74b478 2 parents 3f49da8 + 1444def Brian Riley authored on 28 Sep 2016 GitHub committed on 28 Sep 2016

Showing 49 changed files

• Gemfile.lock
• app/assets/javascripts/application.js
• app/assets/javascripts/projects.js
• app/assets/javascripts/select2.min.js
• app/assets/stylesheets/select2.css
• 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/helpers/application_helper.rb
• app/models/guidance_group.rb
• app/models/organisation.rb
• app/models/organisation_type.rb
• app/models/user.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
• app/views/layouts/_dmponline_signin_signout.html.erb
• app/views/organisations/admin_show.html.erb
• app/views/projects/_dropdowns_new_project.html.erb
• config/initializers/dragonfly.rb
• config/locales/de.yml
• config/locales/en-US.yml
• config/locales/fr.yml
• config/routes.rb

Ignore Space Show notes View Gemfile.lock

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

Ignore Space Show notes View app/assets/javascripts/projects.js

Ignore Space Show notes View app/assets/javascripts/select2.min.js

Ignore Space Show notes View app/assets/stylesheets/select2.css

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/helpers/application_helper.rb

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

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

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

Ignore Space Show notes View app/models/user.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 app/views/layouts/_dmponline_signin_signout.html.erb

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

Ignore Space Show notes View app/views/projects/_dropdowns_new_project.html.erb

Ignore Space Show notes View config/initializers/dragonfly.rb

Ignore Space Show notes View config/locales/de.yml

Ignore Space Show notes View config/locales/en-US.yml

Ignore Space Show notes View config/locales/fr.yml

Ignore Space Show notes View config/routes.rb

Show line notes below