Merge branch 'development' of https://github.com/CDLUC3/roadmap into development

Updated seeds.rb token_permission_types and question_formats and added rake task to apply fixes DMPRoadmap/roadmap#603

updated rake task to remember which annotations should be preserved

removed debug code to count matches, replaced with destroy to remove matches

forgot to save migrate.rake

fixes bug with duplicate guidance and adds rake task to cleanup database

Removed clear from select. Re-introduced logic to show/hide other organisation field. Link for non-listed organisation always visible. DMPRoadmap/roadmap#455

using data-toggle attribute to initiliase and trigger any popover. DMPRoadmap/roadmap#431

Merge pull request #450 from DigitalCurationCentre/issue_438 ...

auto-saving functionality. DMPRoadmap/roadmap#438

auto-saving working but needs some improvement. DMPRoadmap/roadmap#438 ...

auto-saving debounce function per form and considering optimistic-locking. DMPRoadmap/roadmap#438

Added focus handler for textarea in order to also cancel debounce. DMPRoadmap/roadmap#438

question text displayed through tinymce for adding/editing a question. DMPRoadmap/roadmap#447

First round of refactoring application.js. DMPRoadmap/roadmap#431 ...

Finished refactoring of application.js by transferring logic to more appropriate places. DMPRoadmap/roadmap#431

removed projects.js since it is used nowhere. DMPRoadmap/roadmap#431

first round of plan.js cleaned up. DMPRoadmap/roadmap#431 ...

Refactored logic for annotation tabs. DMPRoadmap/roadmap#431

Re-located notes views within notes folder rather than phases. Moved JS logic to its own file at lib/notes/index.js. DMPRoadmap/roadmap#431

Removed old locking logic in view and JS. DMPRoadmap/roadmap#431

completed work on API

fixed logic which lead to guidance not being displayed

updated class for button, fixes issue brought up in #373

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

updated org-admin customization of templates according to #373

Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272

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

Asset pipeline fix for bg.gif

Re-added table sort arrows to asset pipeline - Closes #342.

Merge pull request #328 from DigitalCurationCentre/issue_272 ...

Guidances new/edit with table formatting displayed properly. DMPRoadm…

Guidances new/edit with table formatting displayed properly. DMPRoadmap/roadmap#272

Fixed sign up form. DMPRoadmap/roadmap#317

Merge pull request #318 from CDLUC3/fix-button-sizes ...

Fix button sizes and add placeholder to autocomplete boxes

Updated size of buttons in new scss file to match existing boostrap size