re-wrote by_organisation to be more efficient (also to work)

added discussion point to dmptemplate

added documentation to guidance model

updated call for can_view to can_view?

Added documentation and fixed syntax to dmptemplate model

fixed bug where users couldn see their organisations' guidance groups

ensured can_view behaves as intended/defined by tests

standardised errors in api controllers

adding standardised errors to locales

updated result of guidance groups endpoints ...

-added display of guidances owned by group to show,index

added parsing of guidances to projects api ...

-Added parsing of the guidance param in the JSON

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 API and Localisation work ...

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

Added better data to seeds file. Tested upgrade to bootstrap 3.2 but reverted back

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

Updated User model so that the edit profile page will save changes

Added missing fontawesome web font.

Fixed issue with undefined 'options' variable in projects.js

Fixed issue with undefined 'options' variable in projects.js

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.