opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-10-09	cc1eece Browse files » Merge pull request #663 from CDLUC3/org_admin_details_page ... Org admin details page(#647) Brian Riley authored on 9 Oct 2017 GitHub committed on 9 Oct 2017
	f002b10 Browse files » Merge pull request #672 from DMPRoadmap/preference_error ... if no defaults specified, obtuse error. now improved. Brian Riley authored on 9 Oct 2017 GitHub committed on 9 Oct 2017
	7ba6c32 Browse files » Merge branch 'org_admin_details_page' of https://github.com/CDLUC3/roadmap into org_admin_details_page bhavi committed on 9 Oct 2017
	d0be607 Browse files » Remove embedded js from the view bhavi committed on 9 Oct 2017
	504902e Browse files » if no defaults specified, obtuse error. now improved. ray.carrick committed on 9 Oct 2017
2017-10-05	3908174 Browse files » Merge pull request #662 from CDLUC3/fix-js-issues ... Patch for two JS issues Bhavi authored on 5 Oct 2017 GitHub committed on 5 Oct 2017
	05719c0 Browse files » Merge pull request #661 from CDLUC3/issue642 ... Bootstrapped the Template history page Bhavi authored on 5 Oct 2017 GitHub committed on 5 Oct 2017
	ccffd2b Browse files » Merge pull request #664 from CDLUC3/fix-plan-creation-message ... Bug fix to Plans controller to reintroduce success messages on plan creation Bhavi authored on 5 Oct 2017 GitHub committed on 5 Oct 2017
	d1226ee Browse files » Merge pull request #659 from CDLUC3/org_admin ... Bootstrap Org admin User pages Brian Riley authored on 5 Oct 2017 GitHub committed on 5 Oct 2017
	84ff6db Browse files » bug fix to reintroduce success messages on plan creation briley committed on 5 Oct 2017
2017-10-04	5926154 Browse files » Merge branch 'CDL-MVP' into org_admin_details_page Bhavi authored on 4 Oct 2017 GitHub committed on 4 Oct 2017
	c17e203 Browse files » fix merge conflicts bhavi committed on 4 Oct 2017
	9b4be8f Browse files » Bootstrap Org Details Page (#647) ... Bootstrap Org Details Bootstrap Org Details Page update js of Org Admin udpate js to es6 (in progress) include Tinymce function def bhavi committed on 4 Oct 2017
	443ee95 Browse files » removed old ES5 plans/index.js call that was causing JS bug briley committed on 4 Oct 2017
	970eeaf Browse files » fixed bug with plans/new.js briley committed on 4 Oct 2017
	a4b87d1 Browse files » Bootstrapped the Template history page briley committed on 4 Oct 2017
	96c109d Browse files » Merge branch 'org_admin' of https://github.com/CDLUC3/roadmap into org_admin bhavi committed on 4 Oct 2017
	ba9234f Browse files » Bootstrap Org Admin pages ... switch headings back to H1 Bootstrap Guidances page update the Org Template admin table similar to Dashboard page(#641) fix missing span tag bhavi committed on 4 Oct 2017
	dc6b1a4 Browse files » Merge pull request #660 from CDLUC3/issue658 ... Converted collate/filterise table to ES6 Bhavi authored on 4 Oct 2017 GitHub committed on 4 Oct 2017
	0104444 Browse files » Merge branch 'CDL-MVP' into issue658 Bhavi authored on 4 Oct 2017 GitHub committed on 4 Oct 2017
2017-10-03	8ee5e59 Browse files » Merge pull request #657 from CDLUC3/issue632 ... Boostrapped the Create Plan page Bhavi authored on 3 Oct 2017 GitHub committed on 3 Oct 2017
	e86cdc7 Browse files » converted table collate and filterise to ES6 and added call for it to application.js ... Removed old <%- ... -%> style markup. This was from Rails pre 3.x added tableHelper.js with collate and ariatise methods. updated my dashboard page to use tableHelper moved collate/filterise calls to application.js since the selectors are the same across tables briley committed on 3 Oct 2017
	f42b2a7 Browse files » Merge branch 'CDL-MVP' into issue632 Brian Riley authored on 3 Oct 2017 GitHub committed on 3 Oct 2017
	95f113d Browse files » fix missing span tag bhavi committed on 3 Oct 2017
	225acc4 Browse files » update the Org Template admin table similar to Dashboard page(#641) bhavi committed on 3 Oct 2017
	bb49ad5 Browse files » Bootstrap Guidances page bhavi committed on 3 Oct 2017
	10c9738 Browse files » switch headings back to H1 bhavi committed on 3 Oct 2017
	f2c120d Browse files » Update CONTRIBUTING.md Jimmy Angelakos authored on 3 Oct 2017 GitHub committed on 3 Oct 2017
	101ba91 Browse files » Bootstrap users page #648 bhavi committed on 3 Oct 2017
	836e17f Browse files » Bootstrap user privileges page #649 bhavi committed on 3 Oct 2017