Browse code Merge remote-tracking branch 'upstream/CDL-MVP' into kmcgre/CDL-MVP dev
commit 11118e3c8a933425b86d807a5fb2046f2faaec64 2 parents c3df594 + 37fa028 Keith McGrellis authored on 18 Jul 2017

Showing 29 changed files

• app/controllers/plans_controller.rb
• app/controllers/roles_controller.rb
• app/helpers/plans_helper.rb
• app/models/plan.rb
• app/policies/plan_policy.rb
• app/views/layouts/application.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_edit_details.html.erb
• app/views/plans/_guidance_choices.html.erb
• app/views/plans/_plan_title.html.erb
• app/views/plans/_show_details.html.erb
• app/views/plans/index.html.erb
• app/views/plans/share.html.erb
• app/views/plans/show.html.erb
• app/views/plans/show_export.html.erb
• config/application.rb
• config/routes.rb
• db/migrate/20170710182442_add_principal_investigator_email_to_plans.rb
• db/schema.rb
• lib/assets/javascripts/dmproadmap/forms.js
• lib/assets/javascripts/dmproadmap/utils.js
• lib/assets/javascripts/views/plans/index.js
• lib/assets/javascripts/views/plans/share.js
• lib/assets/javascripts/views/plans/show.js
• lib/assets/stylesheets/dmproadmap.scss
• lib/assets/stylesheets/dmproadmap/base.scss
• lib/assets/stylesheets/dmproadmap/forms.scss
• test/functional/plans_controller_test.rb
• test/functional/roles_controller_test.rb

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

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

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

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

Ignore Space Show notes View app/policies/plan_policy.rb

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

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

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

Ignore Space Show notes View app/views/plans/_guidance_choices.html.erb 0 → 100644

Show notes View app/views/plans/_plan_title.html.erb 100644 → 0

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

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

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

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

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

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20170710182442_add_principal_investigator_email_to_plans.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/assets/javascripts/dmproadmap/forms.js

Ignore Space Show notes View lib/assets/javascripts/dmproadmap/utils.js

Ignore Space Show notes View lib/assets/javascripts/views/plans/index.js

Ignore Space Show notes View lib/assets/javascripts/views/plans/share.js

Ignore Space Show notes View lib/assets/javascripts/views/plans/show.js 0 → 100644

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap.scss

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap/base.scss

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap/forms.scss

Ignore Space Show notes View test/functional/plans_controller_test.rb

Ignore Space Show notes View test/functional/roles_controller_test.rb

Show line notes below