Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

Fixed timeago problem for when a new answer is created. Refactored JavaScript logic into its own file. Created a partial to handle answer status. DMPRoadmap/roadmap#355

textarea, textfield, radiobuttons and checkbox working for read-only permission. DMPRoadmap/roadmap#352 ...

Fixed dropdown type removing its formtastic dependency. Dropdown working for read-only permission. DMPRoadmap/roadmap#352

Dropdown and multiselectbox refactored and working for read-only permission too. DMPRoadmap/roadmap#352

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

order sections by number

export functionality according to workflow defined at DMPRoadmap/roadmap#197

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

change from serialized hash tp just using includes

language fixes post merge

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.

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