Browse code Merge pull request #41 from DMPRoadmap/development Rebase with latest fixes from DCC dev
commit 85f323ee91366340884d9a0d361869f175f7fe49 2 parents fa603a2 + 8a4b1b4 Brian Riley authored on 30 Mar 2017 GitHub committed on 30 Mar 2017

Showing 62 changed files

• .gitignore
• Gemfile
• Gemfile.lock
• app/controllers/answers_controller.rb
• app/controllers/guidance_groups_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/notes_controller.rb
• app/controllers/phases_controller.rb
• app/dashboards/guidance_group_dashboard.rb
• app/dashboards/identifier_scheme_dashboard.rb
• app/dashboards/language_dashboard.rb
• app/dashboards/org_dashboard.rb
• app/dashboards/perm_dashboard.rb
• app/dashboards/token_permission_type_dashboard.rb
• app/dashboards/user_dashboard.rb
• app/dashboards/user_identifier_dashboard.rb
• app/models/org.rb
• app/models/perm.rb
• app/models/user.rb
• app/policies/note_policy.rb
• app/views/admin/application/_collection.html.erb
• app/views/admin/application/_form.html.erb
• app/views/admin/application/edit.html.erb
• app/views/admin/application/index.html.erb
• app/views/admin/application/new.html.erb
• app/views/admin/application/show.html.erb
• app/views/answers/update.js.erb
• app/views/layouts/application.html.erb
• app/views/notes/archive.js.erb
• app/views/notes/create.js.erb
• app/views/notes/update.js.erb
• app/views/orgs/admin_show.html.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_archive_note.html.erb
• app/views/phases/_edit_note.html.erb
• app/views/phases/_list_notes.html.erb
• app/views/phases/_note.html.erb
• app/views/phases/_view_note.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/_progress.html.erb
• app/views/templates/_show_phases_sections.html.erb
• config/branding.yml
• config/branding_example.yml
• config/locales/administrate.en_GB.yml
• config/routes.rb
• db/schema.rb
• db/seeds.rb
• lib/assets/javascripts/admin.js
• lib/assets/javascripts/plans.js
• test/configuration_test.rb
• test/functional/answers_controller_test.rb
• test/functional/application_controller_test.rb
• test/functional/registrations_controller_test.rb
• test/functional/users/omniauth_callbacks_controller_test.rb
• test/helpers/plans_helper_test.rb
• test/integration/authentication_test.rb
• test/routing_test.rb
• test/test_helper.rb
• test/unit/guidance_group_test.rb
• test/unit/user_test.rb

Ignore Space Show notes View .gitignore

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/guidance_groups_controller.rb

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

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

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

Ignore Space Show notes View app/dashboards/guidance_group_dashboard.rb

Ignore Space Show notes View app/dashboards/identifier_scheme_dashboard.rb

Ignore Space Show notes View app/dashboards/language_dashboard.rb

Ignore Space Show notes View app/dashboards/org_dashboard.rb

Ignore Space Show notes View app/dashboards/perm_dashboard.rb

Ignore Space Show notes View app/dashboards/token_permission_type_dashboard.rb

Ignore Space Show notes View app/dashboards/user_dashboard.rb

Ignore Space Show notes View app/dashboards/user_identifier_dashboard.rb

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/user.rb

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

Show notes View app/views/admin/application/_collection.html.erb 100644 → 0

Show notes View app/views/admin/application/_form.html.erb 100644 → 0

Show notes View app/views/admin/application/edit.html.erb 100644 → 0

Show notes View app/views/admin/application/index.html.erb 100644 → 0

Show notes View app/views/admin/application/new.html.erb 100644 → 0

Show notes View app/views/admin/application/show.html.erb 100644 → 0

Ignore Space Show notes View app/views/answers/update.js.erb

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

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

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

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

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

Ignore Space Show notes View app/views/phases/_add_note.html.erb

Ignore Space Show notes View app/views/phases/_answer_form.html.erb

Ignore Space Show notes View app/views/phases/_archive_note.html.erb

Ignore Space Show notes View app/views/phases/_edit_note.html.erb

Ignore Space Show notes View app/views/phases/_list_notes.html.erb

Ignore Space Show notes View app/views/phases/_note.html.erb

Ignore Space Show notes View app/views/phases/_view_note.html.erb

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

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

Ignore Space Show notes View app/views/plans/_progress.html.erb 0 → 100644

Ignore Space Show notes View app/views/templates/_show_phases_sections.html.erb

Show notes View config/branding.yml 100644 → 0

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

Ignore Space Show notes View config/locales/administrate.en_GB.yml

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View lib/assets/javascripts/admin.js

Ignore Space Show notes View lib/assets/javascripts/plans.js

Ignore Space Show notes View test/configuration_test.rb

Ignore Space Show notes View test/functional/answers_controller_test.rb

Ignore Space Show notes View test/functional/application_controller_test.rb

Ignore Space Show notes View test/functional/registrations_controller_test.rb

Ignore Space Show notes View test/functional/users/omniauth_callbacks_controller_test.rb

Ignore Space Show notes View test/helpers/plans_helper_test.rb

Ignore Space Show notes View test/integration/authentication_test.rb

Ignore Space Show notes View test/routing_test.rb

Ignore Space Show notes View test/test_helper.rb

Ignore Space Show notes View test/unit/guidance_group_test.rb

Ignore Space Show notes View test/unit/user_test.rb

Show line notes below