opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-11-22	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
2017-11-22	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
	Unverified 81c2e00 Browse files » Merge pull request #830 from CDLUC3/issue726 ... Updated Request Feedback default on Org details page Jose Lloret authored on 16 Nov 2017 GitHub committed on 16 Nov 2017
2017-11-15	fd26ade Browse files » reverted org selecter/other org textbox to DMPonline approach ... reverted org selecter/other org textbox to DMPonline approach removed disabled attr from org selecter briley committed on 15 Nov 2017
	c9869eb Browse files » added mail helper for feedback confirmationdefaults. updated org details. ... removed commented out lines briley committed on 15 Nov 2017
	Unverified ced7ece Browse files » Merge pull request #827 from CDLUC3/issue732 ... Fixes for visibility, comment and feedback emails Jose Lloret authored on 15 Nov 2017 GitHub committed on 15 Nov 2017
	Unverified 8dd1249 Browse files » Merge pull request #825 from CDLUC3/url-to-path-helpers ... Fix for create plan page ajax request Jose Lloret authored on 15 Nov 2017 GitHub committed on 15 Nov 2017
2017-11-14	0112b07 Browse files » Fixes for emails ... added check to use the default contact_us_url if none defined in branding.yml added raw to feedback emails updated comment emailer to allow contact_us_url default briley committed on 14 Nov 2017
	9b5240b Browse files » switch url helper to path helper briley committed on 14 Nov 2017
	Unverified 3f095bc Browse files » Merge pull request #824 from DigitalCurationCentre/issue818 ... Issue 818 Brian Riley authored on 14 Nov 2017 GitHub committed on 14 Nov 2017