opidor/dmpopidor

Fork: 0

opidor / dmpopidor

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
	9b83f23 Browse files » Merge branch 'change_to_enum_tidyup' into development ... remove leftover constants from earlier attempt to stop all the string comps for determining question format. With enum we no longer need these. ray.carrick committed on 2 Mar 2017
	a9cc1b2 Browse files » remove unneeded format constants ray.carrick committed on 2 Mar 2017
	1107e99 Browse files » Merge branch 'question_format_enum' into development ray.carrick committed on 2 Mar 2017
	2a9cead Browse files » change question_format to use enum rather than bits ray.carrick committed on 2 Mar 2017
	76151e5 Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development xsrust committed on 2 Mar 2017
	0ad232a Browse files » language fixes post merge ray.carrick committed on 2 Mar 2017
	5d527ff Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development xsrust committed on 2 Mar 2017
	d2f7ea8 Browse files » updated statistics api endpoint to be in line with the new data model xsrust committed on 2 Mar 2017
2017-03-01	bf5403c Browse files » merge optimistic locking into dev ray.carrick committed on 1 Mar 2017
	51c78fc Browse files » Optimistic Locking ... - add bit field to question_format so we don't have to test strings to determine format - add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used - add migration to add bit field - add migration to add lock_version field to answer - change answers_controller to do optimistic locking - change answers controller not to redirect to plans/phase/edit as it wasn't doing anything - introduced answers/update.js.erb to handle the return from /answers/update. - to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better. ray.carrick committed on 1 Mar 2017
	803a87d Browse files » added guidances endpoints for api, updated typo in guidance_groups_api_controller xsrust committed on 1 Mar 2017
	27ba833 Browse files » init of api template_policy xsrust committed on 1 Mar 2017
	f100b6c Browse files » brought templates controller for api in line with new data access/auth xsrust committed on 1 Mar 2017
	d4565e7 Browse files » completed fixes for guidances and guidance_groups controllers xsrust committed on 1 Mar 2017
	01ab7d1 Browse files » updated all_viewable method of guidances to return an array of guidance xsrust committed on 1 Mar 2017
	212ee6f Browse files » updated gudiance api \n - brough auth in line with the rest of site using pundit \n - updated displayed information in line with model changes\n - removed multiple guidance groups and removed templates/guidance groups xsrust committed on 1 Mar 2017