Browse code Merge branch 'master' into dmptool dev
commit 7d469f79e86e6b6e73d9ed0614a28600648ca48a 2 parents 305c0ef + e3b98d6 briley authored on 9 Aug 2016

Showing 38 changed files

• Rakefile
• app/admin/dashboard.rb
• app/admin/dmptemplate.rb
• app/admin/guidance.rb
• app/admin/guidance_group.rb
• app/admin/option.rb
• app/admin/organisation.rb
• app/admin/organisation_type.rb
• app/admin/phase.rb
• app/admin/project.rb
• app/admin/project_group.rb
• app/admin/question.rb
• app/admin/question_format.rb
• app/admin/role.rb
• app/admin/section.rb
• app/admin/suggested_answer.rb
• app/admin/theme.rb
• app/admin/user.rb
• app/admin/user_org_role.rb
• app/admin/user_role_type.rb
• app/admin/user_status.rb
• app/admin/user_type.rb
• app/admin/version.rb
• app/assets/javascripts/admin.js
• app/assets/stylesheets/admin.css.less
• app/assets/stylesheets/bootstrap_and_overrides.css.less
• app/controllers/api/v0/projects_controller.rb
• app/controllers/dmptemplates_controller.rb
• app/models/guidance.rb
• app/models/phase.rb
• app/views/dmptemplates/_add_question.html.erb
• app/views/dmptemplates/_edit_question.html.erb
• app/views/dmptemplates/_edit_section.html.erb
• app/views/dmptemplates/_show_question.html.erb
• app/views/layouts/application.html.erb
• app/views/plans/_answer_form.html.erb
• config/environments/development.rb
• config/initializers/active_admin.rb

Ignore Space Show notes View Rakefile

Ignore Space Show notes View app/admin/dashboard.rb

Ignore Space Show notes View app/admin/dmptemplate.rb

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

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

Ignore Space Show notes View app/admin/option.rb

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

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

Ignore Space Show notes View app/admin/phase.rb

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

Ignore Space Show notes View app/admin/project_group.rb

Ignore Space Show notes View app/admin/question.rb

Ignore Space Show notes View app/admin/question_format.rb

Ignore Space Show notes View app/admin/role.rb

Ignore Space Show notes View app/admin/section.rb

Ignore Space Show notes View app/admin/suggested_answer.rb

Ignore Space Show notes View app/admin/theme.rb

Ignore Space Show notes View app/admin/user.rb

Ignore Space Show notes View app/admin/user_org_role.rb

Ignore Space Show notes View app/admin/user_role_type.rb

Ignore Space Show notes View app/admin/user_status.rb

Ignore Space Show notes View app/admin/user_type.rb

Ignore Space Show notes View app/admin/version.rb

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below