opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-11-27	Unverified e100b7f Browse files » Merge pull request #860 from DigitalCurationCentre/issue811 ... Issue 811 Brian Riley authored on 27 Nov 2017 GitHub committed on 27 Nov 2017
2017-11-23	f93521b Browse files » conditional logic email for users.admin_privileges. DMPRoadmap/roadmap#811 ... conditional logic for use_api using the flag users.admin_privileges. DMPRoadmap/roadmap#811 conditional email for removing access to a plan using users.added_as_coowner key. DMPRoadmap/roadmap#811 Jose Lloret committed on 23 Nov 2017
2017-11-23	Unverified 144e6b6 Browse files » Merge pull request #856 from CDLUC3/issue434 ... Org Admin provide feedback Jose Lloret authored on 23 Nov 2017 GitHub committed on 23 Nov 2017
2017-11-22	971ec8b Browse files » Org Admin provide feedback ... Add Plans page to Org Admin section added org admin plans page finsihed up org admin plans page added feedback complete and updated emails to use email_signature partial refactored access checks on Plan now that user can have multiple roles (reviewer + ?) finished feedback completion routine added tests for new feedback methods fixes for merge conflicts fixed issues with plan and user changes fixed issue with notes controller test fixed issue with phase controller test briley authored on 16 Nov 2017 Brian Riley committed on 22 Nov 2017
	Unverified f951356 Browse files » Merge pull request #847 from CDLUC3/css_refinements ... CSS Refinements (#746) Brian Riley authored on 22 Nov 2017 GitHub committed on 22 Nov 2017
	Unverified b315693 Browse files » Merge pull request #853 from DigitalCurationCentre/issue837 ... Issue 837 Brian Riley authored on 22 Nov 2017 GitHub committed on 22 Nov 2017
	f79c6b3 Browse files » CSS fixes (#746) ... Put back Filter Field in the views - incorrectly notified in the ticket fix the filter field in templates page put back filter field in plans page bhavi committed on 22 Nov 2017
	Unverified 31bc35a Browse files » Merge pull request #850 from DigitalCurationCentre/issue811 ... Issue 811 Brian Riley authored on 22 Nov 2017 GitHub committed on 22 Nov 2017
	11f9295 Browse files » commentor is able to see plan details and write page. Commentor cannot access to share functionality. DMPRoadmap/roadmap#837 Jose Lloret committed on 22 Nov 2017
	e2926d2 Browse files » conditional_user_mailer concern for delivering email according to preferences. DMPRoadmap/roadmap#811 ... unit test for the concern. DMPRoadmap/roadmap#811 deliver_if recipients keyword accepts User or Array of Users. DMPRoadmap/roadmap#811 conditional email for users.new_comment, owners_and_coowners.visibility_changed. DMPRoadmap/roadmap#811 conditional email for users.added_as_coowner. DMPRoadmap/roadmap#811 conditional email for admins.feedback_requested. DMPRoadmap/roadmap#811 Jose Lloret committed on 22 Nov 2017
2017-11-21	Unverified 1cd2797 Browse files » Merge pull request #844 from DMPRoadmap/issue155 ... Adjusted front-page content for #155 Brian Riley authored on 21 Nov 2017 GitHub committed on 21 Nov 2017
	Unverified a1dabb2 Browse files » Merge pull request #843 from DigitalCurationCentre/issue786 ... Issue 786 Brian Riley authored on 21 Nov 2017 GitHub committed on 21 Nov 2017
	2cb0bef Browse files » Adjusted front-page content for #155 ... - Added "home/welcome" partial loaded by "home/index" - Added welcome links under organisational branding Jimmy Angelakos committed on 21 Nov 2017
	6accf9e Browse files » paginable module to accomodate any model that needs paginated views. DMPRoadmap/roadmap#786 ... Pagination for plan model. DMPRoadmap/roadmap#786 Pagination for user model. DMPRoadmap/roadmap#786 Jose Lloret committed on 21 Nov 2017
	Unverified 5c2d6bf Browse files » Merge pull request #842 from CDLUC3/issue726 ... Fixes html issue with feedback confirmation email Jose Lloret authored on 21 Nov 2017 GitHub committed on 21 Nov 2017
	Unverified 78d0376 Browse files » Merge pull request #841 from CDLUC3/add-contact-us-url ... Add contact_us_url handler for Devise emails Jose Lloret authored on 21 Nov 2017 GitHub committed on 21 Nov 2017
2017-11-20	d0457f4 Browse files » updated feedback confirmation to us html.erb template so that html is properly handled Brian Riley committed on 20 Nov 2017
2017-11-20	3bd59a4 Browse files » added contact_us_url check on devise emails Brian Riley committed on 20 Nov 2017
2017-11-16	Unverified 039bc62 Browse files » Merge pull request #828 from CDLUC3/issue533 ... update password confirmation modal to auto-submit form Brian Riley authored on 16 Nov 2017 GitHub committed on 16 Nov 2017
	Unverified a32e595 Browse files » Merge pull request #810 from DigitalCurationCentre/issue677 ... Issue 677 Brian Riley authored on 16 Nov 2017 GitHub committed on 16 Nov 2017
	Unverified 6af0e15 Browse files » Merge branch 'CDL-MVP' into issue677 Brian Riley authored on 16 Nov 2017 GitHub committed on 16 Nov 2017
	Unverified 2375c14 Browse files » Merge branch 'CDL-MVP' into issue677 Brian Riley authored on 16 Nov 2017 GitHub committed on 16 Nov 2017
	591254c Browse files » update password confirmation modal to submit form ... update password confirmation modal to submit form made pwd-confirmation selector less explicit. removed JS that disabled org selecter if shib linked fixed linter issue briley committed on 16 Nov 2017
	Unverified cf44151 Browse files » Merge pull request #832 from DigitalCurationCentre/rebase_mvp_off_dev ... Merge Development into CDL-MVP Brian Riley authored on 16 Nov 2017 GitHub committed on 16 Nov 2017
	232ccf8 Browse files » updating failing tests xsrust committed on 16 Nov 2017
	f21474b Browse files » re-saved files xsrust committed on 16 Nov 2017
	ff6c9f0 Browse files » phases edit view and its sub-templates using local variables instead of instance variables. DMPRoadmap/roadmap#677 ... conditional displaying of sub-templates at edit phase. This permits being re-used when previewing a template phase. DMPRoadmap/roadmap#677 Improved views logic. Conditional event handlers for when user does not have permissions to edit plan answer. DMPRoadmap/roadmap#677 Jose Lloret committed on 16 Nov 2017
	7f4ba49 Browse files » merge Dev into CDL-MVP xsrust committed on 16 Nov 2017
	fa6ec53 Browse files » Fix conflicts with merging dev into CDL xsrust committed on 16 Nov 2017
	Unverified c92a74f Browse files » Merge pull request #831 from CDLUC3/issue740 ... Revert org selection changes Jose Lloret authored on 16 Nov 2017 GitHub committed on 16 Nov 2017