Merge branch 'development' into CDL-MVP ...

Backporting bugfixes. db:migrate needs to be run to add new indices.

updated rake task to remember which annotations should be preserved

removed debug code to count matches, replaced with destroy to remove matches

forgot to save migrate.rake

fixes bug with duplicate guidance and adds rake task to cleanup database

fixed bu in plans.controller, added new fields to attr_accessible on plan model, added migration tasks for v0.4 upgrade

completed work on API

fixed logic which lead to guidance not being displayed

merged development into annotations

updated org-admin interface to use annotations for template editing

Added dirty flag to templates. Added rake tasks to cleanup bad data

removed rake wrapper task because json dir can be set in initializer. Added initializer and updated _('') to __('') 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

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

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

Fixed merge conflicts

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

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

URLs without locale param

Corrected spelling of text_desription field in token_permission_types

added rake task to seed database with key values, additionally added rake task to perform all migration tasks

moved migrating user permissions to a rake task migrate:permissions

Merging current stable development branch into master (#23) ...

This is our unofficial v.0.1.0 release. It includes:
- Rails 4.2 migration
- Internationalization
- API
- Institutional logo upload (thanks to Weiwei and the Univ. of Alberta)
- Generic branding
- General cleanup of code and bug fixes

DMPonline4 - RAILS 4.0 (#4) ...

Merging the initial DMPOnline4 codebase into Roadmap

DMPonline4, this code was designed and implemented by the Digital
Curation Centre (DCC)
DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database.