opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2016-07-26	1f6cd43 Browse files » fixed .gitignore whitespace conflicts after merge xsrust committed on 26 Jul 2016
	71b2c9c Browse files » modified schema xsrust committed on 26 Jul 2016
	c1e1c05 Browse files » bugfixing auth for api xsrust committed on 26 Jul 2016
	5bd06ef Browse files » changed guidance_group to guidance_groups for consistancy with api spec xsrust committed on 26 Jul 2016
	9394bbb Browse files » fixed syntax error xsrust committed on 26 Jul 2016
	84fa122 Browse files » fiexed a bug where user's api token permissions wouldnt display xsrust committed on 26 Jul 2016
	475f879 Browse files » updated org-admin view of users for rails 4.2 compatability xsrust committed on 26 Jul 2016
	1736943 Browse files » updated .gitignore xsrust committed on 26 Jul 2016
	ef36b66 Browse files » removed old unnecissary data structures from fixtures xsrust committed on 26 Jul 2016
	4f2566a Browse files » updated .gitignore xsrust committed on 26 Jul 2016
	1c766a0 Browse files » added forgotten view for org-admins giving user's api permissions xsrust committed on 26 Jul 2016
	b3a784e Browse files » removed old unnecissary data structures from fixtures xsrust committed on 26 Jul 2016
	5f6558d Browse files » added data structures for testing xsrust committed on 26 Jul 2016
	8b7fb95 Browse files » added data structures for testing xsrust committed on 26 Jul 2016
	138fa7d Browse files » fixed auth to reject empty string xsrust committed on 26 Jul 2016
	e11fede Browse files » began implimenting testing for projects controller xsrust committed on 26 Jul 2016
	b0acf1f Browse files » added gem to allow testing of controllers xsrust committed on 26 Jul 2016
	286d869 Browse files » removed token_permission as it was accidentially re-added by a merge xsrust committed on 26 Jul 2016
	38c7071 Browse files » bugfixing auth for api xsrust committed on 26 Jul 2016
2016-07-25	9924298 Browse files » fix roadmap route DamodarSojka committed on 25 Jul 2016
	fe3d9a9 Browse files » changed guidance_group to guidance_groups for consistancy with api spec xsrust committed on 25 Jul 2016
	536bd0b Browse files » fixed syntax error xsrust committed on 25 Jul 2016
	a7c764e Browse files » fiexed a bug where user's api token permissions wouldnt display xsrust committed on 25 Jul 2016
	f13ce42 Browse files » updated org-admin view of users for rails 4.2 compatability xsrust committed on 25 Jul 2016
	39173e1 Browse files » fixed leftover merge conflict in .gitignore xsrust committed on 25 Jul 2016
	a32ba04 Browse files » Merge branch 'testing_and_documenting' of https://github.com/DigitalCurationCentre/roadmap into testing_and_documenting xsrust committed on 25 Jul 2016
	0c939b3 Browse files » updated .gitignore xsrust committed on 25 Jul 2016
	6918d78 Browse files » added forgotten view for org-admins giving user's api permissions xsrust committed on 25 Jul 2016
	db0c7b7 Browse files » removed old unnecissary data structures from fixtures xsrust committed on 25 Jul 2016
	f35f93e Browse files » added data structures for testing xsrust committed on 25 Jul 2016