opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-10-17	5253a9a Browse files » fix merge conflicts bhavi committed on 17 Oct 2017
	5cade67 Browse files » Bootstrap changes to plans forms ... Minor fixes in plans forms and static pages bhavi committed on 17 Oct 2017
	33215b5 Browse files » Bootstrap changes to plans forms bhavi committed on 17 Oct 2017
	fe210ce Browse files » bootstrap CSS for tabs and button fixes bhavi committed on 17 Oct 2017
2017-10-16	755052d Browse files » Merge branch 'static_pages' of https://github.com/CDLUC3/roadmap into static_pages bhavi committed on 16 Oct 2017
	2b7c7ae Browse files » update bootstrap templates forms with CSS changes ... arrange checkbox alignment update overrides file with CSS changes update bootstrap sections forms with CSS changes bhavi committed on 16 Oct 2017
	6ae25a7 Browse files » include overrides file in application.scss bhavi committed on 16 Oct 2017
	ec3835d Browse files » Bootstrap Overrides CSS file and Form changes(#640) ... update bootstrap forms with CSS changes update bootstrap guidances forms with CSS changes update bootstrap org forms with CSS changes update bootstrap phases forms with CSS changes bhavi committed on 16 Oct 2017
	f9569fd Browse files » Add About page to footer (#695) bhavi committed on 16 Oct 2017
	e70047c Browse files » Replace generic text on Static Pages (#668) ... Update About page content Update Help page content Update Terms of Use page content bhavi committed on 16 Oct 2017
	4f38dae Browse files » Fixed bugs for AJAX mixed content and Restful links ... fixed ajax mixed content error for DMPRoadmap/roadmap#689 moved tooltip and table JS to helper files. Added a linkHelper.js to deal with the loss of Rails' restful links DMPRoadmap/roadmap#685 fixed linter issues with new linkHelper.js briley authored on 10 Oct 2017 bhavi committed on 16 Oct 2017
	071f03a Browse files » bug fix for issue with ES6 import statments on sign_in and create_account JS briley authored on 10 Oct 2017 bhavi committed on 16 Oct 2017
	50f02f6 Browse files » Removed ES5 JS files DMPRoadmap/roadmap#666 ... removed es5 javascripts removed old unecessary es5 JS files and updated application.js to pull in all es6 files briley authored on 10 Oct 2017 bhavi committed on 16 Oct 2017
2017-10-11	b869b9d Browse files » Add About page to footer (#695) bhavi committed on 11 Oct 2017
	09aa61a Browse files » Replace generic text on Static Pages (#668) ... Update About page content Update Help page content Update Terms of Use page content bhavi committed on 11 Oct 2017
	d3089c6 Browse files » Merge pull request #690 from CDLUC3/fix-url-issues ... Fix url issues Bhavi authored on 11 Oct 2017 GitHub committed on 11 Oct 2017
	7259782 Browse files » Fixed bugs for AJAX mixed content and Restful links ... fixed ajax mixed content error for DMPRoadmap/roadmap#689 moved tooltip and table JS to helper files. Added a linkHelper.js to deal with the loss of Rails' restful links DMPRoadmap/roadmap#685 fixed linter issues with new linkHelper.js briley committed on 11 Oct 2017
2017-10-10	cf8c324 Browse files » bug fix for issue with ES6 import statments on sign_in and create_account JS briley committed on 10 Oct 2017
	f767cbd Browse files » Merge pull request #679 from CDLUC3/issue666 ... Removed ES5 JS files Bhavi authored on 10 Oct 2017 GitHub committed on 10 Oct 2017
	0cbfef6 Browse files » Merge pull request #678 from CDLUC3/issue667 ... Removed unused views Bhavi authored on 10 Oct 2017 GitHub committed on 10 Oct 2017
	f344668 Browse files » Removed ES5 JS files DMPRoadmap/roadmap#666 ... removed es5 javascripts removed old unecessary es5 JS files and updated application.js to pull in all es6 files briley committed on 10 Oct 2017
	a76bb48 Browse files » Removed unused views and renamed ones in annotations/templates until those pages have been Bootstrapped DMPRoadmap/roadmap#667 ... Removed unused views and renamed ones in annotations/templates until those pages have been Bootstrapped DMPRoadmap/roadmap#667 moved plan navigation partial from shared to plans dir removed old es5 version of org details JS. was causing JS compilation issues fixed typos in location of plan nav partial removed unused views and renamed a few in annotations and templates until those pages have been bootstrapped and we can confirm they are not needed. switched API docs link to point to wiki docs added template history view back in. remove token_permission_type controller and test. it was being used to list the API permission types and was linked from the 'How to use API' link. Updated that link to point to Wiki docs added answer locking partial and phase preview back added question preview back converted popovers/tooltips on guidance group pages briley committed on 10 Oct 2017
	adea376 Browse files » Merge pull request #675 from CDLUC3/org_admin ... Org admin - Guidance Group Pages (#646) Brian Riley authored on 10 Oct 2017 GitHub committed on 10 Oct 2017
	d1cbf39 Browse files » Merge branch 'CDL-MVP' into org_admin Bhavi authored on 10 Oct 2017 GitHub committed on 10 Oct 2017
	68d4901 Browse files » Update CONTRIBUTING.md Jimmy Angelakos authored on 10 Oct 2017 GitHub committed on 10 Oct 2017
2017-10-09	c6406db Browse files » Merge pull request #671 from CDLUC3/issue568 ... Converted popovers and tooltips to Bootstrap tooltips Bhavi authored on 9 Oct 2017 GitHub committed on 9 Oct 2017
	70e3c9f Browse files » Bootstrap Guidance Groups(#646) ... bootstrap guidance group admin edit Bootstrap Guidance Groups(#646) bhavi committed on 9 Oct 2017
	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