Merge pull request #443 from DigitalCurationCentre/issue_431 ...

Issue 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

Merge pull request #439 from DigitalCurationCentre/tinymce_issue ...

Fixed problem of loading tinymce styles for production environment.

Fixed problem of loading tinymce styles for production environment.

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

ran gettext:find for new translations

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

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

funder guidance now displays on customized templates

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

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

Xsrust/bugfixes

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

api updates

Merge pull request #415 from DigitalCurationCentre/issue414 ...

Issue414

Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414

updated edit profile page to display api with same formatting as the rest of the page

Merge branch 'development' of ../roadmap_src into development

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

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

fixed logic which lead to guidance not being displayed

fixed logic which lead to guidance not being displayed

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

Merge pull request #412 from CDLUC3/remove-sign-up ...

Replace the term 'Sign up' with 'Create account'

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

Merge pull request #55 from DMPRoadmap/development ...

Rebase with latest bug fixes from DCC

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

Xsrust/bugfixes