Merge branch 'master' into 15803-unsetup
[arvados.git] / services / api / app / controllers / user_sessions_controller.rb
2019-11-18 Peter AmstutzMerge branch 'master' into 15803-unsetup
2019-11-18 Peter AmstutzMerge branch 'master' into 15577-ownership-transfer
2019-11-12 Tom CleggMerge branch '15305-keep-balance-bytes'
2019-11-06 Tom CleggMerge branch '15799-baseurl-missing-slash'
2019-11-06 Tom CleggMerge branch '15107-google-login'
2019-10-31 Tom Clegg15107: Add built-in Google login option, as an alternat...
2019-09-10 Tom Clegg13647: Merge branch 'master' into 13647-keepstore-config
2019-09-05 Peter AmstutzMerge branch '15558-alternate-email-addresses' refs...
2019-09-05 Peter AmstutzMerge branch 'master' into 15558-alternate-email-addresses
2019-09-05 Peter AmstutzMerge branch '15361-acr-create-workflow' refs #15361
2019-09-05 Peter AmstutzMerge branch '15529-federated-user-accounts' refs ...
2019-09-05 Peter Amstutz15529: LoginCluster uses ApiClientAuthorization.remote_host
2019-09-04 Peter AmstutzMerge branch 'master' into 15558-alternate-email-addresses
2019-08-22 Peter Amstutz15529: Prevent local login when LoginCluster is set
2019-08-22 Peter Amstutz15529: Add some checks to login method
2019-08-21 Peter Amstutz15529: Redirect to LoginCluster
2019-08-20 Peter Amstutz15558: Support login to user account by email address
2019-06-04 Peter AmstutzMerge branch '15028-cwl-v1.1' refs #15028
2019-05-15 Lucas Di PentimaMerge branch '15167-unlogged-attrs-api-docs'
2019-05-15 Tom Clegg15003: Merge branch 'master' into 15003-preprocess...
2019-05-13 Lucas Di PentimaMerge branch 'master' into 14988-wb-rails5-upgrade
2019-05-09 Peter AmstutzMerge branch '15061-fed-login' refs #15061
2019-05-09 Peter Amstutz15061: Implement admin variant of user merge by uuid
2019-05-09 Peter Amstutz15061: API support for linking local account to remote...
2019-05-08 Lucas Di PentimaMerge branch 'master' into 14988-wb-rails5-upgrade
2019-04-23 Peter AmstutzMerge branch '14670-new-java-sdk-docs' refs #14670
2019-04-19 Eric BiagiottiMerge branch 'master' into 14723-cwl-multiple-file...
2019-04-18 Peter AmstutzMerge branch '13996-new-api-config' refs #13996
2019-04-16 Fernando MonserratMerge branch '14670-new-java-sdk-docs' of git.curoverse...
2019-04-12 Peter AmstutzMerge branch 'master' into 14670-new-java-sdk-docs
2019-04-11 Peter Amstutz13996: Update rest of code for cleaner config access
2019-04-08 Peter Amstutz13996: Migrate majority of defaults to config.defaults.yml
2019-04-08 Peter Amstutz13996: Updating API server to use new config object WIP
2019-04-08 Lucas Di PentimaMerge branch '14873-api-rails5-upgrade'
2019-04-05 Lucas Di PentimaMerge branch 'master' into 14873-api-rails5-upgrade
2019-03-28 Lucas Di PentimaMerge branch 'master' into 14873-api-rails5-upgrade
2019-03-26 Lucas Di Pentima14873: Fixes deprecation warnings on integration tests.
2019-03-22 Lucas Di Pentima14873: Replaces *_filter with *_action
2019-03-14 Peter AmstutzAdd 'sdk/java-v2/' from commit '55f103e336ca9fb8bf1720d...
2019-02-06 Eric BiagiottiMerge branch 'master' into 13306-arvados-cwl-runner...
2019-02-05 Eric BiagiottiMerge branch '13306-arvados-cwl-runner-py3-support'
2019-02-04 Ward Vandewege9945: Merge branch 'master' into 9945-make-python-packa...
2019-02-01 Tom Clegg14325: Merge branch 'master'
2019-01-30 Lucas Di PentimaMerge branch '14770-wb-acr-bad-param'
2019-01-29 Lucas Di PentimaMerge branch '14718-api-login-salted-token'
2019-01-28 Lucas Di Pentima14718: Validates remote cluster id parameter on login...
2019-01-28 Lucas Di Pentima14718: Changes the way remote param is packed into...
2019-01-26 Lucas Di Pentima14718: Issue salted token when passing 'remote' param...
2018-10-15 Tom Clegg14285: Merge branch 'master' into 14285-keep-balance...
2018-10-11 Lucas Di PentimaMerge branch '13561-collection-versions-api'
2018-10-09 Tom Clegg14199: Merge branch 'master' into 14199-copy-from-remote
2018-10-09 Peter AmstutzMerge branch '14196-api-v2-tokens' refs #14196
2018-10-02 Peter Amstutz14196: Login process returns v2 tokens
2018-07-17 Peter AmstutzMerge branch 'master' into 13804-no-shutdown-wanted...
2018-07-17 Peter AmstutzMerge branch 'master' into 13822-nm-delayed-daemon
2018-05-25 Lucas Di PentimaMerge branch 'master' into 7478-anm-spot-instances
2018-05-23 Fuad MuhicMerge branch '13430-allow-storage-classes'
2018-05-23 Fuad MuhicMerge branch '13453-r-sdk-incorrect-rest-call-fix'
2018-05-22 Ward Vandewege9918: Merge branch 'master' into 9918-index-timeout
2018-05-21 Peter AmstutzMerge branch '12995-wb-merge-acct' refs #12995
2018-05-18 Peter Amstutz12995: Bugfix to support following chained user uuid...
2018-05-11 Ward VandewegeMerge branch 'thehyve/fix-crunch-documentation' Fix...
2018-05-08 Tom CleggMerge branch '12626-merge-accounts'
2018-05-07 Tom Clegg12626: Merge branch 'master' into 12626-merge-accounts
2018-05-07 Tom Clegg12626: Copy omniauth info into auth account, not target...
2018-05-02 Tom Clegg12626: Add arvados/v1/users/merge API.
2017-12-20 Lucas Di PentimaMerge branch 'master' into 12479-wb-structured-vocabulary
2017-12-12 Peter AmstutzMerge branch '12765-workbench-404-trashed' refs #12765
2017-12-11 Tom CleggMerge branch '12167-python-request-id'
2017-12-08 Tom CleggMerge branch '11908-properties-column-json'
2017-12-08 Tom CleggMerge branch '12721-build-package-version'
2017-12-08 Fuad MuhicMerge branch 'master' of git.curoverse.com:arvados...
2017-12-08 Tom CleggMerge branch '11453-federated-tokens'
2017-12-07 Tom Clegg11453: Merge branch 'master' into 11453-federated-tokens
2017-12-04 Tom Clegg11453: Merge branch 'master' into 11453-federated-tokens
2017-11-29 Tom Clegg11453: Merge branch 'master' into 11453-federated-tokens
2017-11-27 Tom CleggMerge branch 'master' into 11453-federated-tokens
2017-11-06 Tom CleggMerge branch 'master' into 11453-federated-tokens
2017-10-30 Tom Clegg11453: Do not generate local tokens for remote users.
2017-07-05 Tom CleggMerge branch '8784-dir-listings'
2017-06-30 Tom CleggMerge branch '11807-yaml-to-json'
2017-06-30 radhikaArvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhik...
2017-06-29 Lucas Di Pentima11789: Merge branch 'master' into 11789-arvput-exclude...
2017-06-29 Tom CleggMerge branch '2411-check-copyright'
2017-06-28 Tom Clegg2411: Add copyright notices to everything.
2017-05-03 radhikaMerge branch 'master' into 10112-workflow-show
2017-05-02 Tom Clegg11308: Merge branch 'master' into 11308-python3
2017-05-02 Lucas Di Pentima11185: Merge branch 'master' into 11185-wb-disable...
2017-05-02 Lucas Di Pentima11579: Merge branch 'master' into 11579-arvput-follow...
2017-05-01 Peter AmstutzMerge branch 'master' into origin-8019-crunchrun-log...
2017-04-28 Peter AmstutzMerge branch '11549-cwl-smarter-mounts' closes #11549
2017-04-27 Tom CleggMerge branch '7709-api-rails4'
2017-04-26 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4
2017-04-25 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4
2017-04-10 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4
2017-03-27 Tom Clegg7709: Upgrade to rails4, fix some of the compatibility...
2016-11-22 Lucas Di Pentima5737: Merge branch 'master' into 5737-ruby231
2016-10-21 Tom CleggMerge branch '10232-non-exclusive-keys' refs #10232
2016-10-21 Tom Clegg10008: Merge branch 'master' into 10008-flaky-token...
2016-10-21 Peter AmstutzMerge branch 'master' into 10194-cwl-version-skew
next