Browse code merging dev
1 parent 473a766 commit 72373c9fb989ff8513ac8692e4507157c4a9f8e6 DamodarSojka authored on 10 Aug 2016

Showing 31 changed files

• app/controllers/contacts_controller.rb
• app/controllers/project_groups_controller.rb
• app/models/exported_plan.rb
• app/views/admin/dmptemplates/settings.html.erb
• app/views/api/v0/guidance_groups/index.json.jbuilder
• app/views/api/v0/guidance_groups/show.json.jbuilder
• app/views/devise/registrations/edit.html.erb
• app/views/dmptemplates/_add_guidance.html.erb
• app/views/dmptemplates/_admin_nav_tabs.html.erb
• app/views/dmptemplates/_edit_section.html.erb
• app/views/dmptemplates/_show_phase.html.erb
• app/views/dmptemplates/_show_phases_sections.html.erb
• app/views/dmptemplates/_show_question.html.erb
• app/views/dmptemplates/_show_template.html.erb
• app/views/dmptemplates/admin_index.html.erb
• app/views/dmptemplates/admin_phase.html.erb
• app/views/dmptemplates/admin_template.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/_dropdowns_new_project.html.erb
• app/views/projects/_project_details.html.erb
• app/views/projects/_project_list_item.html.erb
• app/views/projects/new.html.erb
• app/views/settings/plans/_export_formatting_form.html.erb
• app/views/settings/projects/show.html.erb
• app/views/shared/_register_form.html.erb
• app/views/users/admin_api_update.html.erb
• app/views/users/admin_index.html.erb
• db/migrate/20160729091510_add_language_to_user.rb
• db/schema.rb

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

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

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

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

Ignore Space Show notes View app/views/api/v0/guidance_groups/index.json.jbuilder

Ignore Space Show notes View app/views/api/v0/guidance_groups/show.json.jbuilder

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/dmptemplates/admin_template.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/_dropdowns_new_project.html.erb

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

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

Ignore Space Show notes View app/views/projects/new.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 app/views/shared/_register_form.html.erb

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

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

Ignore Space Show notes View db/migrate/20160729091510_add_language_to_user.rb

Ignore Space Show notes View db/schema.rb

Show line notes below