Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP
dev
commit a921408b3be8841563df1efb31a4b03a4f7174e1
2 parents 7b5ebc0 + bb828e6
@briley briley authored on 27 Jun 2017
Showing 12 changed files
View
app/controllers/registrations_controller.rb
View
app/controllers/users_controller.rb
View
app/models/user.rb
View
app/views/devise/registrations/_external_identifier.html.erb 100644 → 0
View
app/views/devise/registrations/_external_identifier_orcid.html.erb 0 → 100644
View
app/views/devise/registrations/_external_identifier_shibboleth.html.erb 0 → 100644
View
app/views/devise/registrations/_password_details.html.erb
View
app/views/devise/registrations/_personal_details.html.erb
View
app/views/devise/registrations/edit.html.erb
View
app/views/users/_notification_preferences.html.erb
View
config/routes.rb
View
lib/assets/stylesheets/dmproadmap/forms.scss