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