Merge branch 'master' into 2767-doc-updates
[arvados.git] / services / api / app / models / api_client_authorization.rb
2014-05-22 radhikaMerge branch 'master' into 2767-doc-updates
2014-05-21 Tim PierceMerge branch 'master' of git.curoverse.com:arvados
2014-05-21 Brett SmithMerge branch '2764-wget-collections'
2014-05-21 Peter Amstutz2764: Fixed scopes_allow_request to use request.request...
2014-05-14 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
2014-05-07 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-05-01 Tom CleggMerge branch '2640-folder-api' into 1970-folder-view
2014-05-01 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2035...
2014-05-01 Tom CleggMerge branch 'master' into 2640-folder-api
2014-05-01 radhikaMerge branch 'master' into 2525-java-sdk
2014-04-30 Peter AmstutzMerge branch 'origin-2608-websocket-event-bus-alt2'
2014-04-30 Tim PierceMerge branch '2620-keep-serialize-io' (closes #2620)
2014-04-30 Brett SmithMerge branch '1904-api-reader-tokens'
2014-04-30 Brett Smithapi: Introduce reader_tokens for extra access.
2014-04-15 Peter AmstutzMerge branch 'master' into 1971-show-image-thumbnails
2014-04-14 radhika chippadaMerge branch 'master' into 1776-setup-user-email
2014-04-11 Tim PierceMerge branch 'master' into 2449-keep-index-status-handlers
2014-04-11 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-11 Tim PierceMerge branch 'master' into 2449-keep-flags
2014-04-11 Tim PierceMerge branch 'master' into 2449-keep-write-blocks
2014-04-11 Brett SmithMerge branch '2375-log-table' into master
2014-04-11 Brett Smithapi: Don't include API tokens in logs.
2014-04-10 Brett Smithapi: Don't log common changes to API tokens.
2013-11-12 Tim PierceMerge branch '1578-api-server-in-docker'
2013-11-07 Tom CleggUse current_user to select API response template. fixes...
2013-07-30 Tom Cleggadd auth scopes
2013-07-08 Ward VandewegeMerge branch 'master' of git.clinicalfuture.com:arvados
2013-07-08 Tom Cleggrename foreign uuid attributes
2013-06-26 Tom Cleggadd user#is_active flag
2013-06-17 Tom Cleggadd ApiClient#is_trusted, show list of api tokens in...
2013-04-10 Ward VandewegeMerge branch 'explorer'
2013-04-10 Ward VandewegeMerge branch 'clients'
2013-04-10 Ward Vandewegemoved api server code into new directory structure