opidor/dmpopidor

Fork: 0

opidor / dmpopidor

2017-03-02	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
	0ad232a Browse files » language fixes post merge ray.carrick 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
	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
	e5ac302 Browse files » updated guidance and and perm. added constants to token_permission_types xsrust committed on 1 Mar 2017
2017-02-27	326a5fc Browse files » fixed typos introduced at interpolated strings. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
	5f1eaaf Browse files » templates views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
	4d13dcf Browse files » suggested_answers views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
	c33154a Browse files » sections views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
	36d5070 Browse files » questions according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
	fd5dd20 Browse files » question_options views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
	ce87054 Browse files » phases views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
	bb471a2 Browse files » guidances views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 27 Feb 2017
2017-02-24	048a044 Browse files » Fixed merge conflicts Jose Lloret committed on 24 Feb 2017
	6e297ac Browse files » fixed typo. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	23e1b02 Browse files » templates views according to gettext (half-way through). DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	5ba414c Browse files » users views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	2ca5d0d Browse files » user_mailer views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	1f7a3cc Browse files » settings views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	a132550 Browse files » projects views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	2f5d572 Browse files » plans views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	f8b2fe6 Browse files » Moved Actions, views, and partials for sections/phases/questions/suggested_answers out of templates, and wrote up associated authorization xsrust committed on 24 Feb 2017
	7be698c Browse files » phases views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	8b92423 Browse files » orgs views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017
	7cdf807 Browse files » guidances views according to gettext. DMPRoadmap/roadmap#98 Jose Lloret committed on 24 Feb 2017