Added some bug fixes that were a part of an old 'upgrade-bootstrap' branch but were missed when creating the rails-4-2 pull request. Also replaces the static page urls with localized versions

Updated static page links so that they use localized paths. Added new locized_routes flag to the contact-us initializer and upgraded its gem

Fixed merge conflicts API/I18n -> Rails 4.2

merge

localization based on url

updated routes for lock/unlock section on plan form

Updated routes to make lock/unlock paths use json by default

tweaks to env and session_store cookie domain

Updated textbox and textarea sizes on contact_us form. added a route for the 'future plans' page

added a page for users to view api endpoint information

updated path to api_update to allow admin nav

Removed all accepts_nested_attributes_for for belongs_to associations because they were creating circular calls in ActiveRecord.

added new route to org admin users index

localization further work, including dropdown initial work

Updated routes.rb to remove unecessary create and edit route definitions

Master (#7) ...

* Update license (merging Marta's change that added Univ. of Glasgow to the text)

Update license to include University of Glasgow.

* Added API and Localisation work

API development done by Sam Rust - xsrust
Localisation work done by Damodar Sojka - DamodarSojka

Added API and Localisation work ...

API development done by Sam Rust - xsrust
Localisation work done by Damodar Sojka - DamodarSojka

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.