opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app

2017-11-21	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
2017-11-21	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
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 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
	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
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
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 ad569bd Browse files » Merge pull request #823 from DigitalCurationCentre/issue816 ... Issue 816 Brian Riley authored on 14 Nov 2017 GitHub committed on 14 Nov 2017
	Unverified d9e14ad Browse files » Merge pull request #822 from DigitalCurationCentre/issue814 ... Issue 814 Brian Riley authored on 14 Nov 2017 GitHub committed on 14 Nov 2017
	eb77b95 Browse files » Redirecting to plans_path instead of re-rendering the view which is more error-prone if view changes, e.g. new instance variables. DMPRoadmap/roadmap#816 Jose Lloret committed on 14 Nov 2017
	66de32c Browse files » conditional displaying for plans/publicly_visible_org partial. DMPRoadmap/roadmap#814 Jose Lloret committed on 14 Nov 2017
2017-11-13	745f187 Browse files » Added Request Feedback button to the share plan page ... modifications to tooltips and email defaults moved email constants to usermailer aded missing colon started adding in the button to request feedback modifications to tooltips and email defaults started adding in the button to request feedback finsihed adding request feedback button Removed old comment switched to roles updated to role based reviewer updated user_mailer moved feedback confirmation defaults to methods on UserMailer added default visibility back to schema.rb made adjustments based on PR feedback refactored to use flagshihtzu function that returns values for flags briley committed on 13 Nov 2017
2017-11-10	Unverified 4de8508 Browse files » Merge pull request #807 from DigitalCurationCentre/issue638 ... Issue 638 Brian Riley authored on 10 Nov 2017 GitHub committed on 10 Nov 2017
	9480290 Browse files » fixed issues with plan create page ... moved template_+options method to templates controller Brian Riley committed on 10 Nov 2017
	5715956 Browse files » Sign up email case insensitive. Removed session key previous_url since does not work well. Duck-typed User.where_case_insensitive method. DMPRoadmap/roadmap#638 ... Re-factored logic to accommodate stem accounts. DMPRoadmap/roadmap#638 Jose Lloret committed on 10 Nov 2017
2017-11-09	accfbf9 Browse files » added handling for contact-us override in branding briley committed on 9 Nov 2017
2017-11-09	4f030bd Browse files » Override flash alert message for when user is signed in and a URL invitation token is provided. DMPRoadmap/roadmap#751 ... Modified message. DMPRoadmap/roadmap#751 Jose Lloret committed on 9 Nov 2017
2017-11-08	Unverified 6aa5f40 Browse files » Merge pull request #802 from DigitalCurationCentre/issue733 ... Issue 733 Brian Riley authored on 8 Nov 2017 GitHub committed on 8 Nov 2017
2017-11-08	967426d Browse files » sign in always returns to the page where the request was initiatet. DMPRoadmap/roadmap#764 Jose Lloret committed on 8 Nov 2017