Browse code Merge pull request #48 from DMPRoadmap/development Rebase with shib/orcid functionality and template fix dev
commit 678f48dd1847225204a29067a3c804a09990b4c0 2 parents 3c2ef02 + b87fcd2 Brian Riley authored on 9 May 2017 GitHub committed on 9 May 2017

Showing 43 changed files

• app/controllers/projects_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/templates_controller.rb
• app/controllers/user_identifiers_controller.rb
• app/controllers/users/omniauth_callbacks_controller.rb
• app/controllers/users/omniauth_shibboleth_request_controller.rb
• app/dashboards/plan_dashboard.rb
• app/dashboards/plan_guidance_group_dashboard.rb
• app/models/annotation.rb
• app/models/guidance_group.rb
• app/models/plan_guidance_group.rb
• app/views/devise/registrations/_external_identifier.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/devise/registrations/new.html.erb
• app/views/plans/edit.html.erb
• app/views/shared/_login_form.html.erb
• app/views/templates/admin_index.html.erb
• app/views/user_mailer/permissions_change_notification.html.erb
• app/views/user_mailer/sharing_notification.html.erb
• config/initializers/devise.rb.example
• config/initializers/omniauth.rb
• config/locale/app.pot
• config/locale/de/app.po
• config/locale/en_GB/app.po
• config/locale/en_US/app.po
• config/locale/es/app.po
• config/locale/fr/app.po
• config/locale/i18n_placeholders.rb
• config/routes.rb
• db/migrate/20170427110141_add_logo_url_to_identifier_schemes.rb
• db/migrate/20170428083711_add_user_landing_url_to_identifier_schemes.rb
• db/schema.rb
• db/seeds.rb
• lib/assets/bg.gif
• lib/assets/images/remove.png
• public/html/ProjectsController.html
• public/html/Users/OmniauthShibbolethRequestController.html
• public/shib_logo.png
• test/functional/api_projects_controller_test.rb
• test/functional/phases_controller_test.rb
• test/functional/plans_controller_test.rb
• test/functional/users/omniauth_callbacks_controller_test.rb
• test/functional/users/omniauth_shibboleth_request_controller_test.rb

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

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

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

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

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

Show notes View app/controllers/users/omniauth_shibboleth_request_controller.rb 100644 → 0

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

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

Show notes View app/models/annotation.rb 100644 → 0

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

Show notes View app/models/plan_guidance_group.rb 100644 → 0

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

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

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

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

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

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

Ignore Space Show notes View app/views/user_mailer/permissions_change_notification.html.erb

Ignore Space Show notes View app/views/user_mailer/sharing_notification.html.erb

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

Show notes View config/initializers/omniauth.rb 100644 → 0

Ignore Space Show notes View config/locale/app.pot

Ignore Space Show notes View config/locale/de/app.po

Ignore Space Show notes View config/locale/en_GB/app.po

Ignore Space Show notes View config/locale/en_US/app.po

Ignore Space Show notes View config/locale/es/app.po

Ignore Space Show notes View config/locale/fr/app.po

Ignore Space Show notes View config/locale/i18n_placeholders.rb 0 → 100644

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20170427110141_add_logo_url_to_identifier_schemes.rb 0 → 100644

Ignore Space Show notes View db/migrate/20170428083711_add_user_landing_url_to_identifier_schemes.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/assets/bg.gif 0 → 120000

Ignore Space Show notes View lib/assets/images/remove.png

Show notes View public/html/ProjectsController.html 100644 → 0

Show notes View public/html/Users/OmniauthShibbolethRequestController.html 100644 → 0

Ignore Space Show notes View public/shib_logo.png 0 → 100644

Show notes View test/functional/api_projects_controller_test.rb 100644 → 0

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

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

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

Show notes View test/functional/users/omniauth_shibboleth_request_controller_test.rb 100644 → 0

Show line notes below