Browse code Merge pull request #74 from DMPRoadmap/development Pulling over latest bug fixes from DMPRoadmap dev
commit d8cede279d8c9774dcf22803169b35a1d9a97335 2 parents 6ab65a5 + 93c3687 Brian Riley authored on 16 Aug 2017 GitHub committed on 16 Aug 2017

Showing 21 changed files

• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/templates_controller.rb
• app/controllers/users_controller.rb
• app/dashboards/exported_plan_dashboard.rb
• app/dashboards/guidance_dashboard.rb
• app/dashboards/guidance_group_dashboard.rb
• app/dashboards/org_dashboard.rb
• app/dashboards/plan_dashboard.rb
• app/dashboards/question_dashboard.rb
• app/dashboards/template_dashboard.rb
• app/dashboards/theme_dashboard.rb
• app/models/plan.rb
• app/models/user.rb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/plans/export.docx.erb
• config/routes.rb
• db/migrate/20170702012742_ensure_indexes_in_place.rb
• db/schema.rb
• doc/data_model.png
• lib/tasks/migrate.rake

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

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

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

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

Ignore Space Show notes View app/dashboards/exported_plan_dashboard.rb

Ignore Space Show notes View app/dashboards/guidance_dashboard.rb

Ignore Space Show notes View app/dashboards/guidance_group_dashboard.rb

Ignore Space Show notes View app/dashboards/org_dashboard.rb

Ignore Space Show notes View app/dashboards/plan_dashboard.rb

Ignore Space Show notes View app/dashboards/question_dashboard.rb

Ignore Space Show notes View app/dashboards/template_dashboard.rb

Ignore Space Show notes View app/dashboards/theme_dashboard.rb

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

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

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

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

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20170702012742_ensure_indexes_in_place.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View doc/data_model.png 0 → 100644

Ignore Space Show notes View lib/tasks/migrate.rake

Show line notes below