opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-03-22	15db0ab Browse files » updated phases controller to allow org admins to update their org's templates DMPRoadmap/roadmap#192 Brian Riley committed on 22 Mar 2017
	210c110 Browse files » updated templates controller so that editing details does not send user to 'view all templates' page DMPRoadmap/roadmap#192 Brian Riley committed on 22 Mar 2017
	89d7482 Browse files » fixed if statement that allows the editable template details section to appear DMPRoadmap/roadmap#192 Brian Riley committed on 22 Mar 2017
	9ecbbe2 Browse files » fixed typo on admin_add view DMPRoadmap/roadmap#191 Brian Riley committed on 22 Mar 2017
	7a61478 Browse files » switched phase to @phase so that it uses the instance variable DMPRoadmap/roadmap#191 Brian Riley committed on 22 Mar 2017
	59d1e05 Browse files » 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 Brian Riley committed on 22 Mar 2017
	bb7a834 Browse files » Merge pull request #39 from DMPRoadmap/development ... Latest DCC fixes for bugs on plan pages Brian Riley authored on 22 Mar 2017 GitHub committed on 22 Mar 2017
	199de67 Browse files » Merge pull request #200 from DigitalCurationCentre/development ... Merge latest DCC changes Brian Riley authored on 22 Mar 2017 GitHub committed on 22 Mar 2017
	ea71f05 Browse files » Merge branch 'fix_answer_issues' into development ray.carrick committed on 22 Mar 2017
	112db27 Browse files » 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 ray.carrick committed on 22 Mar 2017
	41a4a08 Browse files » Merge pull request #38 from DMPRoadmap/development ... Rebasing after merge of some CDL bug fixes Brian Riley authored on 22 Mar 2017 GitHub committed on 22 Mar 2017
	567cdb1 Browse files » Merge branch 'fix_customization_of' into development ray.carrick committed on 22 Mar 2017
	5f9772c Browse files » missing bracket ray.carrick committed on 22 Mar 2017
	e73a0fa Browse files » Merge branch 'fix_view_customised_template' into development ray.carrick committed on 22 Mar 2017
	616e2d5 Browse files » customization_of handled wrongly ray.carrick committed on 22 Mar 2017
	d0cbbb6 Browse files » Merge pull request #24 from DMPRoadmap/development ... Merge latest PR from CDL across to DCC Ray Carrick authored on 22 Mar 2017 GitHub committed on 22 Mar 2017
	e418aac Browse files » Merge pull request #190 from CDLUC3/development ... Bug fix for policy issue and fixes for tests Ray Carrick authored on 22 Mar 2017 GitHub committed on 22 Mar 2017
2017-03-21	55a30a7 Browse files » addresses further issue on DMPRoadmap/roadmap#191 by setting the phase to modifiable briley committed on 21 Mar 2017
	aa0adff Browse files » fixes DMPRoadmap/roadmap#191 by creating a default phase briley committed on 21 Mar 2017
	8f01d61 Browse files » reverted changes to application_controller and schema.rb briley committed on 21 Mar 2017
	41ef3fb Browse files » fixes 'we're sorry HTTP 500 error' when clicking on the phase tab when editing a template. DMPRoadmap/roadmap#187 briley committed on 21 Mar 2017
	b2a48d9 Browse files » Merge branch 'development' into development Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	bdb2d51 Browse files » Merge pull request #1 from DMPRoadmap/master ... Rebasing master Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	532211a Browse files » Merge branch 'development' of https://github.com/CDLUC3/roadmap into development briley committed on 21 Mar 2017
	e2d013d Browse files » Merge pull request #37 from DMPRoadmap/development ... Reintroduced Formtastic Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	975ffad Browse files » Merge pull request #189 from DigitalCurationCentre/development ... Reinstating Formtastic which was prematurely removed. Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	9189044 Browse files » Reinstating Formtastic which was prematurely removed. Jimmy Angelakos committed on 21 Mar 2017
	258ff71 Browse files » Merge branch 'development' of https://github.com/CDLUC3/roadmap into development briley committed on 21 Mar 2017
	c40fe08 Browse files » fixes to some of the functional tests to use FastGettext instead of I18n briley committed on 21 Mar 2017
	b89c3b8 Browse files » Merge pull request #36 from DMPRoadmap/development ... Addition of Administrate Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017