Browse code Merge pull request #313 from DigitalCurationCentre/feature/sso 2 bugfixes dev
commit 60c71b6b182c66be7986d1eaf0be81397dde2b5a 2 parents 78dcd33 + 6c928ce Sam Rust authored on 16 May 2017 GitHub committed on 16 May 2017

Showing 40 changed files

• Gemfile
• Gemfile.lock
• app/controllers/admin/answers_controller.rb
• app/controllers/admin/exported_plans_controller.rb
• app/controllers/admin/guidance_groups_controller.rb
• app/controllers/admin/guidances_controller.rb
• app/controllers/admin/identifier_schemes_controller.rb
• app/controllers/admin/languages_controller.rb
• app/controllers/admin/notes_controller.rb
• app/controllers/admin/orgs_controller.rb
• app/controllers/admin/perms_controller.rb
• app/controllers/admin/phases_controller.rb
• app/controllers/admin/plans_controller.rb
• app/controllers/admin/question_formats_controller.rb
• app/controllers/admin/question_options_controller.rb
• app/controllers/admin/questions_controller.rb
• app/controllers/admin/regions_controller.rb
• app/controllers/admin/roles_controller.rb
• app/controllers/admin/sections_controller.rb
• app/controllers/admin/splash_logs_controller.rb
• app/controllers/admin/suggested_answers_controller.rb
• app/controllers/admin/templates_controller.rb
• app/controllers/admin/themes_controller.rb
• app/controllers/admin/token_permission_types_controller.rb
• app/controllers/admin/user_identifiers_controller.rb
• app/controllers/admin/users_controller.rb
• app/dashboards/user_dashboard.rb
• app/views/admin/application/_admin_header.html.erb
• app/views/admin/application/_sidebar.html.erb
• app/views/administrate/application/_admin_header.html.erb
• app/views/administrate/application/_navigation.html.erb
• app/views/user_mailer/permissions_change_notification.html.erb
• config/initializers/fast_gettext.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/routes.rb

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

Ignore Space Show notes View app/controllers/admin/exported_plans_controller.rb

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

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

Ignore Space Show notes View app/controllers/admin/identifier_schemes_controller.rb

Ignore Space Show notes View app/controllers/admin/languages_controller.rb

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

Ignore Space Show notes View app/controllers/admin/orgs_controller.rb

Ignore Space Show notes View app/controllers/admin/perms_controller.rb

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

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

Ignore Space Show notes View app/controllers/admin/question_formats_controller.rb

Ignore Space Show notes View app/controllers/admin/question_options_controller.rb

Ignore Space Show notes View app/controllers/admin/questions_controller.rb

Ignore Space Show notes View app/controllers/admin/regions_controller.rb

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

Ignore Space Show notes View app/controllers/admin/sections_controller.rb

Ignore Space Show notes View app/controllers/admin/splash_logs_controller.rb

Ignore Space Show notes View app/controllers/admin/suggested_answers_controller.rb

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

Ignore Space Show notes View app/controllers/admin/themes_controller.rb

Ignore Space Show notes View app/controllers/admin/token_permission_types_controller.rb

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

Ignore Space Show notes View app/controllers/admin/users_controller.rb

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

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

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

Ignore Space Show notes View app/views/administrate/application/_admin_header.html.erb 0 → 100644

Ignore Space Show notes View app/views/administrate/application/_navigation.html.erb 0 → 100644

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

Ignore Space Show notes View config/initializers/fast_gettext.rb

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

Show line notes below