Merge branch 'final_schema' into final_schema

bugfixed display logic for editing phase, modifiability of questions, mass-assignment of questions

updated admin_previewphase action in templates controller

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

resolved merge conflicts

updated additional parts of the admin_phase view to use the new schema's data access. Additionally changed models for suggested_answer, user, guidance_group and question to better reflect the associations in the schema

updated attr_accessible lines to allow mass assignment of associations via object instead of id

made necissary changes to allow the app to display the splash/login screen

updated relations in question model

removed parent_id field from questions table

merged DCC changes into master

fix various issues to do with display of formatting in questions

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

added documentation to remaining models

Rails 4.2 (#10) ...

* Migrated codebase from rails 4.0 to 4.2, also removed most of the version specifications from the gem dependencies and ran bundle update

* Commented out api test since it is incomplete and references a missing fixture. Also commented out stubbed performance test because that functionality is no longer a part of rails

* renamed config/environment to config/environments which is what rails is looking for. Commented out the DOCX mime type reference because it is already added by rails. Commented out the belongs_to_and has_many line in models/user because it is already defined by rolify gem

* updated ruby version to 2.1.10 for devise gem

* Added line to have tests auto-run db:migrate

* Ran db:migrate to update the schema since there were some pending migrations preventing travis from running rake

* removed schem_migration line from test_helper as it did not seem to help with the schema migration issue in travis

* Added fb:migrate and db:test:prepare commands to travis file

* replaced deprecated ActiveRecord::Migrator call in old db migration file

* Removed rake db tasks from travis file now that the offending migration script has been fixed

* added rake db:test:prepare back to travis file and added call to run default test task

* Updated find_by_all to the newer and more accepted 'where'

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

* 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')'

* removed redundant bootstrap file. using bootstrap.min.js going forward. updated css to default align all text to left

* Added js preventDefault to modal popup functions to prevent them from appearing and immediately disappering

* 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()

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

* Upgraded select2 js file

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

* Fixed add/remove option js

* Fixed i18n calls in erb files that were missing an equal sign (e.g. <% t('value'') %> --> <%= t('value') %> so that the value will appear to the user. Also updated i18n calls from admin.js with 'js.' prefix)

* Removed deprecated uniq_by call on ActiveRecord collection

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

* Added 'self' prefix to dmptemplate references in models/project.rb because of a scoping issue. tweaks to select2 dropdowns on create project page

* Moved i18n calls out of string content in toolbar.js

* Removed outdated i%() array initializers because they now create arrays of symbols instead of strings

* Fixes to the plan settings page

* Fixed issues with settings hash

* Removed some debug statements

* Added the new rails 4.2 byebug gem

* added rails 4 bin

* added rails 4 bin

* tweaks to env and session_store cookie domain

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

* updated routes for lock/unlock section on plan form

* fixed issue with lock/unlock using .json extension in ajax call. fixed unknown i18n references in plans.js

* Fixed issue with location of web-console in the Gemfile.

localization further work, including dropdown initial work

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.