Browse code Merge pull request #2397 from DMPRoadmap/development Sync Development for Release 2.1.5 dev
commit a54f85a85ddd50d5d0e0a0814c120d6d8dc6d1f8 2 parents f807b5f + ddf27e8 Brian Riley authored on 14 Feb 2020 GitHub committed on 14 Feb 2020

Showing 70 changed files

• .github/workflows/brakeman.yml
• .github/workflows/eslint.yml
• .github/workflows/mysql.yml
• .github/workflows/postgres.yml
• .github/workflows/rubocop.yml
• .rubocop.yml
• .travis.yml
• Gemfile
• Gemfile.lock
• app/controllers/answers_controller.rb
• app/controllers/api/v0/plans_controller.rb
• app/controllers/api/v0/statistics_controller.rb
• app/controllers/guidance_groups_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/home_controller.rb
• app/controllers/org_admin/plans_controller.rb
• app/controllers/org_admin/templates_controller.rb
• app/controllers/paginable/plans_controller.rb
• app/controllers/paginable/templates_controller.rb
• app/controllers/public_pages_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/roles_controller.rb
• app/controllers/sessions_controller.rb
• app/controllers/settings/plans_controller.rb
• app/controllers/stat_created_plans_by_template_controller.rb
• app/controllers/static_pages_controller.rb
• app/controllers/usage_controller.rb
• app/controllers/users/invitations_controller.rb
• app/controllers/users/omniauth_callbacks_controller.rb
• app/helpers/usage_helper.rb
• app/javascript/packs/application.js
• app/javascript/utils/charts.js
• app/javascript/utils/tinymce.js
• app/javascript/views/usage/index.js
• app/models/annotation.rb
• app/models/concerns/exportable_plan.rb
• app/models/plan.rb
• app/models/stat.rb
• app/models/stat_created_plan.rb
• app/policies/usage_policy.rb
• app/policies/user_policy.rb
• app/views/api/v0/plans/index.json.jbuilder
• app/views/api/v0/statistics/plans.json.jbuilder
• app/views/devise/registrations/_personal_details.html.erb
• app/views/org_admin/users/edit.html.erb
• app/views/shared/export/_plan.erb
• app/views/shared/export/_plan_coversheet.erb
• app/views/usage/_filter.html.erb
• app/views/usage/_filtered_value.html.erb
• app/views/usage/_plans_by_template_chart.html.erb
• app/views/usage/_plans_created_chart.html.erb
• app/views/usage/_total_usage.html.erb
• app/views/usage/_users_joined_chart.html.erb
• app/views/usage/filter.js.erb
• app/views/usage/index.html.erb
• app/views/usage/plans_by_template.js.erb
• config/routes.rb
• package.json
• spec/controllers/usage_controller_spec.rb
• spec/factories/stat_created_plan.rb
• spec/helpers/usage_helper_spec.rb
• spec/models/plan_spec.rb
• spec/models/stat_created_plan_spec.rb
• spec/models/stat_joined_user_spec.rb
• spec/models/template_spec.rb
• spec/policies/usage_policy_spec.rb
• spec/rails_helper.rb
• spec/requests/stat_created_plans_by_template_controller_spec.rb
• spec/services/org/create_created_plan_service_spec.rb
• yarn.lock

Ignore Space Show notes View .github/workflows/brakeman.yml 0 → 100644

Ignore Space Show notes View .github/workflows/eslint.yml 0 → 100644

Ignore Space Show notes View .github/workflows/mysql.yml 0 → 100644

Ignore Space Show notes View .github/workflows/postgres.yml 0 → 100644

Ignore Space Show notes View .github/workflows/rubocop.yml 0 → 100644

Ignore Space Show notes View .rubocop.yml

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View app/controllers/answers_controller.rb

Ignore Space Show notes View app/controllers/api/v0/plans_controller.rb

Ignore Space Show notes View app/controllers/api/v0/statistics_controller.rb

Ignore Space Show notes View app/controllers/guidance_groups_controller.rb

Ignore Space Show notes View app/controllers/guidances_controller.rb

Ignore Space Show notes View app/controllers/home_controller.rb

Ignore Space Show notes View app/controllers/org_admin/plans_controller.rb

Ignore Space Show notes View app/controllers/org_admin/templates_controller.rb

Ignore Space Show notes View app/controllers/paginable/plans_controller.rb

Ignore Space Show notes View app/controllers/paginable/templates_controller.rb

Ignore Space Show notes View app/controllers/public_pages_controller.rb

Ignore Space Show notes View app/controllers/registrations_controller.rb

Ignore Space Show notes View app/controllers/roles_controller.rb

Ignore Space Show notes View app/controllers/sessions_controller.rb

Ignore Space Show notes View app/controllers/settings/plans_controller.rb

Show notes View app/controllers/stat_created_plans_by_template_controller.rb 100644 → 0

Ignore Space Show notes View app/controllers/static_pages_controller.rb

Ignore Space Show notes View app/controllers/usage_controller.rb

Ignore Space Show notes View app/controllers/users/invitations_controller.rb

Ignore Space Show notes View app/controllers/users/omniauth_callbacks_controller.rb

Ignore Space Show notes View app/helpers/usage_helper.rb 0 → 100644

Ignore Space Show notes View app/javascript/packs/application.js

Ignore Space Show notes View app/javascript/utils/charts.js 0 → 100644

Ignore Space Show notes View app/javascript/utils/tinymce.js

Ignore Space Show notes View app/javascript/views/usage/index.js

Ignore Space Show notes View app/models/annotation.rb

Ignore Space Show notes View app/models/concerns/exportable_plan.rb

Ignore Space Show notes View app/models/plan.rb

Ignore Space Show notes View app/models/stat.rb

Ignore Space Show notes View app/models/stat_created_plan.rb

Ignore Space Show notes View app/policies/usage_policy.rb 0 → 100644

Ignore Space Show notes View app/policies/user_policy.rb

Ignore Space Show notes View app/views/api/v0/plans/index.json.jbuilder

Ignore Space Show notes View app/views/api/v0/statistics/plans.json.jbuilder

Ignore Space Show notes View app/views/devise/registrations/_personal_details.html.erb

Ignore Space Show notes View app/views/org_admin/users/edit.html.erb

Ignore Space Show notes View app/views/shared/export/_plan.erb

Ignore Space Show notes View app/views/shared/export/_plan_coversheet.erb

Ignore Space Show notes View app/views/usage/_filter.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/_filtered_value.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/_plans_by_template_chart.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/_plans_created_chart.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/_total_usage.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/_users_joined_chart.html.erb 0 → 100644

Ignore Space Show notes View app/views/usage/filter.js.erb 0 → 100644

Ignore Space Show notes View app/views/usage/index.html.erb

Ignore Space Show notes View app/views/usage/plans_by_template.js.erb 0 → 100644

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View package.json

Ignore Space Show notes View spec/controllers/usage_controller_spec.rb 0 → 100644

Ignore Space Show notes View spec/factories/stat_created_plan.rb

Ignore Space Show notes View spec/helpers/usage_helper_spec.rb 0 → 100644

Ignore Space Show notes View spec/models/plan_spec.rb

Ignore Space Show notes View spec/models/stat_created_plan_spec.rb

Ignore Space Show notes View spec/models/stat_joined_user_spec.rb

Ignore Space Show notes View spec/models/template_spec.rb

Ignore Space Show notes View spec/policies/usage_policy_spec.rb 0 → 100644

Ignore Space Show notes View spec/rails_helper.rb

Show notes View spec/requests/stat_created_plans_by_template_controller_spec.rb 100644 → 0

Ignore Space Show notes View spec/services/org/create_created_plan_service_spec.rb

Ignore Space Show notes View yarn.lock

Show line notes below