Merge branch 'master' into 2640-folder-api
[arvados.git] / services / api / app / controllers / application_controller.rb
2014-05-01 Tom CleggMerge branch 'master' into 2640-folder-api
2014-04-30 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
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 Tom CleggMerge branch 'master' into 2640-folder-api
2014-04-30 Brett SmithMerge branch '1904-api-reader-tokens'
2014-04-30 Brett Smithapi: Accept JSON-formatted reader token array.
2014-04-30 Brett Smithapi: Introduce reader_tokens for extra access.
2014-04-30 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-29 Tom CleggRename owned_items to contents, remove user method...
2014-04-29 Brett Smithapi: Make JSON the default response format.
2014-04-29 Tom CleggMerge branch '0000-ruby-client-config'
2014-04-29 Tom CleggMerge branch '1969-persistent-switch'
2014-04-29 Tom CleggMerge branch 'master' into 1969-persistent-switch
2014-04-29 Tom CleggSkip UserAgreement in owned_items. They are just collec...
2014-04-28 Tom CleggConvert joins to subqueries to fix duplicates in owned_...
2014-04-28 Brett SmithMerge branch '1904-object-scopes'
2014-04-28 Brett Smithapi: Support filters in API client auths index.
2014-04-28 Brett Smithapi: Introduce path-based API token scopes.
2014-04-28 Tom CleggUse name links instead of permission links to include...
2014-04-25 Tom CleggMerge branch 'master' into 1969-persistent-switch
2014-04-25 Peter AmstutzMerge branch 'master' into origin-2608-websocket-event...
2014-04-25 Peter AmstutzBugfix. Objects returned by owned_items are now sorted...
2014-04-25 Peter AmstutzResolving application_controller.rb merge conflicts...
2014-04-25 Tom CleggMerge branch 'master' into 1969-persistent-switch
2014-04-25 Tom CleggMerge branch '2505-update-docs'
2014-04-25 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-25 Tom CleggMerge branch '2640-folder-api'
2014-04-24 Tom CleggAdd persistent/cache switch to collections index page.
2014-04-24 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-04-24 Tom CleggMerge branch '2409-remove-unused-controllers'
2014-04-24 Tom CleggCheck sanity when applying filters, and provide useful...
2014-04-23 Tom CleggMerge branch 'master' of git.curoverse.com:arvados...
2014-04-23 Tom CleggSupport filters=[["attr","=",nil]]
2014-04-23 Tom CleggAdd tests, rename include_indirect to _linked, improve...
2014-04-23 Peter AmstutzMerge branch 'master' into origin-2608-websocket-event...
2014-04-23 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-23 Peter Amstutz- Added object_owner_uuid to logs table, which records...
2014-04-22 Peter AmstutzRefactored load_filters_param and apply_where_limit_ord...
2014-04-22 Peter AmstutzMoves API token authentication from ApplicationControll...
2014-04-22 Tom CleggRename include_managed to include_indirect.
2014-04-22 Tom CleggSupport limit and offset params in owned_items.
2014-04-21 Tom CleggAdd owned_items action for groups and users.
2014-04-16 Peter AmstutzMerge branch '2376-show-collection-tags-everywhere'
2014-04-16 Peter AmstutzMerge branch '2488-jobs-pipeline-doc'
2014-04-15 Tim PierceMerge branch 'master' into 2449-keep-index-status-handlers
2014-04-15 Tom CleggMerge branch 'master' into 2596-refactor-pipeline-create
2014-04-15 Tom CleggFix exception when valid token points to missing user
2014-04-15 Peter AmstutzMerge branch '2376-show-collection-tags-everywhere...
2014-04-15 Peter AmstutzMerge branch 'master' into 1971-show-image-thumbnails
2014-04-15 Tom CleggMerge branch '2388-bogus-token-error-page'
2014-04-15 radhika chippadaMerge branch 'master' into 1776-setup-user-email
2014-04-14 radhika chippadaMerge branch 'master' into 1776-setup-user-email
2014-04-14 Tim PierceMerge branch '2449-keep-write-blocks' into 2449-keep...
2014-04-14 Tim PierceMerge branch 'master' into 2449-keep-write-blocks
2014-04-14 Peter AmstutzReverted accidental change to Gemfile.
2014-04-14 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-14 Peter Amstutz* Refactored to remove load_kind_params filter and...
2014-04-13 Tom CleggFix exception when valid token points to missing user
2014-04-11 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-11 Peter AmstutzAPI server tests pass, workbench tests are failing
2014-04-11 Peter AmstutzMerged master
2014-04-09 radhika chippadaMerge branch 'master' into 1776-setup-user-email
2014-04-09 radhika chippadaStory 1776: Add theme to api server similar to workbenc...
2014-04-04 Tim PierceMerge branch 'master' into 2449-keep-write-blocks
2014-04-03 Tim PierceMerge branch '2221-complete-docker' (closes #2325,...
2014-04-03 Ward VandewegeMerge branch '2509-rake-linkchecker'
2014-04-02 Tom CleggMerge branch '2209-correct-items-available'
2014-04-02 Tom CleggMerge branch 'master' into 2209-correct-items-available
2014-04-02 Brett SmithMerge branch '2470-doc-refresh'.
2014-04-02 Tom CleggMerge branch '2447-fix-workbench-search'
2014-04-02 Tom CleggFix searching on tables with no "name" column. Take...
2014-04-01 Tom CleggCount distinct records for items_available, not rows...
2014-03-28 Tim PierceMerge branch '2291-new-keepd-read-blocks'
2014-03-28 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-27 Peter AmstutzMerge branch 'master' into 2333-crunch-dispatch-token...
2014-03-26 Tim PierceMerge branch '2291-new-keepd-read-blocks' (fixes #2291)
2014-03-26 Peter AmstutzMerge branch 'master' into 2051-nondeterministic-jobs
2014-03-25 Brett SmithMerge branch '2288-smoke-test'
2014-03-25 Peter AmstutzRemoved internal uses of _kind column in API server...
2014-03-25 Tom CleggMerge branch '1750-remove-old-schema-doc'
2014-03-25 Peter AmstutzAdded 'is_a' filter and tests, refs #2418 #2228
2014-03-25 Peter AmstutzAll tests pass!
2014-03-24 Peter AmstutzArvados model now validates that all "foreign_key_attri...
2014-03-24 Tom CleggMerge branch '2290-user-activity'
2014-03-24 radhika chippadaMerge branch 'master' into 2187-enhance-user-setup
2014-03-24 Tom CleggAccept ...&filters=&... in query string as "none" inste...
2014-03-21 Tom CleggMerge branch 'master' into 2316-no-clear-tmp-flag
2014-03-21 Brett SmithMerge branch '2288-integration-tests'
2014-03-20 Peter AmstutzMerge branch '2193-fix-permissions-cache' (no functiona...
2014-03-20 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2051...
2014-03-20 Peter AmstutzMerge branch '2278-crunch-dispatcher-monitor-processes'
2014-03-20 radhika chippadaMerge branch 'master' into 2187-enhance-user-setup
2014-03-16 radhika chippadaMerge branch 'master' into 2187-enhance-user-setup
2014-03-14 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2075...
2014-03-14 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-14 Tom CleggMerge branch '2257-inequality-conditions'
2014-03-14 Tom CleggMerge branch '2257-inequality-conditions' into 2290...
2014-03-14 Tom CleggMake integer attributes searchable, add test cases.
2014-03-14 Tom CleggMerge branch 'master' into 2257-inequality-conditions
next