Merge pull request #206 from DigitalCurationCentre/development ...

Super admin fixes/improvements

Merge pull request #203 from CDLUC3/fixing-tests ...

Moved Managing Org definition to branding.yml and fixed tests

Display name instead of IDs for Superadmin objects

Administrate (new Super Admin) fixes ...

- Bumped version to latest for upstream bugfixes, fixes DMPRoadmap/roadmap#196
- Removed unneeded fields from some dashboards (that slowed down their Edit page)

Merge pull request #202 from CDLUC3/guidance-fixes ...

Guidance fixes

fixed the rest of the tests by swapping out I18n and removing locales from routes

fixed some of the failing tests. Commented out helpers/plan_list tests because it relied on old I18n helpers to determine column name

added logic to db/seeds.rb to always create a default org for the one defined in config/branding.yml. This is the managing org

removed branding.yml (branding_example.yml is now in place) and added it to .gitignore

Added example of branding.yml. Added note that the abbreviation listed in branding.yml must match the one in the DB

fixed other basic issues found on guidance pages DMPRoadmap/roadmap#185

fixed typo in guidances controller. Fixes part of DMPRoadmap/roadmap#185

fixes issue with publishing guidance groups DMPRoadmap/roadmap#185

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

Rebasing

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

Merge latest CDL changes

Merge pull request #201 from CDLUC3/template-fixes ...

CDL bug fixes for Template pages

updated section view to call correct partial DMPRoadmap/roadmap#193

fixed typo in partial name DMPRoadmap/roadmap#194

fixed issue with invalid route after creating a section

updated phases controller to allow org admins to update their org's templates DMPRoadmap/roadmap#192

updated templates controller so that editing details does not send user to 'view all templates' page DMPRoadmap/roadmap#192

fixed if statement that allows the editable template details section to appear DMPRoadmap/roadmap#192

fixed typo on admin_add view DMPRoadmap/roadmap#191

switched phase to @phase so that it uses the instance variable DMPRoadmap/roadmap#191

removed auto-creation of phase from templates controller. Updated template view to allow the 'Add Phase' tab to appear if the template.org == current_user.org DMPRoadmap/roadmap#191

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

Latest DCC fixes for bugs on plan pages

Merge pull request #200 from DigitalCurationCentre/development ...

Merge latest DCC changes

Merge branch 'fix_answer_issues' into development

fixes issues around answer text not saving properly; references https://github.com/DMPRoadmap/roadmap/issues/181 ...

fixes issues around status spacing and adds in untranslated strings for
status; references https://github.com/DMPRoadmap/roadmap/issues/182

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

Rebasing after merge of some CDL bug fixes