opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-03-14	06c7a37 Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development ray.carrick committed on 14 Mar 2017
	250b58a Browse files » fix access to owner and template ray.carrick committed on 14 Mar 2017
	cc9dca1 Browse files » Merge branch 'issue167' into development Jose Lloret committed on 14 Mar 2017
	84772b4 Browse files » Extended .pot an .po files with translations from static.yml. DMPRoadmap/roadmap#167 Jose Lloret committed on 14 Mar 2017
	f1afc15 Browse files » fix merge conflicts ray.carrick committed on 14 Mar 2017
	facecda Browse files » change from serialized hash tp just using includes ray.carrick committed on 14 Mar 2017
2017-03-13	c707058 Browse files » Commented out public_export action since it is working. Currently redirect to public_plans prompting a message. DMPRoadmap/roadmap#167 Jose Lloret committed on 13 Mar 2017
2017-03-10	3962c5a Browse files » public_plans view according to gettext. DMPRoadmap/roadmap#167 Jose Lloret committed on 10 Mar 2017
	6db3458 Browse files » termsuse view according to gettext. DMPRoadmap/roadmap#167 Jose Lloret committed on 10 Mar 2017
	5d5b049 Browse files » roadmap view according to gettext. DMPRoadmap/roadmap#167 Jose Lloret committed on 10 Mar 2017
	3ed29ad Browse files » help view according to gettext. DMPRoadmap/roadmap#167 Jose Lloret committed on 10 Mar 2017
	da90c83 Browse files » about_us view according to gettext. DMPRoadmap/roadmap#167 Jose Lloret committed on 10 Mar 2017
2017-03-09	5d9b810 Browse files » Language switcher hidden if only one language is installed. DMPRoadmap/roadmap#110 Jose Lloret committed on 9 Mar 2017
2017-03-07	8399213 Browse files » Replace parametrised .yaml keys (e.g. t("helpers.settings.plans.margins.#{pos}")). DMPRoadmap/roadmap#98 Jose Lloret committed on 7 Mar 2017
	56271eb Browse files » I18n replaced from models. DMPRoadmap/roadmap#98 Jose Lloret committed on 7 Mar 2017
	cdf28c6 Browse files » I18n replaced from controllers. DMPRoadmap/roadmap#98 Jose Lloret committed on 7 Mar 2017
2017-03-03	7b8512a Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development xsrust committed on 3 Mar 2017
	9282e1a Browse files » switched to using the hash for data access for admin_template view and associated partials xsrust committed on 3 Mar 2017
	e916dcc Browse files » created a to_hash method for templates to help remove data access from views xsrust committed on 3 Mar 2017
	5a6bd7a Browse files » Merge branch 'review_feedback' into development ... 3 fixes: .radiobuttons -> .radiobuttons? remove debugging console.log change isOptionBased? to option_based? ray.carrick committed on 3 Mar 2017
	8a2928e Browse files » minor fixes from code review ray.carrick committed on 3 Mar 2017
2017-03-02	6a78027 Browse files » Replaced I18n.t(...) from controllers. DMPRoadmap/roadmap#98 Jose Lloret committed on 2 Mar 2017
	0740acd Browse files » leaving the two migrations caused schema issues this cleans it up ray.carrick committed on 2 Mar 2017
	dfa1bab Browse files » Merge branch 'fix_answer_timestamp' into development ... make answer timestamp run off updated_at rather than created_at remove some of the JS that gets called on accordion section show and on answer save. ray.carrick committed on 2 Mar 2017
	a6f2a54 Browse files » timestamp off updated_at rather than created_at plus other tidying up ray.carrick committed on 2 Mar 2017
	1104ca2 Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development ray.carrick committed on 2 Mar 2017
	d3c63d2 Browse files » Merge branch 'reinstate_funder_id' into development ... funder_id on plan had been commented out but it's used in plan creation - reinstate and we can revaluate later. ray.carrick committed on 2 Mar 2017
	b61b032 Browse files » reinstate funder_id used in create plan ray.carrick committed on 2 Mar 2017
	37df4a7 Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development xsrust committed on 2 Mar 2017
	95510d3 Browse files » updated old rake task to properly seed languages, created a new rake task to ensure the languages are in the correct formats xsrust committed on 2 Mar 2017