opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2016-11-02	08d86c3 Browse files » commented out guidance and guidance_group tests briley committed on 2 Nov 2016
	286719e Browse files » fixed some existing template and guidance tests. Fixed reference to user.organisations in the GuidanceGroup model briley committed on 2 Nov 2016
	8b52e8d Browse files » updated fixture reference in api_projects_controller_test briley committed on 2 Nov 2016
	199f441 Browse files » removed forced test flunks from api_projects_controller_test briley committed on 2 Nov 2016
	dfb1fb1 Browse files » commented out guidance_group and guidance tests because they were referencing old defunct fixtures briley committed on 2 Nov 2016
	2eda57c Browse files » removed template relationship tests in User test briley committed on 2 Nov 2016
	ea8542a Browse files » added template, version and phase test fixtures briley committed on 2 Nov 2016
	5be698c Browse files » removed user_status and user_type from tests briley committed on 2 Nov 2016
	1a7c0b8 Browse files » switched User->Language relationship in Model from has_one to belongs_to briley committed on 2 Nov 2016
	5fcd970 Browse files » fixed db migration so that it does not update user records in TEST mode. Added sqlite3 to gemfile for tests. Added languages fixture briley committed on 2 Nov 2016
	7ced928 Browse files » moved in new fixtures briley committed on 2 Nov 2016
	4353cd2 Browse files » moved in some initial unit tests for user and org models briley committed on 2 Nov 2016
	0eba08c Browse files » Merge pull request #14 from DMPRoadmap/master ... rebase with DCC changes from the Nov. 1st sprint Brian Riley authored on 2 Nov 2016 GitHub committed on 2 Nov 2016
	b74da74 Browse files » Merge pull request #56 from DigitalCurationCentre/master ... Latest changes from DCCRoadmap coming back Brian Riley authored on 2 Nov 2016 GitHub committed on 2 Nov 2016
	2685cc5 Browse files » merge postgresql -> master Ray Carrick committed on 2 Nov 2016
	a1564f3 Browse files » Merge pull request #7 from DMPRoadmap/master ... Merge latest DMPRoadmap changes to DCC Ray Carrick authored on 2 Nov 2016 GitHub committed on 2 Nov 2016
	e5beeb5 Browse files » Merge pull request #49 from CDLUC3/master ... Bug fixes - Plan and Template pages and Devise authentication Ray Carrick authored on 2 Nov 2016 GitHub committed on 2 Nov 2016
2016-11-01	f8fe6d2 Browse files » updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens briley committed on 1 Nov 2016
	92c7858 Browse files » updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file briley committed on 1 Nov 2016
	2523e82 Browse files » updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css briley committed on 1 Nov 2016
	ec17337 Browse files » translation no longer breaks on header link to create plan xsrust committed on 1 Nov 2016
	df0b67b Browse files » fixed display bug on plan creation confirmation pop up xsrust committed on 1 Nov 2016
	876f315 Browse files » updated user permissions conversion to migrate org_admin details properly xsrust committed on 1 Nov 2016
2016-10-28	2fb67de Browse files » removed user_org_roles from active admin xsrust committed on 28 Oct 2016
	2cefb33 Browse files » updated user organisation in active-admin xsrust committed on 28 Oct 2016
	1ff70a8 Browse files » added rake task to seed database with key values, additionally added rake task to perform all migration tasks xsrust committed on 28 Oct 2016
2016-10-26	434a945 Browse files » ran db migrations briley committed on 26 Oct 2016
	88937d7 Browse files » resolving merge conflicts briley committed on 26 Oct 2016
	fa7f156 Browse files » Merge pull request #52 from DigitalCurationCentre/master ... Merging latest bugfixes/ postgres compatibility fixes Brian Riley authored on 26 Oct 2016 GitHub committed on 26 Oct 2016
	1e7b36c Browse files » Added both DB gems for dev/merging compatibility Jimmy Angelakos committed on 26 Oct 2016