Merge branch '3463-make-sharing-dialog-with-users-more-useful' closes #3463
[arvados.git] / services / api / app / controllers / static_controller.rb
2014-05-14 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
2014-05-07 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
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 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-29 Tom CleggMerge branch '2640-folder-api' into 1970-folder-view
2014-04-29 Tom CleggMerge branch '0000-ruby-client-config'
2014-04-29 Tom CleggMerge branch 'master' into 1969-persistent-switch
2014-04-29 Tom CleggMerge branch '2640-folder-api' into 1970-folder-view
2014-04-29 Brett Smithapi: Introduce path-based API token scopes.
2014-04-28 Brett SmithMerge branch '1904-object-scopes'
2014-04-28 Brett Smithapi: Introduce path-based API token scopes.
2014-02-16 Tom CleggMerge branch 'master' into 2060-edit-tags-in-workbench
2014-02-12 Peter AmstutzMerge branch '2061-update-docs'
2014-02-11 Ward VandewegeMerge branch 'master' of git.curoverse.com:arvados
2014-02-11 Ward VandewegeHandle the situation where config.workbench_address...
2014-02-07 Peter AmstutzMerge branch 'master' into 1786-replace-jekyll-with...
2014-01-28 Peter AmstutzMerge branch 'master' into 1977-provenance-report
2014-01-25 Tom CleggEnsure we always respond with json (except the redirect...
2014-01-25 Tom CleggUpdate tests to match recent permission changes; dry...
2014-01-22 Peter AmstutzMerge remote-tracking branch 'origin' into 1786-replace...
2014-01-09 Peter AmstutzAdded redirect to config file.
2014-01-08 Tom CleggMerge branch '1792-workbench-performance'
2014-01-07 Peter AmstutzMerge branch '1685-api-server-redirect-to-workbench'
2014-01-02 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados...
2014-01-02 Peter AmstutzAdded redirect to config file.
2013-11-18 Tim PierceMerge branch '1579-keep-server-in-docker' of git.clinic...
2013-11-18 Tom CleggMerge branch '1600-native-keep-client'
2013-11-15 Ward VandewegeImprove error handling for login operations.
2013-09-24 Tom Cleggdo not munge hash keys in client-provided request....
2013-07-30 Tom Cleggadd auth scopes
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