opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-03-22	5f9772c Browse files » missing bracket ray.carrick committed on 22 Mar 2017
	e73a0fa Browse files » Merge branch 'fix_view_customised_template' into development ray.carrick committed on 22 Mar 2017
	616e2d5 Browse files » customization_of handled wrongly ray.carrick committed on 22 Mar 2017
	d0cbbb6 Browse files » Merge pull request #24 from DMPRoadmap/development ... Merge latest PR from CDL across to DCC Ray Carrick authored on 22 Mar 2017 GitHub committed on 22 Mar 2017
	e418aac Browse files » Merge pull request #190 from CDLUC3/development ... Bug fix for policy issue and fixes for tests Ray Carrick authored on 22 Mar 2017 GitHub committed on 22 Mar 2017
2017-03-21	55a30a7 Browse files » addresses further issue on DMPRoadmap/roadmap#191 by setting the phase to modifiable briley committed on 21 Mar 2017
	aa0adff Browse files » fixes DMPRoadmap/roadmap#191 by creating a default phase briley committed on 21 Mar 2017
	8f01d61 Browse files » reverted changes to application_controller and schema.rb briley committed on 21 Mar 2017
	41ef3fb Browse files » fixes 'we're sorry HTTP 500 error' when clicking on the phase tab when editing a template. DMPRoadmap/roadmap#187 briley committed on 21 Mar 2017
	b2a48d9 Browse files » Merge branch 'development' into development Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	bdb2d51 Browse files » Merge pull request #1 from DMPRoadmap/master ... Rebasing master Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	532211a Browse files » Merge branch 'development' of https://github.com/CDLUC3/roadmap into development briley committed on 21 Mar 2017
	e2d013d Browse files » Merge pull request #37 from DMPRoadmap/development ... Reintroduced Formtastic Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	975ffad Browse files » Merge pull request #189 from DigitalCurationCentre/development ... Reinstating Formtastic which was prematurely removed. Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	9189044 Browse files » Reinstating Formtastic which was prematurely removed. Jimmy Angelakos committed on 21 Mar 2017
	258ff71 Browse files » Merge branch 'development' of https://github.com/CDLUC3/roadmap into development briley committed on 21 Mar 2017
	c40fe08 Browse files » fixes to some of the functional tests to use FastGettext instead of I18n briley committed on 21 Mar 2017
	b89c3b8 Browse files » Merge pull request #36 from DMPRoadmap/development ... Addition of Administrate Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	6a04fc5 Browse files » Merge branch 'development' into development Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	f496291 Browse files » Merge pull request #188 from DigitalCurationCentre/development ... Adminstrate - Replacement for ActiveAdmin components Brian Riley authored on 21 Mar 2017 GitHub committed on 21 Mar 2017
	b7a906e Browse files » Merge branch 'feature/superadmin' into HEAD ... Replaces ActiveAdmin with Administrate. Jimmy Angelakos committed on 21 Mar 2017
	45cc045 Browse files » Quick fix for i18n issue which prevents db:setup because of lack of Languages table Jimmy Angelakos committed on 21 Mar 2017
2017-03-20	29abde3 Browse files » Noticed that the user/org's language settings were not being factored in during testing. Updated application controller to use the current user's language or the org's language if available. The locale is only set in the session if the user is logged in now. also fixed to some functional tests. briley committed on 20 Mar 2017
	72061ad Browse files » commented out public dmp tests since we're commenting out that functionality for now briley committed on 20 Mar 2017
	5f5329e Browse files » started switching I18n references in test files to Fastgettext briley committed on 20 Mar 2017
	b5b2d1b Browse files » updated recaptcha gem to 4.x. Updated gemfile and example initializer because 4.x changed the vraible names for its API briley committed on 20 Mar 2017
	e3f0a12 Browse files » Merge pull request #35 from DMPRoadmap/development ... Fixes from DCC for create plan page JS issues Brian Riley authored on 20 Mar 2017 GitHub committed on 20 Mar 2017
	83f74c8 Browse files » Merge pull request #184 from DigitalCurationCentre/development ... Development Brian Riley authored on 20 Mar 2017 GitHub committed on 20 Mar 2017
	8a87a3a Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development ray.carrick committed on 20 Mar 2017
	ebb686c Browse files » Merge branch 'fix_projectjs' into development ray.carrick committed on 20 Mar 2017