Merge branch 'CDLUC3-CDL-MVP' into CDL-MVP
dev
commit 932aaad442afe53e6f8fcae016cf9668bbf6d069
2 parents f299cc8 + 74d15db
@Jose Lloret Jose Lloret authored on 7 Aug 2017
Showing 26 changed files
View
app/controllers/plans_controller.rb
View
app/controllers/public_pages_controller.rb
View
app/models/plan.rb
View
app/policies/plan_policy.rb
View
app/views/annotations/_show.html.erb
View
app/views/answers/_new_edit.html.erb
View
app/views/answers/_status.html.erb
View
app/views/devise/registrations/_password_details.html.erb
View
app/views/devise/registrations/_personal_details.html.erb
View
app/views/phases/edit.html.erb
View
app/views/plans/_edit_details.html.erb
View
app/views/plans/new.html.erb
View
app/views/plans/share.html.erb
View
app/views/plans/show_export.html.erb
View
app/views/plans/update.js.erb 0 → 100644
View
app/views/public_pages/plan_index.html.erb
View
app/views/public_pages/template_index.html.erb
View
app/views/shared/_register_form.html.erb
View
db/schema.rb
View
lib/assets/javascripts/views/answers/status.js
View
lib/assets/stylesheets/dmproadmap/base.scss
View
lib/assets/stylesheets/dmproadmap/forms.scss
View
test/functional/public_pages_controller_test.rb 0 → 100644
View
test/functional/registrations_controller_test.rb
View
test/routing_test.rb
View
test/test_helper.rb