hacked jquery.timeago.js to work with new gettext localisation. Added timeago text to pot and po files. DMPRoadmap/roadmap#204

replaced all of the old I18n('helpers...') references in JS files with new gettext method DMPRoadmap/roadmap#204

updated plans.js so that 'Answered by' is now coming from JSON locales DMPRoadmap/roadmap#204

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

removed template->question dropdowns on guidance pages. updated controller and JS accordingly. fixed issue with themes not being saved. DMPRoadmap/roadmap#221

Merge branch 'development' into development

remove debug alert

change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182

Change notes to work with AJAX calls.

fixed other basic issues found on guidance pages DMPRoadmap/roadmap#185

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

Merge branch 'feature/superadmin' into HEAD ...

Replaces ActiveAdmin with Administrate.

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

choose template where org has more than one valid

fix helpers for cancel and data access

resolve conflicts from merging Roadmap into DCC

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

Removed ActiveAdmin

timestamp off updated_at rather than created_at plus other tidying up

updated old rake task to properly seed languages, created a new rake task to ensure the languages are in the correct formats

merge optimistic locking into dev

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.

Fixed merge conflicts

config/initializers/locale.rb getters/setters pointing at FastGettext. en-UK renamed to en_GB. DMPRoadmap/roadmap#98

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.

Chnage progress bar to reduce num queries. Fixes DMPRoadmap/roadmap#103

added a rake task to fix a bug in migration data. Task can be found at migrate:unique_dmptemplate_id

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

URLs without locale param

trying to reduce data access queries. Needs more work