opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-05-24	66a68fb Browse files » Merge remote-tracking branch 'roadmap/development' into vyruss/bugfixes Jimmy Angelakos committed on 24 May 2017
	0c361f3 Browse files » Merge pull request #356 from DigitalCurationCentre/issue_354 ... Issue 354 Jimmy Angelakos authored on 24 May 2017 GitHub committed on 24 May 2017
	d894ad0 Browse files » Checkbox using rails FormHelper. Helper method at answer model for determining if an option should be selected. DMPRoadmap/roadmap#354 Jose Lloret committed on 24 May 2017
	7c04280 Browse files » Changed guidance display to annotations model from question.guidance column model. Jimmy Angelakos committed on 24 May 2017
	ffd3217 Browse files » Merge pull request #37 from DMPRoadmap/development ... Development Jimmy Angelakos authored on 24 May 2017 GitHub committed on 24 May 2017
2017-05-23	b5a9f16 Browse files » Merge pull request #351 from DigitalCurationCentre/vyruss/bugfixes ... Vyruss/bugfixes Jose Lloret authored on 23 May 2017 GitHub committed on 23 May 2017
	4770488 Browse files » Updated tests. Jimmy Angelakos committed on 23 May 2017
	758a586 Browse files » Merge pull request #353 from DigitalCurationCentre/issue_302 ... radiobuttons question is now saving through its relation question_opt… Jimmy Angelakos authored on 23 May 2017 GitHub committed on 23 May 2017
	82a42d9 Browse files » typo Jimmy Angelakos committed on 23 May 2017
	0793397 Browse files » Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes Jimmy Angelakos committed on 23 May 2017
	0286835 Browse files » Fixes for #311, #345. Jimmy Angelakos committed on 23 May 2017
	647b1ba Browse files » radiobuttons question is now saving through its relation question_options rather than options. Added whitelisting attributes for mass assignment. DMPRoadmap/roadmap#302 Jose Lloret committed on 23 May 2017
2017-05-22	f668651 Browse files » Colon separator between Guidance Group name and Guidance name - Fixes #333 ? Jimmy Angelakos committed on 22 May 2017
	2268f47 Browse files » Merge pull request #350 from DigitalCurationCentre/vyruss/bugfixes ... Vyruss/bugfixes Sam Rust authored on 22 May 2017 GitHub committed on 22 May 2017
	87b6a82 Browse files » Asset pipeline fix for bg.gif Jimmy Angelakos committed on 22 May 2017
	4225ca9 Browse files » Merge pull request #349 from DigitalCurationCentre/issue_297 ... Issue 297 Jimmy Angelakos authored on 22 May 2017 GitHub committed on 22 May 2017
	10d5ceb Browse files » Removed strong tag from docx when exporting question.text. DMPRoadmap/roadmap#297 Jose Lloret committed on 22 May 2017
	af300c1 Browse files » Set default sort order for Orgs to be Name ASC - fixes #340 Jimmy Angelakos committed on 22 May 2017
	a8cc528 Browse files » Re-added table sort arrows to asset pipeline - Closes #342. Jimmy Angelakos committed on 22 May 2017
	68b9dc9 Browse files » Added confirmation message for guidance choices - closes #332 Jimmy Angelakos committed on 22 May 2017
2017-05-20	69f862e Browse files » Added tooltips & strings for org admin/user permissions, closes #259 Jimmy Angelakos committed on 20 May 2017
2017-05-20	21df876 Browse files » Quick'n'dirty touchscreen hack for Bootstrap's buggy dropdown, closes #316 Jimmy Angelakos committed on 20 May 2017
2017-05-19	12e94f4 Browse files » Merge pull request #36 from DMPRoadmap/development ... Development Jimmy Angelakos authored on 19 May 2017 GitHub committed on 19 May 2017
	5e20286 Browse files » Merge pull request #328 from DigitalCurationCentre/issue_272 ... Guidances new/edit with table formatting displayed properly. DMPRoadm… Jimmy Angelakos authored on 19 May 2017 GitHub committed on 19 May 2017
	ac88afc Browse files » Merge pull request #329 from DigitalCurationCentre/vyruss/bugfixes ... Vyruss/bugfixes Jimmy Angelakos authored on 19 May 2017 GitHub committed on 19 May 2017
	cfafe38 Browse files » Closes #322. ... Now deleting stem accounts of invited users who haven't followed invitation link and try to sign up (but their email already exists). Jimmy Angelakos committed on 19 May 2017
	ea203a8 Browse files » Fix for super admin (new annotation model) Jimmy Angelakos committed on 19 May 2017
	0682bf7 Browse files » Merge branch 'development' into vyruss/bugfixes Jimmy Angelakos committed on 19 May 2017
	e1915e0 Browse files » Merge pull request #327 from DigitalCurationCentre/roles_and_plan_sharing ... Roles and plan sharing Jimmy Angelakos authored on 19 May 2017 GitHub committed on 19 May 2017
	f211b02 Browse files » Guidances new/edit with table formatting displayed properly. DMPRoadmap/roadmap#272 Jose Lloret committed on 19 May 2017