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

removed deprecated link_to_object function from helpers/application.rb and added client side js script to add new options to a question.

Replaced deprecated link_to_function. the call in the helpers/application.rb should eventually be rethought. We shouldn't be using the onclick function of an html element directly, we should use the jquery approach: .click()

Fixed stack too deep error by commenting out circular reference to sections in the version model. Changed deprecated '.find(:all, :order => 'field ASC')' format to '.all.order('field')'

Updated find_by_all to the newer and more accepted 'where'

Rebased development branch and corrected merge conflicts

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 console debug lines to JS and then removed them when done

Fixed bootstrap tab issue on static pages. JQuery selector was not specific enough and was mixing up top nav bar with page specific tabs

Updated user model to assign variables to the attr_accessible list so that User profile and Super Admin user updates work

Added missing fontawesome web font.

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.