opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-11-16	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
	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
	Unverified 29919d3 Browse files » Merge pull request #821 from DigitalCurationCentre/issue733 ... Issue 733 Brian Riley authored on 14 Nov 2017 GitHub committed on 14 Nov 2017
	Unverified 3976b78 Browse files » Merge pull request #820 from DigitalCurationCentre/transaction_answers ... fixes tests on development Brian Riley authored on 14 Nov 2017 GitHub committed on 14 Nov 2017
	Unverified 6496c9b Browse files » Merge pull request #795 from CDLUC3/issue727 ... Added Request Feedback button to the share plan page Bhavi authored on 14 Nov 2017 GitHub committed on 14 Nov 2017
	cad3d3b Browse files » plan.visibility changed accordingly through JS for Project Details page. DMPRoadmap/roadmap#818 Jose Lloret 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
	4caafbf Browse files » set URL hash taking into account the currentTarget instead of target for when a elements have children within. DMPRoadmap/roadmap#733 Jose Lloret committed on 14 Nov 2017
	4f711b8 Browse files » fixes tests on development xsrust 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
	Unverified 1b73aa6 Browse files » Merge pull request #797 from CDLUC3/issue777 ... fixed issues with plan create page 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
	Unverified ad9e548 Browse files » Merge pull request #809 from CDLUC3/fix-contact-us ... Added handling for contact-us override in branding.yml Jose Lloret authored on 10 Nov 2017 GitHub committed on 10 Nov 2017
	Unverified 99f7acb Browse files » Merge pull request #793 from CDLUC3/change-default-visibility ... removed the default setting from plans.visibility Jose Lloret authored on 10 Nov 2017 GitHub 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	70aba89 Browse files » removed the default setting from plans.visibility ... added migration to correct plan visibility changed to nil fixed broken tests and added check for branding.yml contact_us_url before overriding rails built in route helper briley committed on 9 Nov 2017