|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
|
|---|
| app/controllers/answers_controller.rb |
|---|
| app/models/answer.rb |
|---|
| app/models/question.rb |
|---|
| app/models/question_format.rb |
|---|
| app/views/answers/update.js.erb 0 → 100644 |
|---|
| app/views/phases/_answer.html.erb 0 → 100644 |
|---|
| app/views/phases/_answer_form.html.erb |
|---|
| app/views/phases/edit.html.erb |
|---|
| db/migrate/20170227122226_add_locking_columns.rb 0 → 100644 |
|---|
| db/migrate/20170301105806_add_type_column_to_question_format.rb 0 → 100644 |
|---|
| db/schema.rb |
|---|
| lib/assets/javascripts/plans.js |
|---|
| lib/assets/stylesheets/bootstrap_and_overrides.css.less |
|---|