Browse code merged DCC changes into master dev
commit 170cd4326b81330afad68696c8a5f17be45c7c4a 2 parents 6dec11c + bea115f briley authored on 1 Sep 2016

Showing 66 changed files

• .travis.yml
• Gemfile
• Gemfile.lock
• app/assets/javascripts/admin.js
• app/assets/stylesheets/admin.css.less
• app/assets/stylesheets/bootstrap_and_overrides.css.less
• app/controllers/api/v0/base_controller.rb
• app/controllers/api/v0/statistics_controller.rb
• app/controllers/application_controller.rb
• app/controllers/dmptemplates_controller.rb
• app/controllers/guidance_groups_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/organisations_controller.rb
• app/controllers/token_permission_types_controller.rb
• app/controllers/users_controller.rb
• app/models/exported_plan.rb
• app/models/guidance_group.rb
• app/models/organisation.rb
• app/models/plan.rb
• app/models/project.rb
• app/models/question.rb
• app/models/role.rb
• app/models/user.rb
• app/policies/application_policy.rb
• app/policies/dmptemplate_policy.rb
• app/policies/guidance_group_policy.rb
• app/policies/guidance_policy.rb
• app/policies/organisation_policy.rb
• app/policies/token_permission_type_policy.rb
• app/policies/user_policy.rb
• app/views/devise/registrations/edit.html.erb
• app/views/dmptemplates/_admin_nav_tabs.html.erb
• app/views/dmptemplates/admin_index.html.erb
• app/views/dmptemplates/export.pdf.erb
• app/views/layouts/_dmponline_header.html.erb
• app/views/layouts/_dmponline_navigation.html.erb
• app/views/layouts/_dmponline_signin_signout.html.erb
• app/views/organisations/admin_edit.html.erb
• app/views/organisations/admin_show.html.erb
• app/views/plans/_answer_form.html.erb
• app/views/plans/export.docx.caracal
• app/views/plans/export.html.erb
• app/views/plans/export.pdf.erb
• app/views/projects/_project_details.html.erb
• app/views/users/admin_grant_permissions.html.erb
• app/views/users/admin_index.html.erb
• config/environments/development.rb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml
• config/locales/fr.yml
• config/routes.rb
• db/migrate/20130903123015_create_friendly_id_slugs.rb
• db/migrate/20140604092907_rails_settings_migration.rb
• db/schema.rb
• db/seeds.rb
• html/ApplicationController.html
• html/DmptemplatesController.html
• html/GuidanceGroupsController.html
• html/GuidancesController.html
• html/OrganisationUsersController.html
• html/OrganisationsController.html
• html/User.html
• html/js/search_index.js
• html/table_of_contents.html
• public/403.html

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/assets/javascripts/admin.js

Ignore Space Show notes View app/assets/stylesheets/admin.css.less

Ignore Space Show notes View app/assets/stylesheets/bootstrap_and_overrides.css.less

Ignore Space Show notes View app/controllers/api/v0/base_controller.rb

Ignore Space Show notes View app/controllers/api/v0/statistics_controller.rb

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

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

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

Ignore Space Show notes View app/models/exported_plan.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/plan.rb

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

Ignore Space Show notes View app/models/question.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/application_policy.rb 0 → 100644

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/dmptemplates/export.pdf.erb 0 → 100644

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

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

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

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

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

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

Ignore Space Show notes View app/views/plans/export.docx.caracal

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

Ignore Space Show notes View app/views/plans/export.pdf.erb

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

Ignore Space Show notes View app/views/users/admin_grant_permissions.html.erb 0 → 100644

Ignore Space Show notes View app/views/users/admin_index.html.erb

Ignore Space Show notes View config/environments/development.rb

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

Ignore Space Show notes View config/locales/en-UK.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

Ignore Space Show notes View db/migrate/20130903123015_create_friendly_id_slugs.rb

Ignore Space Show notes View db/migrate/20140604092907_rails_settings_migration.rb

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View html/ApplicationController.html

Ignore Space Show notes View html/DmptemplatesController.html

Ignore Space Show notes View html/GuidanceGroupsController.html

Ignore Space Show notes View html/GuidancesController.html

Ignore Space Show notes View html/OrganisationUsersController.html

Ignore Space Show notes View html/OrganisationsController.html

Ignore Space Show notes View html/User.html

Ignore Space Show notes View html/js/search_index.js

Ignore Space Show notes View html/table_of_contents.html

Ignore Space Show notes View public/403.html

Show line notes below