Org should be active by default

Added Active column on org

Fix on migration

Added correct foreign keys

Added structured schema/answers models and tables

Merged DMPRoadmap V2.1.3

Removed research output types Datapaper & Event from seeds.rb

Added selectable ResearchOutput Type to ResearchOutput form

Renamed ResearchOutputs columns

Datasets has been renamed as Research outputs

Add functionality for School/Department for an organisation. ...

Changes:
    - added a Department model whose instances belong to an org and require name.
    - added a DepartmentController and views for create, edit/update and a index view which is a tab
      of 'Organisational Details'.
    - added the optional attribute department_id to User model.
    - added Rspec tests.
    - updated app/controllers/registrations_controller.rb, app/models/org.rb and
      app/models/user.rb to get rid of outstanding Rubocop warnings

    Fix for issue #2088.

Datasets integration

removed unneeded migration

capture progress

Static pages edition integration

Fix in schema.rb

Fixed models & schema annotations

Removed migration deleting banner_text

Changes following migrations

Merged with DMPRoadmap:master

Added slug to themes & theme API now uses slug

Fixes broken seeds due to option based questions validation

1. stat_created_plan.to_csv with option for details by template. ...

2. details attribute for stats table #1679
3. create_created_plan_service extended with details by template
4. create_last_month_created_plan_service extended with details by
template.
5. create_or_update strategy for generating stats
6. StatCreatedPlanByTemplateController#index for graphs usage
7. month_start_date and month_end_date for OrgDateRangeable class

[RD-1679] Usage view including date input for plans by template

[#1679] monthly_range query updated

[#1679] client-side chart for plans by template

[#1679] Time picker for plans by template chart

[#1679] Download plans by template action.

deleted spec

merge conflicts fixed

[#1679] Removed JS linter warnings

[#1679] Rubocop conforming code. Drying out stat services

Add ActiveRecord Session storage (#1969) ...

* Add ActiveRecord Session storage

* Update Gemfile to fix failing tests

Moved Dotenv to dev and test group

* Add length limit to session_id for MySQL databases

* Update session_id column length to 64

* Update schema with new constraints on session_id

Fix broken tests caused by locale configuration (#1875) ...

* Fix broken tests caused by locale configuration

- Add LocaleSet
- Add LocaleFormatter to force proper string formats
- Rename I18n formats to use hyphen
- Add rake task for updating existing languages on DB
- Fix instances of US english in the templates

* Fix FastGettext initializer loader

* Add Amazon S3 creds for Travis

* Revert "Add Amazon S3 creds for Travis"

This reverts commit 366c1a7.

* Fix Faker localization for rake tasks

Was breaking rake db:seed file

Refactor how Template upgrade customization works (#1856) ...

* Refactor how Template upgrade customization works

- Added position_in_parent to child-records Phase, Section, and Questions
- Extracted upgrade_customization! into its own service object

wip: rebasing on development

wip: pushing to Ghub

wip: Template upgrade customisation service working

Add migration to update versionable_id for records

* Fix bug in org swaps test

Test was failing because JS wasn't executing fast enough in test browser

* Refactor how locales are set in specs

* Fix bug in plan exports caused by git merge

The routes weren't merged properly which seems to have caused a regression error

* Add documentation for SectionSorter

* Update rubyzip and re-instate Bundle Audit

This was disabled because it was failing the Travis CI script. Since there wasn't a
new version of the rubyzip gem to upgrade to, we couldn't turn the error off.

* Add length constraints to versionable_id

* Add length constraints to versionable_id

* Fix bug in ActsAsSortable module

... I have no idea why those issues haven't popped up before now!?

* Fix random bug in I18n

* Move versioning ID migration into own rake task

rebased onto development ...

stat_created_plan_spec finished

stats table using bigint. StatJoinedUser spec done

csvable_spec done

org_date_rangeable_spec done

Actions::StatCreatedPlan::Generate spec half way done

Actions::StatCreatedPlan::Generate rspec done

Actions::StatJoinedUser::Generate spec finished

Role.with_access_flags instead of access_values_for method

Fix seed files

removed bad index from templates (#1812) ...

removed index from schema.rb

fixed schema version number

Merge branch 'development' into feature/validations