Merge branch 'master' into 3634-tab-state
[arvados.git] / services / api / config / initializers /
2014-05-29 Ward VandewegeMerge branch 'master' into 2681-new-inactive-user-notif...
2014-05-27 radhikaMerge branch 'master' into 2525-java-sdk
2014-05-23 Peter AmstutzMerge branch '2798-go-keep-client' into 1885-keep-proxy...
2014-05-23 Tom Clegg2754: Merge branch '2754-easy-run-pipeline' refs #2754
2014-05-22 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2044...
2014-05-22 radhikaMerge branch 'master' into 2767-doc-updates
2014-05-21 Peter AmstutzMerge branch '2798-go-keep-client' into 1885-keep-proxy
2014-05-21 Peter AmstutzMerge branch 'master' into 2798-go-keep-client
2014-05-21 Tim PierceMerge branch 'master' of git.curoverse.com:arvados
2014-05-21 Tim PierceMerge branch '2755-api-collection-permissions'
2014-05-21 Peter AmstutzMerge branch 'master' into 2751-python-sdk-keep-proxy...
2014-05-21 Peter AmstutzMerge branch 'master' into 2776-keep-services-table
2014-05-21 radhikaMerge branch 'master' into 2756-eventbus-in-workbench
2014-05-21 Tom CleggRemove obsolete secret_token.rb.
2014-05-15 radhikaMerge branch 'master' into 2756-eventbus-in-workbench
2014-05-15 Tom Clegg2809: Merge branch 'master' into 2809-workbench-rails4...
2014-05-15 Tom Clegg2809: Merge branch 'master' refs #2809
2014-05-14 Tom CleggMerge branch '2762-owner-uuid-integrity'
2014-05-14 Tom Clegg2762: Merge branch 'master' into 2762-owner-uuid-integrity
2014-05-14 Tim PierceMerge branch '2328-keep-permission-flags' (closes ...
2014-05-14 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
2014-05-13 Peter Amstutz2798: Merged branch with code to read environment varia...
2014-05-11 Tom CleggMerge branch 'master' into 2762-owner-uuid-integrity
2014-05-11 Tom Clegg2762: Rename assign_uuid to has_uuid to reflect expande...
2014-05-09 radhikaMerge branch 'master' into 2767-doc-updates
2014-05-09 Tom CleggFix python SDK test suite issues.
2014-05-07 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-05-03 radhikaMerge branch 'master' into 2525-java-sdk
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 Peter AmstutzFixed middleware customization so that it doesn't assum...
2014-05-01 radhikaMerge branch 'master' into 2525-java-sdk
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 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-30 Peter AmstutzMoved message handling out to a separate method for...
2014-04-30 Peter AmstutzNow supports both websocket integrated (ARVADOS_WEBSOCK...
2014-04-25 Peter AmstutzMerge branch 'master' into origin-2608-websocket-event...
2014-04-25 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-24 Peter AmstutzAdded test runner for websocket tests. Requires passen...
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-22 Peter AmstutzAdded websocketUrl to discovery document. Workbench...
2014-04-22 Peter AmstutzMoves API token authentication from ApplicationControll...
2014-04-22 Peter AmstutzMoved application-specific code out from rack_socket...
2014-04-21 Peter AmstutzProof of concept echo server based on rack middleware...
2014-04-15 Peter AmstutzMerge branch 'master' into 1971-show-image-thumbnails
2014-03-14 Tom CleggMerge branch '2257-inequality-conditions' into 2290...
2014-03-14 Tom CleggMerge branch 'master' into 2257-inequality-conditions
2014-03-14 radhika chippadaMerge branch 'master' into 2187-enhance-user-setup
2014-03-13 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-13 Peter AmstutzWorking on improving install documentation.
2014-03-12 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-12 Ward VandewegeURL change for the auth server.
2014-03-11 Peter AmstutzMerge branch '2107-update-documentation'
2014-03-11 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-10 Peter AmstutzMerge branch '2042-new-collection-from-selected-files'
2014-03-10 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-03-10 Tom CleggRename preload_all_models to zz_* so it runs after...
2014-03-10 Tom CleggRename load_config to zz_load_config so initializers...
2014-03-10 Tom CleggMerge branch '2076-check-config-at-boot'
2014-03-10 Tom CleggMerge branch 'master' into 2189-log-in-as-user
2014-03-10 Tom CleggRename config[.defaults].yml to application[.default...
2014-03-10 Tom CleggMerge branch 'master' into 2076-check-config-at-boot
2014-03-05 Tom CleggAdd "rake config:check" task. refs #2076
2014-03-05 Tom CleggRead configuration from config.defaults.yml and config...
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-11-14 Tom Cleggdelete cached discovery document during boot, so doc...
2013-11-12 Tim PierceMerge branch '1578-api-server-in-docker'
2013-11-07 Tom CleggPreload all models at startup. Otherwise, in non-produc...
2013-06-27 Tom Cleggadd Human resource
2013-05-10 Tom Cleggaccept authorization token in Authorization request...
2013-04-15 Tom Cleggrename projects
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