|
Merge branch 'CDLUC3-CDL-MVP' into CDL-MVP
|
|---|
| app/controllers/plans_controller.rb |
|---|
| app/controllers/public_pages_controller.rb |
|---|
| app/models/plan.rb |
|---|
| app/policies/plan_policy.rb |
|---|
| app/views/annotations/_show.html.erb |
|---|
| app/views/answers/_new_edit.html.erb |
|---|
| app/views/answers/_status.html.erb |
|---|
| app/views/devise/registrations/_password_details.html.erb |
|---|
| app/views/devise/registrations/_personal_details.html.erb |
|---|
| app/views/phases/edit.html.erb |
|---|
| app/views/plans/_edit_details.html.erb |
|---|
| app/views/plans/new.html.erb |
|---|
| app/views/plans/share.html.erb |
|---|
| app/views/plans/show_export.html.erb |
|---|
| app/views/plans/update.js.erb 0 → 100644 |
|---|
| app/views/public_pages/plan_index.html.erb |
|---|
| app/views/public_pages/template_index.html.erb |
|---|
| app/views/shared/_register_form.html.erb |
|---|
| db/schema.rb |
|---|
| lib/assets/javascripts/views/answers/status.js |
|---|
| lib/assets/stylesheets/dmproadmap/base.scss |
|---|
| lib/assets/stylesheets/dmproadmap/forms.scss |
|---|
| test/functional/public_pages_controller_test.rb 0 → 100644 |
|---|
| test/functional/registrations_controller_test.rb |
|---|
| test/routing_test.rb |
|---|
| test/test_helper.rb |
|---|