opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-07-17	6dd549b Browse files » Merge branch 'CDL-MVP' of https://github.com/DMPRoadmap/roadmap into xsrust/498 xsrust committed on 17 Jul 2017
	c79a5ce Browse files » updated view for show_export and controller according to #498 xsrust committed on 17 Jul 2017
	37fa028 Browse files » Merge pull request #512 from CDLUC3/CDL-MVP ... Refactored plan edit details and share pages. Sam Rust authored on 17 Jul 2017 GitHub committed on 17 Jul 2017
2017-07-14	efa760b Browse files » fixed issues with tests Brian Riley committed on 14 Jul 2017
	70b94e8 Browse files » updated text on project details page Brian Riley committed on 14 Jul 2017
	ec1d80b Browse files » made suggested changes from PR Brian Riley committed on 14 Jul 2017
2017-07-13	42bea42 Browse files » fixed test broken by switch of Role update from html to json briley committed on 13 Jul 2017
	7c4c29e Browse files » Merge branch 'plan-details-share' into CDL-MVP briley committed on 13 Jul 2017
	5580e03 Browse files » Merge pull request #62 from DMPRoadmap/CDL-MVP ... rebasing with tooltip trigger fixes Brian Riley authored on 13 Jul 2017 GitHub committed on 13 Jul 2017
	b5007bc Browse files » finished plan share and edit pages. Updated styling and handling or alert/notice messages. Updated css to allow background color, alert message and notice message colors to be set in dmproadmap.scss briley committed on 13 Jul 2017
	067326e Browse files » Merge pull request #511 from DigitalCurationCentre/issue141 ... popover and tooltip triggered by focus and hover. #141 Jimmy Angelakos authored on 13 Jul 2017 GitHub committed on 13 Jul 2017
	fc3c47f Browse files » popover and tooltip triggered by focus and hover. DMPRoadmap/roadmap#141 Jose Lloret committed on 13 Jul 2017
2017-07-12	0560ba4 Browse files » finished up share plan page. briley committed on 12 Jul 2017
	a3bc7a2 Browse files » fixed merge conflicts in db/schema.rb briley committed on 12 Jul 2017
	67b1b49 Browse files » ran db:migrate briley committed on 12 Jul 2017
	c81dfe0 Browse files » Merge pull request #61 from DMPRoadmap/CDL-MVP ... Prefs moved to separate table Brian Riley authored on 12 Jul 2017 GitHub committed on 12 Jul 2017
	d13bdf9 Browse files » Merge pull request #509 from DigitalCurationCentre/xsrust/481 ... Xsrust/481 Jimmy Angelakos authored on 12 Jul 2017 GitHub committed on 12 Jul 2017
	20b2460 Browse files » fixes broken tests xsrust committed on 12 Jul 2017
	0405973 Browse files » updated preferences to use JSON hash and be contained in a new model, addresses #481 xsrust committed on 12 Jul 2017
2017-07-11	46e3c67 Browse files » started work on share plan page DMPRoadmap/roadmap#497 briley committed on 11 Jul 2017
	7e4fc99 Browse files » finished up project details page briley committed on 11 Jul 2017
	211e918 Browse files » fixed merge conflict and set max width to h1 tags to prevent overlap with alert/notice messages briley committed on 11 Jul 2017
	60a01a3 Browse files » started refactoring the edit project details page DMPRoadmap/roadmap#491 briley committed on 11 Jul 2017
	4df5293 Browse files » Merge pull request #60 from DMPRoadmap/CDL-MVP ... Rebasing with latest changes Brian Riley authored on 11 Jul 2017 GitHub committed on 11 Jul 2017
	131cef1 Browse files » Merge pull request #503 from CDLUC3/CDL-MVP ... New navigation menus, accessibility for images and fontawesome icons Brian Riley authored on 11 Jul 2017 GitHub committed on 11 Jul 2017
	7f6de76 Browse files » Merge branch 'CDL-MVP' into CDL-MVP Brian Riley authored on 11 Jul 2017 GitHub committed on 11 Jul 2017
	0edaf36 Browse files » Merge pull request #508 from DigitalCurationCentre/issue483 ... Issue483 Sam Rust authored on 11 Jul 2017 GitHub committed on 11 Jul 2017
	b02b9e6 Browse files » Merge branch 'CDL-MVP' into issue483 Jose Lloret committed on 11 Jul 2017
	3ae6c30 Browse files » FormHelpers for registrations views. DMPRoadmap/roadmap#483 ... FormHelpers for plan views. DMPRoadmap/roadmap#483 FormHelpers for shared views. DMPRoadmap/roadmap#483 fixed typo at views/plans/_available_templates.html.erb. DMPRoadmap/roadmap#483 Jose Lloret committed on 11 Jul 2017
	6e3ff0c Browse files » Merge pull request #506 from DigitalCurationCentre/xsrust/138 ... Xsrust/138 Jimmy Angelakos authored on 11 Jul 2017 GitHub committed on 11 Jul 2017