2017-03-30
@xsrust
fixes strong_parameters with orgs
xsrust committed on 30 Mar 2017
@xsrust
fixed outdataed organisation_type reference on edit of organisation_details page
xsrust committed on 30 Mar 2017
@xsrust
fixed update user profile bug due to strong parameters
xsrust committed on 30 Mar 2017
@Ray Carrick
Merge pull request #26 from DMPRoadmap/development ...
Ray Carrick authored on 30 Mar 2017 GitHub committed on 30 Mar 2017
@Ray Carrick
Merge branch 'development' into development
Ray Carrick authored on 30 Mar 2017 GitHub committed on 30 Mar 2017
@ray.carrick
Merge branch 'fix_answer_test' into development
ray.carrick committed on 30 Mar 2017
@ray.carrick
fix functional test for answer saving
ray.carrick committed on 30 Mar 2017
@ray.carrick
Merge branch 'remove_debugging' into development
ray.carrick committed on 30 Mar 2017
@ray.carrick
remove debug alert
ray.carrick committed on 30 Mar 2017
2017-03-29
@ray.carrick
Merge branch 'fix_status#182' into development ...
ray.carrick committed on 29 Mar 2017
@ray.carrick
change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182
ray.carrick committed on 29 Mar 2017
@ray.carrick
Merge branch 'edit_answers_link#208' into development
ray.carrick committed on 29 Mar 2017
@ray.carrick
answer questions link was old url. Fixes https://github.com/DMPRoadmap/roadmap/issues/208
ray.carrick committed on 29 Mar 2017
2017-03-28
@ray.carrick
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
ray.carrick committed on 28 Mar 2017
@ray.carrick
Merge branch 'answers_and_notes' into development
ray.carrick committed on 28 Mar 2017
@ray.carrick
Change notes to work with AJAX calls.
ray.carrick committed on 28 Mar 2017
@xsrust
fixed display bugs in organisation details and template_preview
xsrust committed on 28 Mar 2017
2017-03-27
@Brian Riley
Merge pull request #206 from DigitalCurationCentre/development ...
Brian Riley authored on 27 Mar 2017 GitHub committed on 27 Mar 2017
@Jimmy Angelakos
Merge pull request #203 from CDLUC3/fixing-tests ...
Jimmy Angelakos authored on 27 Mar 2017 GitHub committed on 27 Mar 2017
@Jimmy Angelakos
Display name instead of IDs for Superadmin objects
Jimmy Angelakos committed on 27 Mar 2017
@Jimmy Angelakos
Administrate (new Super Admin) fixes ...
Jimmy Angelakos committed on 27 Mar 2017
@Ray Carrick
Merge pull request #202 from CDLUC3/guidance-fixes ...
Ray Carrick authored on 27 Mar 2017 GitHub committed on 27 Mar 2017
2017-03-24
@briley
fixed the rest of the tests by swapping out I18n and removing locales from routes
briley committed on 24 Mar 2017
@briley
fixed some of the failing tests. Commented out helpers/plan_list tests because it relied on old I18n helpers to determine column name
briley committed on 24 Mar 2017
@briley
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
briley committed on 24 Mar 2017
@briley
removed branding.yml (branding_example.yml is now in place) and added it to .gitignore
briley committed on 24 Mar 2017
@briley
Added example of branding.yml. Added note that the abbreviation listed in branding.yml must match the one in the DB
briley committed on 24 Mar 2017
@briley
fixed other basic issues found on guidance pages DMPRoadmap/roadmap#185
briley committed on 24 Mar 2017
@briley
fixed typo in guidances controller. Fixes part of DMPRoadmap/roadmap#185
briley committed on 24 Mar 2017
@briley
fixes issue with publishing guidance groups DMPRoadmap/roadmap#185
briley committed on 24 Mar 2017