resolved merge conflicts

merged final_schema changes into visibility

fixed merge conflicts

extracted plan visibility work out of dev branch for PR to DCC

switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

updated roles_controller and model functions

finsihed adding visibility to project details page as radio button options. Updated public DMPs page to work with new visibility and moved it to the static pages controller since it falls outside of normal security. Updated all locale files accordingly

Added visibility model, and started updating tests for public dmps controller but we need to create fixtures which is extremely difficult with the current state of the DB. Will wait for refactor before finishing tests.

worked on routing and controller tests for new public dmps. Fixed routing tests so that they use rails route helpers

Added initial public DMPs page to display public plans to unauthenticated users

added JS logic to prevent is_test and is_public from both being true on the project edit page. Also added include to projects show page so that it pulls in the projects.js file

updated locale files so that helpers.yes and helpers.no work. Those are yaml keywords so they must be quoted (e.g. 'yes': 'Oui' instead of yes: 'Oui'). Added is_public and is_test checkboxes to projects edit/create forms

renamed hash_to_json_object in application_helper to hash_to_js_json_variable to make its purpose clearer

bugs found in fr dmponline

Added wkhtmltopdf binaries to gemfile. Moved wicked_pdf config to an initializer so that it can be custom to the server instance. Updated dead link to DMP Checklist pdf

fixed issue with branding variable resolution on plan modal dialogs

Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value

removed debug lines and added comments

finished up removal of ajax calls from create plan page

further changes for create plan de-ajax-ing

updated json for guidance_groups so that the organisation id is included for filtering purposes

Removed ajax calls in create project/plan page. It now passes all of the options to the UI and lets the UI filter them as needed. Also upgraded the select2.js script to the lates 4.x version

explicit bullet style for questions and raw questoin test in form

merging

conflicts

dropdown and org language setting

Merged in changes from DmpRoadmap/development

fixed the magic strings function

Added in missing bug fixes (#13) ...

* 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.

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

* Updated gemfile to specify specific version of contact-us

* 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

* removed console.log debug statements

initial passover of removing magic strings