had to move jquery timeago back to root, added js for org edit page. fixed styling of header when org logo and banner are present

cleaned up references to js files in views

moved js and css files into structured directories

rebased with DCC go-live codebase

fixed merge conflicts

moved jquery css into vendor directory

css rewrite

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

made tinymce boxes resize automatically

gave tables a default border so they will export properly in docx

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

Merge branch 'development' into issue_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

Fixed problem of loading tinymce styles for production environment.

Added public DMPs page

fixed merge conflicts

fixed merge conflicts

ran gettext:find for new translations

made gettext calm down about fuzzy translations (no more warnings)

rebranding

color changes for rebradning

added plan visibility to edit/view plan details DMPRoadmap/roadmap#151

api updates

added 'create test plan' link to view plans page and default setting in application.rb DMPRoadmap/roadmap#83

updated size of shib_ds page org list columns and updated org links DMPRoadmap/roadmap#405

removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112

shibboleth_ds changes to make org list links work DMPRoadmap/roadmap#405

made shib discovery service disabled by default on application.rb specific installations can override in environments files DMPRoadmap/roadmap#405 ...

(cherry picked from commit b359983)

added shibboleth Login.sso with entityID passthru action DMPRoadmap/roadmap#405 ...

(cherry picked from commit 314b24e)