switched collateTable to use tablesorter's icons, switched filterizeTable to use debounce. DMPRoadmap/roadmap#553

tinymce refactoring for notes using JS. DMPRoadmap/roadmap#571 ...

tinymce refactoring for notes using JS. DMPRoadmap/roadmap#571

tinymce refactoring for answers using JS. TODO adding events. DMPRoadmap/roadmap#571

tinymce gem removed from any view. DMPRoadmap/roadmap#571

tinymce answer events for editor working. DMPRoadmap/roadmap#571

fixed typos in js.erb template. DMPRoadmap/roadmap#571

extend renamed to define since more appropiate. DMPRoadmap/roadmap#571

front-end dependencies handled through npm. DMPRoadmap/roadmap#551

created template pdf pages, moved public pages to new controller, revised auth for public pages

changed name of action and added requirement to share action that only active users show

added ability for users to remove themselves from plans, without destroying the plan

finished plan share and edit pages. Updated styling and handling or alert/notice messages. Updated css to allow background color, alert message and notice message colors to be set in dmproadmap.scss

fixed merge conflicts in db/schema.rb

updated preferences to use JSON hash and be contained in a new model, addresses #481

started refactoring the edit project details page DMPRoadmap/roadmap#491

Merge branch 'CDL-MVP' into CDL-MVP

ran gettext:find and gettext:po_to_json

Adds copy template option #148

fixed issue with Shib logout url

set default plan visibility to 'private'

fixed merge conflicts

fix merge conflicts

updated translations from plan_details page

added new roadmap logo. started applying new css to plan edit page

adds disk option for bullet display

added bullet point options to tinymce editor. circle and square export correctly. Addresses #464

removed Dmproadmap.js so that we can readd as dmproadmap.js ... git appears to ignore case but rails does not

fixed name of common Dmproadmap.js in application.rb

fix merge conflicts

added old admin.js back in to handle templates page. finsihed css rebuild of guidances and guidance groups

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