remove byebug

fix the styling of button on edit profile page

fix the nil error for notification preferences

replaced instances of 'let' with 'var' in js files. rails' asset pipeline cannot handle 'let' at this version

switched default prefs setting to before_validation

fixed merge conflicts

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

fixed merge conflicts

fixed merge conflict left over from unstashed changes

fixing the tab issue on Edit profile page;add/update notification preferences

Merge pull request #423 from DigitalCurationCentre/xsrust/bugfixes ...

Xsrust/bugfixes

updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined

drive org-admins to add an abbreviation to their org for display with annotations

funder guidance now displays on customized templates

Merge branch 'CDL-MVP' into branding

rebranding

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

color changes for rebradning

add custom div to profile page

move user profile to partials, and add prefrences tab

Change default plan visibility to `3` (`:privately_visible`)

updated link in api mailer

fixes error with prefetching, now passes tests

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

completed work on API

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

Merge branch 'plan-visibility' into CDL-MVP

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

api updates

css tweak and wording changes DMPRoadmap/roadmap#405