Merge branch '13647-load-old-config'
[arvados.git] / services / api / app / controllers / static_controller.rb
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-23 Lucas Di PentimaMerge branch 'rails5-schema-env-data'
2019-04-22 Peter AmstutzMerge branch '15119-api-config-fixes'
2019-04-22 Peter Amstutz15119: Fixes for Workbench1.ExternalURL and Controller...
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: Fix discovery document remoteHosts
2019-04-08 Peter Amstutz13996: More config migrations, refactor some code into...
2019-04-08 Peter Amstutz13996: Migrate majority of defaults to config.defaults.yml
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 integration tests.
2019-03-22 Lucas Di Pentima14873: Replaces *_filter with *_action
2019-03-14 Peter AmstutzAdd 'sdk/java-v2/' from commit '55f103e336ca9fb8bf1720d...
2018-09-05 Peter AmstutzMerge branch 'wtsi/13809-root_url-protocol-port-configu...
2018-09-05 Peter AmstutzMerge branch 'wtsi/python-api-timeout' refs #13542
2018-08-24 Peter AmstutzMerge branch 'master' into 14075-uploadfiles
2018-08-09 Tom Clegg13558: Merge branch 'master' into wtsi-hgi-13558-debug...
2018-07-23 Peter AmstutzMerge branch '13546-crunch1-timeout' refs #13546
2018-07-20 Peter AmstutzMerge branch '13879-arvados-server' closes #13879
2018-07-20 Lucas Di PentimaMerge branch '13851-wb-multisite-search'
2018-07-20 Tom CleggMerge branch '13493-federation-proxy'
2018-07-20 Tom Clegg13493: Merge branch 'master' into 13493-federation...
2018-07-16 Tom Clegg13493: Merge branch 'master' into 13493-federation...
2018-07-10 Tom Clegg13493: Test OPTIONS method.
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.
2016-03-11 Tom CleggAdd 'build/' from commit '555b039609a3c8700c27767c255fd...
2016-03-01 Peter AmstutzAdd 'tools/arvbox/' from commit 'd3d368758db1f4a9fa5b89...
2015-03-23 Joshua C. RandallMerge pull request #1 from curoverse/master
2015-02-13 mishazMerge branch 'master' of git.curoverse.com:arvados...
2015-01-16 Peter AmstutzAdd 'apps/arv-web/' from commit 'f9732ad8460d013c2f2836...
2015-01-06 Peter AmstutzMerge branch 'master' into 4570-multi-auth-method
2014-12-02 Tim PierceMerge branch '4621-crunch-memory-usage'
2014-12-02 radhikaMerge branch 'master' into 4487-and-4558
2014-12-01 Tom CleggMerge branch '3781-browser-friendly-servers' refs ...
2014-11-26 Tom Clegg3781: Merge branch 'master' into 3781-browser-friendly...
2014-11-26 Tom Clegg3781: Set CORS headers in API responses.
2014-10-06 Peter AmstutzMerge branch 'master' into origin-3381-job-progress...
2014-10-03 mishazMerge branch 'master' of git.curoverse.com:arvados...
2014-10-01 Tim PierceMerge branch 'master' into 3782-large-job-logs
2014-10-01 Tim PierceMerge branch 'master' into 3699-arv-copy
2014-09-30 Phil HodgsonMerge branch 'master' into 3634-tab-state
2014-09-26 Peter AmstutzMerge branch '3871-non-ascii-project-names' closes...
2014-09-26 Tim PierceMerge branch 'master' into 3901-component-rendering...
2014-09-26 radhikaMerge branch 'master' into 3836-remove-collection-from...
2014-09-26 radhikaMerge branch 'master' into 3889-functional-testing
2014-09-26 Peter AmstutzMerge branch 'master' into 3859-api-job-lock-method
2014-09-26 Peter AmstutzMerge branch '3168-crunch-git-fetch' closes #3168
2014-09-26 Peter AmstutzMerge remote-tracking branch 'origin/master' into 3899...
2014-09-26 Tom CleggMerge branch '3991-docker-workbench-address' closes...
2014-09-26 Tom Clegg3991: Merge branch 'master' into 3991-docker-workbench...
2014-09-25 Tom Clegg3991: Change docker default to "no root url redirect...
2014-09-25 Tom Clegg3991: Handle "no workbench_address configured" more...
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