opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-06-15	d684012 Browse files » fixed merge conflicts Brian Riley committed on 15 Jun 2017
	eec141f Browse files » Merge pull request #56 from DMPRoadmap/development ... Rebase with latest bugfixes Brian Riley authored on 15 Jun 2017 GitHub committed on 15 Jun 2017
	aafba69 Browse files » fixed merge conflict left over from unstashed changes Brian Riley committed on 15 Jun 2017
	dcc0676 Browse files » Merge pull request #423 from DigitalCurationCentre/xsrust/bugfixes ... Xsrust/bugfixes Brian Riley authored on 15 Jun 2017 GitHub committed on 15 Jun 2017
	17b6eff Browse files » updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined xsrust committed on 15 Jun 2017
	c42f7a1 Browse files » ran gettext:find for new translations xsrust committed on 15 Jun 2017
	c15c6d2 Browse files » made gettext calm down about fuzzy translations (no more warnings) xsrust committed on 15 Jun 2017
	3f50866 Browse files » drive org-admins to add an abbreviation to their org for display with annotations xsrust committed on 15 Jun 2017
	a5e212a Browse files » funder guidance now displays on customized templates xsrust committed on 15 Jun 2017
2017-06-14	56d9b88 Browse files » add custom div to profile page bhavi committed on 14 Jun 2017
	ad67a2c Browse files » move user profile to partials, and add prefrences tab bhavi committed on 14 Jun 2017
	4f82275 Browse files » Change default plan visibility to `3` (`:privately_visible`) Jimmy Angelakos authored on 14 Jun 2017 GitHub committed on 14 Jun 2017
	2f7e4f2 Browse files » Merge pull request #422 from DigitalCurationCentre/xsrust/bugfixes ... Xsrust/bugfixes Jimmy Angelakos authored on 14 Jun 2017 GitHub committed on 14 Jun 2017
	caec171 Browse files » updated link in api mailer xsrust committed on 14 Jun 2017
	6bacd7b Browse files » fixes error with prefetching, now passes tests xsrust committed on 14 Jun 2017
	22713a6 Browse files » Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes xsrust committed on 14 Jun 2017
	a91a5b2 Browse files » completed work on API xsrust committed on 14 Jun 2017
2017-06-13	929240b Browse files » Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP bhavi committed on 13 Jun 2017
2017-06-13	be2e16f Browse files » api updates xsrust committed on 13 Jun 2017
2017-06-12	881136c Browse files » css tweak and wording changes DMPRoadmap/roadmap#405 briley committed on 12 Jun 2017
	2d61f66 Browse files » Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP bhavi committed on 12 Jun 2017
	e9ee7bf Browse files » fixed bug in edit profile page briley committed on 12 Jun 2017
	345dc66 Browse files » updated size of shib_ds page org list columns and updated org links DMPRoadmap/roadmap#405 briley committed on 12 Jun 2017
	2244fcf Browse files » Merge pull request #415 from DigitalCurationCentre/issue414 ... Issue414 Jimmy Angelakos authored on 12 Jun 2017 GitHub committed on 12 Jun 2017
	8dc578e Browse files » css tweaks for DMPRoadmap/roadmap#408 briley committed on 12 Jun 2017
	0a0bcfe Browse files » Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414 Jose Lloret committed on 12 Jun 2017
	762443a Browse files » updated edit profile page to display api with same formatting as the rest of the page xsrust committed on 12 Jun 2017
	e1eded9 Browse files » Merge branch 'development' of ../roadmap_src into development Jose Lloret committed on 12 Jun 2017
	2c08319 Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development Jose Lloret committed on 12 Jun 2017
	c6a10f9 Browse files » Merge pull request #413 from DigitalCurationCentre/xsrust/bugfixes ... fixed logic which lead to guidance not being displayed Jimmy Angelakos authored on 12 Jun 2017 GitHub committed on 12 Jun 2017