opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-03-31	69ceb9c Browse files » forgot to change a project_group to role xsrust committed on 31 Mar 2017
	e3cf058 Browse files » updated mailers to use new schema xsrust committed on 31 Mar 2017
	aa30a45 Browse files » updated roles controller to use strong parameters xsrust committed on 31 Mar 2017
2017-03-30	c2f3e9c Browse files » completes earlier fix of registrations_controller xsrust committed on 30 Mar 2017
	7460fdd Browse files » fixes strong_parameters with orgs xsrust committed on 30 Mar 2017
	c51695a Browse files » fixed outdataed organisation_type reference on edit of organisation_details page xsrust committed on 30 Mar 2017
	cb5b0e8 Browse files » fixed update user profile bug due to strong parameters xsrust committed on 30 Mar 2017
	bb5f4af Browse files » Merge pull request #26 from DMPRoadmap/development ... Merge Roadmap into DCC Ray Carrick authored on 30 Mar 2017 GitHub committed on 30 Mar 2017
	8a4b1b4 Browse files » Merge branch 'development' into development Ray Carrick authored on 30 Mar 2017 GitHub committed on 30 Mar 2017
	00b246e Browse files » Merge branch 'fix_answer_test' into development ray.carrick committed on 30 Mar 2017
	11123d7 Browse files » fix functional test for answer saving ray.carrick committed on 30 Mar 2017
	644d9d2 Browse files » Merge branch 'remove_debugging' into development ray.carrick committed on 30 Mar 2017
	e98aaf8 Browse files » remove debug alert ray.carrick committed on 30 Mar 2017
2017-03-29	a035e41 Browse files » Merge branch 'fix_status#182' into development ... fixes https://github.com/DMPRoadmap/roadmap/issues/182 ray.carrick committed on 29 Mar 2017
	436a250 Browse files » change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182 ray.carrick committed on 29 Mar 2017
	aad04d8 Browse files » Merge branch 'edit_answers_link#208' into development ray.carrick committed on 29 Mar 2017
	9820cbd Browse files » answer questions link was old url. Fixes https://github.com/DMPRoadmap/roadmap/issues/208 ray.carrick committed on 29 Mar 2017
2017-03-28	ed5105c Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development ray.carrick committed on 28 Mar 2017
	4722f1b Browse files » Merge branch 'answers_and_notes' into development ray.carrick committed on 28 Mar 2017
	cd2169f Browse files » Change notes to work with AJAX calls. ray.carrick committed on 28 Mar 2017
	57ae8a2 Browse files » fixed display bugs in organisation details and template_preview xsrust committed on 28 Mar 2017
2017-03-27	9a714a5 Browse files » Merge pull request #206 from DigitalCurationCentre/development ... Super admin fixes/improvements Brian Riley authored on 27 Mar 2017 GitHub committed on 27 Mar 2017
	ee61013 Browse files » Merge pull request #203 from CDLUC3/fixing-tests ... Moved Managing Org definition to branding.yml and fixed tests Jimmy Angelakos authored on 27 Mar 2017 GitHub committed on 27 Mar 2017
	9015469 Browse files » Display name instead of IDs for Superadmin objects Jimmy Angelakos committed on 27 Mar 2017
	06c0160 Browse files » 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) Jimmy Angelakos committed on 27 Mar 2017
	2cf3f23 Browse files » Merge pull request #202 from CDLUC3/guidance-fixes ... Guidance fixes Ray Carrick authored on 27 Mar 2017 GitHub committed on 27 Mar 2017
2017-03-24	806a33c Browse files » fixed the rest of the tests by swapping out I18n and removing locales from routes briley committed on 24 Mar 2017
	affb895 Browse files » 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
	31a31c0 Browse files » 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
	8a7040d Browse files » removed branding.yml (branding_example.yml is now in place) and added it to .gitignore briley committed on 24 Mar 2017