Browse code Merge pull request #3 from DMPRoadmap/development Rebasing with bug fixes dev
commit 0abf0cbe978ee2a9788d7a50c79a5e8ae4e40334 2 parents 608d02d + 8580b6b Brian Riley authored on 3 Aug 2016 GitHub committed on 3 Aug 2016

Showing 19 changed files

• Gemfile
• app/admin/dmptemplate.rb
• app/controllers/plans_controller.rb
• app/controllers/projects_controller.rb
• app/controllers/registrations_controller.rb
• app/helpers/application_helper.rb
• app/views/admin/dmptemplates/settings.html.erb
• app/views/dmptemplates/_add_guidance.html.erb
• app/views/layouts/_dmponline_footer.html.erb
• app/views/layouts/_dmponline_navigation.html.erb
• app/views/layouts/application.html.erb
• app/views/projects/_project_list_item.html.erb
• app/views/settings/plans/_export_formatting_form.html.erb
• app/views/settings/projects/show.html.erb
• config/application.rb
• config/database_example.yml
• config/routes.rb
• db/schema.rb
• test/fixtures/user_org_roles.yml

Ignore Space Show notes View Gemfile

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

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

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

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

Ignore Space Show notes View app/helpers/application_helper.rb

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

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

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

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

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

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

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

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

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View config/database_example.yml

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View test/fixtures/user_org_roles.yml

Show line notes below