opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-03-21	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
	774fe7d Browse files » choose template where org has more than one valid ray.carrick committed on 20 Mar 2017
	2e5f419 Browse files » Merge branch 'fix_helpers' into development ray.carrick committed on 20 Mar 2017
	860cba0 Browse files » fix helpers for cancel and data access ray.carrick committed on 20 Mar 2017
	1ccec5b Browse files » remove old js no longer needed as part of create plan ray.carrick committed on 20 Mar 2017
	a349028 Browse files » Merge pull request #178 from CDLUC3/development ... Bug fix on the new plan page Ray Carrick authored on 20 Mar 2017 GitHub committed on 20 Mar 2017
2017-03-17	abe1b92 Browse files » replaced plan[section] hash with plan.sections Brian Riley committed on 17 Mar 2017
2017-03-17	5659c36 Browse files » updated comments in production.rb to include an action_mailer default_url_options xsrust committed on 17 Mar 2017
2017-03-16	d5af2ef Browse files » Merge pull request #34 from DMPRoadmap/development ... Merging latest MVP0.3.0 changes Brian Riley authored on 16 Mar 2017 GitHub committed on 16 Mar 2017
2017-03-16	9cf5eea Browse files » Merge pull request #177 from DigitalCurationCentre/development ... Merge DCC/dev back into Roadmap/dev Brian Riley authored on 16 Mar 2017 GitHub committed on 16 Mar 2017