opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2018-01-09	Unverified 9c0442e Browse files » Merge pull request #1017 from CDLUC3/update-gems ... ran bundle update Brian Riley authored on 9 Jan 2018 GitHub committed on 9 Jan 2018
	4355ece Browse files » ran bundle update ... replaced Gemfile with one from CDL-MVP briley committed on 9 Jan 2018
	e350d8f Browse files » Merge branch 'CDL-MVP' into development ... Conflicts resolved manually: Removed old bootstrap_and_overrides css file Gemfile Gemfile.lock briley committed on 9 Jan 2018
	1f79a2b Browse files » Merge branch 'development' into CDL-MVP briley committed on 9 Jan 2018
	Unverified c616050 Browse files » Merge pull request #1014 from DMPRoadmap/xsrust/791 ... added +/- to section acordions in org-admin view Brian Riley authored on 9 Jan 2018 GitHub committed on 9 Jan 2018
	f9999c7 Browse files » added +/- to section acordions in org-admin view xsrust committed on 9 Jan 2018
2018-01-08	Unverified ce8ef23 Browse files » Merge pull request #1008 from DigitalCurationCentre/issue903 ... issue 903 Brian Riley authored on 8 Jan 2018 GitHub committed on 8 Jan 2018
	d8bfb21 Browse files » ajax:before for generating JSON links and trigger URL validations. DMPRoadmap/roadmap#903 ... template dirty for when links hash object is different too. DMPRoadmap/roadmap#903 validation check for link_link and link_text. DMPRoadmap/roadmap#903 Cancel remove link except for when only one link exists. DMPRoadmap/roadmap#903 Jose Lloret committed on 8 Jan 2018
	Unverified c59af08 Browse files » Merge pull request #1007 from CDLUC3/issue996 ... fixed bug for undefined counter Jose Lloret authored on 8 Jan 2018 GitHub committed on 8 Jan 2018
	Unverified 0a46d4c Browse files » Merge pull request #1006 from CDLUC3/issue938 ... Changes to annotations when customizing template Jose Lloret authored on 8 Jan 2018 GitHub committed on 8 Jan 2018
	Unverified cef1a80 Browse files » Merge pull request #1000 from CDLUC3/issue873 ... added csv download for org_admin plans page Jose Lloret authored on 8 Jan 2018 GitHub committed on 8 Jan 2018
2018-01-06	a2c1e62 Browse files » added csv download for org_admin plans page ... added tests removed comments switch @org creation in test debug in test updated pundit handling manually assign org admin perms manually assign org admin perms manually assign org admin perms removed policy to controller manually create role in test commented out travis failure briley authored on 4 Jan 2018 Brian Riley committed on 6 Jan 2018
2018-01-05	e2d331a Browse files » fixed bug for undefined counter Brian Riley committed on 5 Jan 2018
	741fd5d Browse files » updated to auto expand section on page reload after annotation change ... commented out delete buttons and fixed hide button js removed JS line and removed commented out lines fixed tests Brian Riley committed on 5 Jan 2018
	Unverified 9cf8d2d Browse files » Merge pull request #1004 from CDLUC3/issue396 ... fixed '&' bug in autocomplete and fix Plan create styling Brian Riley authored on 5 Jan 2018 GitHub committed on 5 Jan 2018
	2356c0f Browse files » fixed & issue for autocomplete and fixed timing issue ... fixed alignment of controls removed unused class briley authored on 19 Dec 2017 Brian Riley committed on 5 Jan 2018
	Unverified 7ec9683 Browse files » Merge pull request #1001 from CDLUC3/issue996 ... removed scrollTo top for tabs Jose Lloret authored on 5 Jan 2018 GitHub committed on 5 Jan 2018
	Unverified ec527cf Browse files » Merge pull request #1002 from CDLUC3/issue865 ... added email pref check for plan sharing change Jose Lloret authored on 5 Jan 2018 GitHub committed on 5 Jan 2018
2018-01-04	6d64aff Browse files » added email pref check for plan sharing change briley committed on 4 Jan 2018
	5323380 Browse files » removed scrollTo top for tabs briley committed on 4 Jan 2018
	Unverified c4d9011 Browse files » Merge pull request #997 from CDLUC3/issue944 ... Updated functionality of Guidance tab on Write Plan page Bhavi authored on 4 Jan 2018 GitHub committed on 4 Jan 2018
	Unverified 34d5a42 Browse files » Merge pull request #999 from CDLUC3/issue990 ... added write plan buttons to plan overview page Bhavi authored on 4 Jan 2018 GitHub committed on 4 Jan 2018
	bdc34b2 Browse files » updated logic to retrieve guidance ... updated edit plan page's guidance section added expand/collapse all to guidances moved guidance collection logic to plan model added uinit test and fixed broken test removed unecessary hash from view briley committed on 4 Jan 2018
	92d1ce6 Browse files » added write plan buttons to plan overview page briley committed on 4 Jan 2018
	Unverified a668e9e Browse files » Merge pull request #989 from CDLUC3/fix-gemfile ... Removes old Gemfile dependency from old Nokogiri version Bhavi authored on 4 Jan 2018 GitHub committed on 4 Jan 2018
	Unverified 2e22644 Browse files » Merge pull request #998 from CDLUC3/issue955 ... updated filter labels on customizable templates table Bhavi authored on 4 Jan 2018 GitHub committed on 4 Jan 2018
	Unverified 6d3ed3c Browse files » Merge pull request #980 from CDLUC3/issue943 ... Fix styling issue and label text Bhavi authored on 4 Jan 2018 GitHub committed on 4 Jan 2018
	Unverified 17f359d Browse files » Merge pull request #992 from CDLUC3/issue911 ... updated popover button '?' to display as tooltip Bhavi authored on 4 Jan 2018 GitHub committed on 4 Jan 2018
	Unverified 924d664 Browse files » Merge pull request #993 from CDLUC3/issue848 ... changed order of plan permissions Bhavi authored on 4 Jan 2018 GitHub committed on 4 Jan 2018
	Unverified 31dc4eb Browse files » Merge pull request #979 from CDLUC3/revise_admin_publish ... Admin Guidance page - revise publish action #871 Brian Riley authored on 4 Jan 2018 GitHub committed on 4 Jan 2018