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

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

changed empty string to nothing

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

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

Pulling in latest bug fixes from DCC

added translations

updated edit customization and published status of customizations according to #338

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

Xsrust/bugfixes

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

fixed bug where org not set by update function

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

Xsrust/bugfixes

Updated translation templates

updated class for button, fixes issue brought up in #373

updated failing test to refelct changes to controller, fixes #344

enforce manditory fields on edit profile page

Merge pull request #406 from DigitalCurationCentre/vyruss/bugfixes ...

Issues #401, #387

Filtering funders with published templates only - Closes #387

Fixed faulty description display logic for plans with 1-phase-templates - Closes #401

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

Changed error text - closes #382.