opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-05-08	9c33dd0 Browse files » Merge pull request #296 from DigitalCurationCentre/feature/sso ... Feature/sso Brian Riley authored on 8 May 2017 GitHub committed on 8 May 2017
	6b8752b Browse files » Modified devise.rb example for SSO Jimmy Angelakos committed on 8 May 2017
	3c2ee65 Browse files » Fixed failing functional & translation tests Jimmy Angelakos committed on 8 May 2017
	be7a83e Browse files » Merge local branch into feature/sso - fixes #39, #276, #287, #290. ... Unified omniauth cases & updated tests. Deleted Project Controller & tests (no longer needed). Please db:migrate after this commit. Jimmy Angelakos committed on 8 May 2017
2017-05-03	25804a2 Browse files » Merge pull request #283 from CDLUC3/development ... fixed a few tests after rebasing from DMPRoadmap Jimmy Angelakos authored on 3 May 2017 GitHub committed on 3 May 2017
	3c2ef02 Browse files » Merge branch 'development' into development Jimmy Angelakos authored on 3 May 2017 GitHub committed on 3 May 2017
	d0235bf Browse files » Merge pull request #292 from DigitalCurationCentre/development ... Jose's email bugfixes Jimmy Angelakos authored on 3 May 2017 GitHub committed on 3 May 2017
	99a6899 Browse files » Merge branch 'development' into development Jimmy Angelakos authored on 3 May 2017 GitHub committed on 3 May 2017
2017-05-02	74b215f Browse files » Fixed nil user variable when generating HTML code for sharing notification. DMPRoadmap/roadmap#286 ... added condition for avoiding sharing plan with email matching plans owner. DMPRoadmap/roadmap#286 Added message to internationalisation files. DMPRoadmap/roadmap#286 Jose Lloret committed on 2 May 2017
	1721435 Browse files » Get rid of custom Shib code & revert to generic Omniauth for everything. Modify identifier_schemes table to add scheme specific urls. Jimmy Angelakos committed on 2 May 2017
	1eeb7a2 Browse files » Removed description field when choosing a template for creating a plan. DMPRoadmap/roadmap#199 Jose Lloret committed on 2 May 2017
	b8e72e6 Browse files » Added gettext gem to find any string marked for translation. DMPRoadmap/roadmap#281 ... Added to Gemfile and Gemfile.lock Added string marked for translation in German. DMPRoadmap/roadmap#281 .gitignore excluding auto-generated files for gettext:find. DMPRoadmap/roadmap#281 Jose Lloret committed on 2 May 2017
2017-04-28	5799a3d Browse files » fixed some initial errors with tests after last PR Brian Riley committed on 28 Apr 2017
	26c38e1 Browse files » Merge pull request #47 from DMPRoadmap/development ... Rebasing Development will fix tests after Brian Riley authored on 28 Apr 2017 GitHub committed on 28 Apr 2017
	c77ddfb Browse files » Merge branch 'DigitalCurationCentre-development' into development Brian Riley committed on 28 Apr 2017
	d1b09d7 Browse files » fixed merge conflict in schema.rb Brian Riley committed on 28 Apr 2017
	6db1d84 Browse files » Merge pull request #279 from CDLUC3/development ... Latest bug fixes from CDL Jimmy Angelakos authored on 28 Apr 2017 GitHub committed on 28 Apr 2017
2017-04-27	00e7fe8 Browse files » commented out plan creation integration test. the workflow will be changing soon Brian Riley committed on 27 Apr 2017
	899d804 Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	f3555ad Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	b0b6aca Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	aa17d70 Browse files » debug line for travis.ci issue Brian Riley committed on 27 Apr 2017
	ebcb6d5 Browse files » fixed integration tests for templates Brian Riley committed on 27 Apr 2017
	8568dfc Browse files » removed debug lines from template test Brian Riley committed on 27 Apr 2017
	2504d38 Browse files » fixed issue with template test Brian Riley committed on 27 Apr 2017
2017-04-26	1978c67 Browse files » Merge branch 'remove-settings' into development Brian Riley committed on 26 Apr 2017
	d094347 Browse files » Merge branch 'fix-template-controller' into development Brian Riley committed on 26 Apr 2017
	65480b3 Browse files » updated plan edit lock warning message and disabled textbox with user's answer DMPRoadmap/roadmap#55 Brian Riley committed on 26 Apr 2017
	f299441 Browse files » updated generic error message handler to show value when applicable DMPRoadmap/roadmap#234 Brian Riley committed on 26 Apr 2017
	4b0808d Browse files » removed confirmations controller, route and tests since we turned devise's email confirmation off DMPRoadmap/roadmap#254 Brian Riley committed on 26 Apr 2017