opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / lib

2017-04-06	c80adc0 Browse files » Merge pull request #42 from DMPRoadmap/development ... Rebase with lastest fixes from DCC Brian Riley authored on 6 Apr 2017 GitHub committed on 6 Apr 2017
2017-04-05	543cc05 Browse files » rebuilt locale json files after adding timeago values. updated main <html> tag to include current locale for use with JS. DMPRoadmap/roadmap#204 briley committed on 5 Apr 2017
	fef3a9a Browse files » removed rake wrapper task because json dir can be set in initializer. Added initializer and updated _('') to __('') DMPRoadmap/roadmap#204 briley committed on 5 Apr 2017
	e2a9887 Browse files » swapped out all other I18n calls in JS with gettext calls DMPRoadmap/roadmap#204 briley committed on 5 Apr 2017
	c98595a Browse files » hacked jquery.timeago.js to work with new gettext localisation. Added timeago text to pot and po files. DMPRoadmap/roadmap#204 briley committed on 5 Apr 2017
	c86cfa3 Browse files » replaced all of the old I18n('helpers...') references in JS files with new gettext method DMPRoadmap/roadmap#204 briley committed on 5 Apr 2017
	9283613 Browse files » updated plans.js so that 'Answered by' is now coming from JSON locales DMPRoadmap/roadmap#204 briley committed on 5 Apr 2017
	3a781d3 Browse files » added gettext_i18n_rails gem. aded rake task that calls gem's po_to_json task and then moves generated json files from app/assets to lib/assets DMPRoadmap/roadmap#204 briley committed on 5 Apr 2017
	369d1fb Browse files » removed template->question dropdowns on guidance pages. updated controller and JS accordingly. fixed issue with themes not being saved. DMPRoadmap/roadmap#221 briley committed on 5 Apr 2017
2017-04-03	3503c5c Browse files » interface tinymce to the page is_dirty functionality ray.carrick committed on 3 Apr 2017
2017-03-30	8a4b1b4 Browse files » Merge branch 'development' into development Ray Carrick authored on 30 Mar 2017 GitHub committed on 30 Mar 2017
2017-03-30	e98aaf8 Browse files » remove debug alert ray.carrick committed on 30 Mar 2017
2017-03-29	436a250 Browse files » change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182 ray.carrick committed on 29 Mar 2017
2017-03-28	cd2169f Browse files » Change notes to work with AJAX calls. ray.carrick committed on 28 Mar 2017
2017-03-24	abd1c94 Browse files » fixed other basic issues found on guidance pages DMPRoadmap/roadmap#185 briley committed on 24 Mar 2017
2017-03-22	112db27 Browse files » fixes issues around answer text not saving properly; references https://github.com/DMPRoadmap/roadmap/issues/181 ... fixes issues around status spacing and adds in untranslated strings for status; references https://github.com/DMPRoadmap/roadmap/issues/182 ray.carrick committed on 22 Mar 2017
2017-03-21	b7a906e Browse files » Merge branch 'feature/superadmin' into HEAD ... Replaces ActiveAdmin with Administrate. Jimmy Angelakos committed on 21 Mar 2017
2017-03-20	8a87a3a Browse files » Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap 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
	860cba0 Browse files » fix helpers for cancel and data access ray.carrick committed on 20 Mar 2017
2017-03-16	e7882fc Browse files » resolve conflicts from merging Roadmap into DCC ray.carrick committed on 16 Mar 2017
2017-03-03	5d3ec89 Browse files » Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now Brian Riley committed on 3 Mar 2017
2017-03-02	1c6e32d Browse files » Removed ActiveAdmin Jimmy Angelakos 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
	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
2017-03-01	bf5403c Browse files » merge optimistic locking into dev ray.carrick committed on 1 Mar 2017
2017-03-01	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
2017-02-24	048a044 Browse files » Fixed merge conflicts Jose Lloret committed on 24 Feb 2017
2017-02-23	67463b6 Browse files » config/initializers/locale.rb getters/setters pointing at FastGettext. en-UK renamed to en_GB. DMPRoadmap/roadmap#98 Jose Lloret committed on 23 Feb 2017
2017-02-22	a43aaa8 Browse files » Merge branch 'final_schema' into development ... Fixes DMPRoadmap/roadmap#103 wree done in local final_schema branch befoe development was created from final_schema so this merge final_schema into development. Ray Carrick committed on 22 Feb 2017