opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-06-05	737be12 Browse files » Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes xsrust committed on 5 Jun 2017
	b523e94 Browse files » Merge pull request #394 from DigitalCurationCentre/issue272 ... Table formatting toolbar without obscuring the view. DMPRoadmap/roadm… Jimmy Angelakos authored on 5 Jun 2017 GitHub committed on 5 Jun 2017
	1fd238c Browse files » Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272 Jose Lloret committed on 5 Jun 2017
2017-06-02	835813a Browse files » Merge pull request #393 from DigitalCurationCentre/vyruss/bugfixes ... Vyruss/bugfixes Brian Riley authored on 2 Jun 2017 GitHub committed on 2 Jun 2017
	71bab65 Browse files » Updated translation strings & added :migrated attribute access to template model Jimmy Angelakos committed on 2 Jun 2017
	8935ead Browse files » Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes Jimmy Angelakos committed on 2 Jun 2017
	bf9dbde Browse files » Merge pull request #392 from DigitalCurationCentre/issue_382 ... Issue 382 Jimmy Angelakos authored on 2 Jun 2017 GitHub committed on 2 Jun 2017
	3f9275c Browse files » Re-enable attr_accessible for Dragonfly gem (logo uploads) - closes #375 Jimmy Angelakos committed on 2 Jun 2017
	509cbd2 Browse files » Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ... Fixed merge conflict. DMPRoadmap/roadmap#382 onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382 Jose Lloret committed on 2 Jun 2017
	5e3f765 Browse files » We don't need .live here but just a template name for @based_on - Should fix #385, #389. Jimmy Angelakos committed on 2 Jun 2017
	fafb551 Browse files » Merge pull request #39 from DMPRoadmap/development ... Development Jimmy Angelakos authored on 2 Jun 2017 GitHub committed on 2 Jun 2017
2017-05-31	6145260 Browse files » Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes xsrust committed on 31 May 2017
	e63c3fc Browse files » updated routes from put to get for admin_customize, addresses part of #370 xsrust committed on 31 May 2017
	a037da2 Browse files » Updated translation strings Jimmy Angelakos committed on 31 May 2017
	06afc78 Browse files » Merge pull request #386 from DigitalCurationCentre/xsrust/bugfixes ... Xsrust/bugfixes Jimmy Angelakos authored on 31 May 2017 GitHub committed on 31 May 2017
	c6ebcb1 Browse files » changed text for example answers, fixes #277 xsrust committed on 31 May 2017
	8135139 Browse files » fixes issue with some template guidance not displaying xsrust committed on 31 May 2017
2017-05-30	3994fc8 Browse files » Merge pull request #384 from DigitalCurationCentre/vyruss/bugfixes ... Replaced funky iteration logic which broke for non-sequential section… Jose Lloret authored on 30 May 2017 GitHub committed on 30 May 2017
2017-05-30	108a74f Browse files » Replaced funky iteration logic which broke for non-sequential section/question numbers - Fixes #331. Jimmy Angelakos committed on 30 May 2017
2017-05-29	9cd57a7 Browse files » Merge pull request #380 from DigitalCurationCentre/issue355 ... Fixed timeago problem for when a new answer is created. Refactored Ja… Jimmy Angelakos authored on 29 May 2017 GitHub committed on 29 May 2017
	a0afa98 Browse files » Merge pull request #379 from DigitalCurationCentre/xsrust/bugfixes ... fixed display issues with guidance/suggested_answers Jimmy Angelakos authored on 29 May 2017 GitHub committed on 29 May 2017
	63d7c8c Browse files » Fixed timeago problem for when a new answer is created. Refactored JavaScript logic into its own file. Created a partial to handle answer status. DMPRoadmap/roadmap#355 Jose Lloret committed on 29 May 2017
	e9651bb Browse files » fixed display issues with guidance/suggested_answers xsrust committed on 29 May 2017
2017-05-26	b293aa4 Browse files » Merge pull request #365 from DigitalCurationCentre/xsrust/bugfixes ... updated org-admin and plan create pages to reflect schema change Jimmy Angelakos authored on 26 May 2017 GitHub committed on 26 May 2017
	078d4b3 Browse files » Merge pull request #368 from DigitalCurationCentre/vyruss/bugfixes ... Various bugfixes/text changes! Looks good to me! Jose Lloret authored on 26 May 2017 GitHub committed on 26 May 2017
	c30453a Browse files » Text changes for #345. Jimmy Angelakos committed on 26 May 2017
	8017e54 Browse files » Added dotted underline (HTML5 recommendation) for org admin user privileges - #259. Jimmy Angelakos committed on 26 May 2017
	10b27fa Browse files » Permission yanking should not apply to super admin. #314, #367 Jimmy Angelakos committed on 26 May 2017
	fb3d679 Browse files » Updated test cases for plan sharing. Jimmy Angelakos committed on 26 May 2017
	e673429 Browse files » Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes Jimmy Angelakos committed on 26 May 2017