Static pages edition integration

Fixes in models annotations

Fixed models & schema annotations

Commented overridden methods in controllers & models

Added missing files for commit 1d9dde2

Changes following migrations

Fix on mixins calls in helpers & models

Separated core code from ours improvements for the new visibility

Merged with DMPRoadmap:master

Added slug to themes & theme API now uses slug

Merge branch 'master' into development

added check to feedback_requested (#2012)

fixed query (#2008)

updated organisational plans query to only include completed plans to match logic of plan export (#2004) ...

refactored plan.visibility_allowed? to call underlying method on phases

refactored plan.visibility_allowed? to call underlying method on phases

fixed tests

Further changes for Text field should be mandatory for option based questions. ...

Fix for issue #1725

The question_options field on the Customisable Phase template has the
following changes:
- the 'Text' label has the asterick for required.
- the error message for missing question option now reads
 "You must have at least one option with accompanying text."
- Corrected some Rubocop errors on the files added.

made recommended adjustments

removed debug statements

finished up changes to controllers

Merge branch 'development' into issue1663

Added number type field

updated Role, Plan logic and fixed tests

Updated api stats controller to use Org model's method (#1995) ...

* updated api stats controller to use Org model's  method

* updated org.plans to check role.active flag

* updated other api stats endpoints to use org.plans

refactor plan/role functionality to use flagshihtzu properly

updated deactivate logic

Updated JS for requiredField to allow for dynamically loaded DOM elements (#1996) ...

* IssueID #1725 - Updated messages Question text and option presence messages.

* updated requiredField.js to allow for dynamically loaded DOM elements

* fixed broken tests

moved deactivate logic to Role model and added specs

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

Fix for ensuring that Questions that are option based must have atleast one non-blank text entry. ...

- Validation added for option based questions to ensure text field non-blank.
    - Validation message OPTION_PRESENCE_MESSAGE added to app/models/concerns/validation_messages.rb.
    - Added ':allow_nil => true' to
            delegate :option_based?, to: :question_format, :allow_nil => true
     in Question model to prevent NoMethodError if question_format is nil.

    Fix for #1725

fixed issue with args in translatable:find (#1963) ...

fixed issue with translatable text having a newline between the closing quote and the closing paren

fixed issues with translatable text in planscsv export and sharing notification

fixed issue with translatable on templates controller

fixed issue with multiline strings in translatable:find

fixed issue with multiline strings in translatable:find

cleaned up en-US translations

Merge pull request #81 from OPIDoR/feature/api_theme ...

Extract answers from plan with a given theme