Resolve merge conflicts. DMPRoadmap/roadmap#553

removed non-relevant modal at phases/edit.html.erb. DMPRoadmap/roadmap#566 ...

Doing some housekeeping for non-relevant modals. DMPRoadmap/roadmap#566

modals according to bootstrap. DMPRoadmap/roadmap#554

modal partial as layout to be re-used across the site. DMPRoadmap/roadmap#554

removed old tables and tabs JS files that are no longer in use DMPRoadmap/roadmap#553

fixed merge conflicts DMPRoadmap/roadmap#555

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

initial redesign of write plan page DMPRoadmap/roadmap#494

Move toggleFormElementError to forms.js

Merge remote-tracking branch 'upstream/CDL-MVP' into kmcgre/CDL-MVP

Set focus to response messages #135

made suggested changes from PR

Merge branch 'plan-details-share' into CDL-MVP

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

popover and tooltip triggered by focus and hover. DMPRoadmap/roadmap#141

finished up share plan page.

started work on share plan page DMPRoadmap/roadmap#497

Merge pull request #59 from DMPRoadmap/CDL-MVP ...

Rebase with contact_us fix

-Replaced wrong parameter names since it is expected contact_us_contact[...] ...

-Fixed logic for when an email is valid and re-introduced the previous regex, which is compatible with contact_us gem
-Replaced disabled fields (e.g. email, name) with readonly attribute, otherwise these parameters are not send to the server

DMPRoadmap/roadmap#483

started implementing new nav bar DMProadmap/roadmap#161

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

load the selected user profile tab after page reload

added popover js. updated edit template details form to new css

added error to create plan for instances when user has not selected an item from the list DMPRoadmap/roadmap#457 swapped out read only form html table structure with dl

updated edit profile to use new css

fixed issues with plan edit/share/export and updated to work with new css. tweaks to layout of create plan

removed timer from dropdown display and tweaked css instead so that mouse is on the dropdown

some minor bug fixes

updated column positions, project title lengths, and action item into dropdown list DMPRoadmap/roadmap#418

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

started switching template/phase/section pages over to new css