Browse code Merge pull request #2152 from DMPRoadmap/development Development -> Master for Release dev
commit a9cc2ca4de26ae354f91c6a34bb96c6a57d9c939 2 parents a08d751 + 69fc2c8 Sam Rust authored on 29 Jul 2019 GitHub committed on 29 Jul 2019

Showing 98 changed files

• .eslintrc.json
• .gitignore
• .travis.yml
• Gemfile
• Gemfile.lock
• app/controllers/api/v0/plans_controller.rb
• app/controllers/org_admin/departments_controller.rb
• app/controllers/org_admin/plans_controller.rb
• app/controllers/org_admin/templates_controller.rb
• app/controllers/paginable/departments_controller.rb
• app/controllers/paginable/guidances_controller.rb
• app/controllers/plan_exports_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/public_pages_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/research_projects_controller.rb
• app/controllers/roles_controller.rb
• app/helpers/mailer_helper.rb
• app/helpers/perms_helper.rb
• app/javascript/utils/tinymce.js
• app/javascript/views/answers/rda_metadata.js
• app/javascript/views/notes/index.js
• app/javascript/views/plans/edit_details.js
• app/models/answer.rb
• app/models/concerns/exportable_plan.rb
• app/models/department.rb
• app/models/org.rb
• app/models/perm.rb
• app/models/plan.rb
• app/models/research_project.rb
• app/models/template.rb
• app/models/user.rb
• app/policies/api/v0/plans_policy.rb
• app/policies/department_policy.rb
• app/policies/note_policy.rb
• app/policies/plan_policy.rb
• app/policies/public_page_policy.rb
• app/views/api/v0/plans/index.json.jbuilder
• app/views/devise/registrations/_external_identifier.html.erb
• app/views/devise/registrations/_personal_details.html.erb
• app/views/layouts/_footer.html.erb
• app/views/notes/_show.html.erb
• app/views/org_admin/departments/edit.html.erb
• app/views/org_admin/departments/new.html.erb
• app/views/orgs/_departments.html.erb
• app/views/orgs/_profile_form.html.erb
• app/views/orgs/admin_edit.html.erb
• app/views/paginable/departments/_index.html.erb
• app/views/paginable/plans/_org_admin.html.erb
• app/views/paginable/users/_index.html.erb
• app/views/plans/_edit_details.html.erb
• app/views/plans/_navigation.html.erb
• app/views/plans/_overview_details.html.erb
• app/views/plans/_share_form.html.erb
• app/views/shared/_sign_in_form.html.erb
• app/views/shared/export/_plan_txt.erb
• app/views/users/_admin_grant_permissions.html.erb
• app/views/users/admin_grant_permissions.html.erb
• config/branding.yml.sample
• config/environments/development.rb
• config/initializers/api_pagination.rb
• config/initializers/devise.rb.example
• config/locales/de.yml
• config/locales/el.yml
• config/locales/en-GB.yml
• config/locales/en-US.yml
• config/locales/en.yml
• config/locales/es.yml
• config/locales/fi.yml
• config/locales/fr-CA.yml
• config/locales/fr-FR.yml
• config/locales/fr.yml
• config/locales/ja.yml
• config/locales/pt-BR.yml
• config/locales/ro.yml
• config/locales/sv-FI.yml
• config/routes.rb
• db/migrate/20190507091025_create_departments.rb
• db/schema.rb
• db/seeds.rb
• lib/open_aire_request.rb
• lib/tasks/upgrade.rake
• package.json
• spec/factories/departments.rb
• spec/factories/identifier_schemes.rb
• spec/factories/perms.rb
• spec/factories/phases.rb
• spec/factories/sections.rb
• spec/factories/templates.rb
• spec/factories/users.rb
• spec/features/plans_spec.rb
• spec/features/templates/templates_upgrade_customisations_spec.rb
• spec/models/department_spec.rb
• spec/models/plan_spec.rb
• spec/models/role_spec.rb
• spec/models/template_spec.rb
• spec/support/helpers/roles_helper.rb
• yarn.lock

Ignore Space Show notes View .eslintrc.json

Ignore Space Show notes View .gitignore

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/api/v0/plans_controller.rb

Ignore Space Show notes View app/controllers/org_admin/departments_controller.rb 0 → 100644

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/departments_controller.rb 0 → 100644

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

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

Ignore Space Show notes View app/controllers/plans_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/research_projects_controller.rb 0 → 100644

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

Ignore Space Show notes View app/helpers/mailer_helper.rb

Ignore Space Show notes View app/helpers/perms_helper.rb

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

Ignore Space Show notes View app/javascript/views/answers/rda_metadata.js

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

Ignore Space Show notes View app/javascript/views/plans/edit_details.js

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

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

Ignore Space Show notes View app/models/department.rb 0 → 100644

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

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

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

Ignore Space Show notes View app/models/research_project.rb 0 → 100644

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

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

Ignore Space Show notes View app/policies/api/v0/plans_policy.rb

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/layouts/_footer.html.erb

Ignore Space Show notes View app/views/notes/_show.html.erb

Ignore Space Show notes View app/views/org_admin/departments/edit.html.erb 0 → 100644

Ignore Space Show notes View app/views/org_admin/departments/new.html.erb 0 → 100644

Ignore Space Show notes View app/views/orgs/_departments.html.erb 0 → 100644

Ignore Space Show notes View app/views/orgs/_profile_form.html.erb

Ignore Space Show notes View app/views/orgs/admin_edit.html.erb

Ignore Space Show notes View app/views/paginable/departments/_index.html.erb 0 → 100644

Ignore Space Show notes View app/views/paginable/plans/_org_admin.html.erb

Ignore Space Show notes View app/views/paginable/users/_index.html.erb

Ignore Space Show notes View app/views/plans/_edit_details.html.erb

Ignore Space Show notes View app/views/plans/_navigation.html.erb

Ignore Space Show notes View app/views/plans/_overview_details.html.erb

Ignore Space Show notes View app/views/plans/_share_form.html.erb

Ignore Space Show notes View app/views/shared/_sign_in_form.html.erb

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

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

Show notes View app/views/users/admin_grant_permissions.html.erb 100644 → 0

Ignore Space Show notes View config/branding.yml.sample

Ignore Space Show notes View config/environments/development.rb

Ignore Space Show notes View config/initializers/api_pagination.rb 0 → 100644

Ignore Space Show notes View config/initializers/devise.rb.example

Ignore Space Show notes View config/locales/de.yml

Ignore Space Show notes View config/locales/el.yml

Ignore Space Show notes View config/locales/en-GB.yml

Ignore Space Show notes View config/locales/en-US.yml

Ignore Space Show notes View config/locales/en.yml 0 → 100644

Ignore Space Show notes View config/locales/es.yml

Ignore Space Show notes View config/locales/fi.yml

Ignore Space Show notes View config/locales/fr-CA.yml

Ignore Space Show notes View config/locales/fr-FR.yml

Ignore Space Show notes View config/locales/fr.yml

Ignore Space Show notes View config/locales/ja.yml

Ignore Space Show notes View config/locales/pt-BR.yml

Ignore Space Show notes View config/locales/ro.yml

Ignore Space Show notes View config/locales/sv-FI.yml

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20190507091025_create_departments.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View lib/open_aire_request.rb 0 → 100644

Ignore Space Show notes View lib/tasks/upgrade.rake

Ignore Space Show notes View package.json

Ignore Space Show notes View spec/factories/departments.rb 0 → 100644

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

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

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

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

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

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

Ignore Space Show notes View spec/features/plans_spec.rb

Ignore Space Show notes View spec/features/templates/templates_upgrade_customisations_spec.rb

Ignore Space Show notes View spec/models/department_spec.rb 0 → 100644

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

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

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

Ignore Space Show notes View spec/support/helpers/roles_helper.rb

Ignore Space Show notes View yarn.lock

Show line notes below