opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-05-03	99a6899 Browse files » Merge branch 'development' into development Jimmy Angelakos authored on 3 May 2017 GitHub committed on 3 May 2017
2017-05-02	74b215f Browse files » Fixed nil user variable when generating HTML code for sharing notification. DMPRoadmap/roadmap#286 ... added condition for avoiding sharing plan with email matching plans owner. DMPRoadmap/roadmap#286 Added message to internationalisation files. DMPRoadmap/roadmap#286 Jose Lloret committed on 2 May 2017
	1eeb7a2 Browse files » Removed description field when choosing a template for creating a plan. DMPRoadmap/roadmap#199 Jose Lloret committed on 2 May 2017
	b8e72e6 Browse files » Added gettext gem to find any string marked for translation. DMPRoadmap/roadmap#281 ... Added to Gemfile and Gemfile.lock Added string marked for translation in German. DMPRoadmap/roadmap#281 .gitignore excluding auto-generated files for gettext:find. DMPRoadmap/roadmap#281 Jose Lloret committed on 2 May 2017
2017-04-28	c77ddfb Browse files » Merge branch 'DigitalCurationCentre-development' into development Brian Riley committed on 28 Apr 2017
	d1b09d7 Browse files » fixed merge conflict in schema.rb Brian Riley committed on 28 Apr 2017
	6db1d84 Browse files » Merge pull request #279 from CDLUC3/development ... Latest bug fixes from CDL Jimmy Angelakos authored on 28 Apr 2017 GitHub committed on 28 Apr 2017
2017-04-27	00e7fe8 Browse files » commented out plan creation integration test. the workflow will be changing soon Brian Riley committed on 27 Apr 2017
	899d804 Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	f3555ad Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	b0b6aca Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	aa17d70 Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	ebcb6d5 Browse files » fixed integration tests for templates Brian Riley committed on 27 Apr 2017
	8568dfc Browse files » removed debug lines from template test Brian Riley committed on 27 Apr 2017
	2504d38 Browse files » fixed issue with template test Brian Riley committed on 27 Apr 2017
2017-04-26	1978c67 Browse files » Merge branch 'remove-settings' into development Brian Riley committed on 26 Apr 2017
	d094347 Browse files » Merge branch 'fix-template-controller' into development Brian Riley committed on 26 Apr 2017
	65480b3 Browse files » updated plan edit lock warning message and disabled textbox with user's answer DMPRoadmap/roadmap#55 Brian Riley committed on 26 Apr 2017
	f299441 Browse files » updated generic error message handler to show value when applicable DMPRoadmap/roadmap#234 Brian Riley committed on 26 Apr 2017
	4b0808d Browse files » removed confirmations controller, route and tests since we turned devise's email confirmation off DMPRoadmap/roadmap#254 Brian Riley committed on 26 Apr 2017
	8b01f05 Browse files » removed test for the user plan_list settings ... DMPRoadmap/roadmap#248 Brian Riley committed on 26 Apr 2017
	8434394 Browse files » Removed remaining pieces of the plan_list settings DMPRoadmap/roadmap#248 Brian Riley committed on 26 Apr 2017
	fa67892 Browse files » moved some of the logic that was defaulting template attributes in the controller over to the model. Fixed tests DMPRoadmap/roadmap#251 DMPRoadmap/roadmap#273 Brian Riley committed on 26 Apr 2017
	9465772 Browse files » section association sorted by number rather than id. DMPRoadmap/roadmap#269 ... Funder and Institution displayed adequately. DMPRoadmap/roadmap#269 Jose Lloret committed on 26 Apr 2017
2017-04-25	11234f3 Browse files » moved most of the save logic from the template controller to the model. Updated the phases/section/question models to use the after_save callback to handle updating the template.dirty flag Brian Riley committed on 25 Apr 2017
	f6c9942 Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development xsrust committed on 25 Apr 2017
	9a35a28 Browse files » updated link to admin area to ensure that the user has permission to view that page, fixes #265 xsrust committed on 25 Apr 2017
	d87259e Browse files » Removed extraneous .all Jimmy Angelakos committed on 25 Apr 2017
2017-04-24	6b081e2 Browse files » Updated email subjects and access removed message DMPRoadmap/roadmap#239 Brian Riley committed on 24 Apr 2017
2017-04-24	bdc0d92 Browse files » Updated email content and added new welcome message DMPRoadmap/roadmap#239 Brian Riley committed on 24 Apr 2017