Merge branch 'add-orcid-functionality' into development
dev
commit 4b2872a6465560c243f1ef33256b7bef03f441f2
2 parents fae60b7 + 5bb894a
@briley briley authored on 10 Nov 2016
Showing 40 changed files
View
.travis.yml
View
Gemfile
View
Gemfile.lock
View
README.md
View
app/assets/images/orcid.png 0 → 100644
View
app/assets/images/remove.png 0 → 100644
View
app/controllers/registrations_controller.rb
View
app/controllers/sessions_controller.rb
View
app/controllers/user_identifiers_controller.rb 0 → 100644
View
app/controllers/users/omniauth_callback_controller.rb 100644 → 0
View
app/controllers/users/omniauth_callbacks_controller.rb 0 → 100644
View
app/models/identifier_scheme.rb 0 → 100644
View
app/models/user.rb
View
app/models/user_identifier.rb 0 → 100644
View
app/validators/url_validator.rb 0 → 100644
View
app/views/devise/registrations/_external_identifier.html.erb 0 → 100644
View
app/views/devise/registrations/edit.html.erb
View
config/initializers/devise.rb 100644 → 0
View
config/initializers/devise.rb.example
View
config/initializers/wicked_pdf.rb.example 0 → 100644
View
config/initializers/wicked_pdf_example.rb 100644 → 0
View
config/locales/de.yml
View
config/locales/en-UK.yml
View
config/locales/en-US.yml
View
config/locales/fr.yml
View
config/routes.rb
View
db/migrate/20161024163546_create_user_identifier_scheme.rb 0 → 100644
View
db/migrate/20161024163920_create_user_identifiers.rb 0 → 100644
View
db/migrate/20161104161345_remove_logo_from_identifier_schemes.rb 0 → 100644
View
db/migrate/20161108214240_add_domain_to_identifier_schemes.rb 0 → 100644
View
db/schema.rb
View
db/seeds.rb
View
lib/assets/stylesheets/admin.css.less
View
lib/assets/stylesheets/bootstrap_and_overrides.css.less
View
test/fixtures/identifier_schemes.yml 0 → 100644
View
test/functional/users/omniauth_callbacks_controller_test.rb 0 → 100644
View
test/routing_test.rb
View
test/test_helper.rb
View
test/unit/identifier_schemes_test.rb 0 → 100644
View
test/unit/user_test.rb