Checkbox using rails FormHelper. Helper method at answer model for determining if an option should be selected. DMPRoadmap/roadmap#354

radiobuttons question is now saving through its relation question_options rather than options. Added whitelisting attributes for mass assignment. DMPRoadmap/roadmap#302

Merge remote-tracking branch 'upstream/development' into annotations

merged development into annotations

fixed merge conflicts after rebase

updated forms on create/edit plans, contact_us, profile pages to match consolidated css

converted all <form><table> and <form><ol> to <fieldset> on non-org-admin pages DMPRoadmap/roadmap#125

updated example answer text to display funder

fixed unrelated bug where guidance acordians not opening

updated references of suggested_answer to annotations

Replace UC3 -> CDL - fixes #245

Merge branch 'development' into development

fixed issue with question.options reference DMPRoadmap/roadmap#249

updates to locking mechanism because it ActiveRecord does not catch 2 creates DMPRoadmap/roadmap#241

change options to question_options

change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182

Change notes to work with AJAX calls.

fixes issues around answer text not saving properly; references https://github.com/DMPRoadmap/roadmap/issues/181 ...

fixes issues around status spacing and adds in untranslated strings for
status; references https://github.com/DMPRoadmap/roadmap/issues/182

fix merge conflicts

change from serialized hash tp just using includes

minor fixes from code review

merge optimistic locking into dev

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

fixed typo. DMPRoadmap/roadmap#98

phases views according to gettext. DMPRoadmap/roadmap#98

trying to reduce data access queries. Needs more work

port of plan creation and editing to new data model