Merge branch 'pr/25'
[arvados.git] / services / api / app / controllers / user_sessions_controller.rb
2015-09-04 Joshua C. RandallMerge pull request #2 from wtsi-hgi/feature/arv-view
2015-07-31 Tom CleggMerge branch 'git-commit-debug' of https://github.com...
2015-07-31 Tom CleggMerge branch 'crunch-dispatch-docker-bin-env' of https...
2015-07-22 Peter AmstutzMerge branch '6264-cwl-runner' closes #6264
2015-07-14 Peter AmstutzMerge branch 'master' into github-3408-production-datam...
2015-07-14 radhikaMerge branch 'master' into 6219-fuse-performance-testing
2015-07-13 ManojMerge branch 'master' into 6465-optimize-workbench...
2015-07-10 Tom CleggMerge branch '6222-memory-status' refs #6222
2015-07-09 radhikaMerge branch 'master' into 6279-web-shell-client
2015-07-08 Tom CleggMerge branch '6377-dev-startup' refs #6377
2015-07-08 Tom Clegg6377: Support loading omniauth config from application...
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-26 Phil HodgsonMerge branch 'master' into 4232-slow-pipes-n-jobs
2015-01-16 Peter AmstutzAdd 'apps/arv-web/' from commit 'f9732ad8460d013c2f2836...
2015-01-16 Peter AmstutzMerge branch 'master' into origin-4823-python-sdk-writa...
2015-01-13 Ward VandewegeMerge branch 'master' into 0000-workbench-user-profile...
2015-01-07 Radhika ChippadaMerge branch 'master' into 4523-search-index
2015-01-07 Tom Clegg3021: Merge branch 'master' into 3021-more-phantomjs
2015-01-07 Tim PierceMerge branch '4598-crunch-failure-stats'
2015-01-06 Peter AmstutzMerge branch '4570-multi-auth-method' refs #4570
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: Add tests for CORS headers. Turn off CORS headers...
2014-11-26 Tom Clegg3781: Set CORS headers in API responses.
2014-11-21 Peter Amstutz4570: Rename 'auth_method' parameter to 'auth_provider...
2014-11-20 Peter Amstutz4570: Workbench/API server support for multiple authent...
2014-08-27 Tom Clegg3354: Merge branch 'master' into 3354-render-textile
2014-08-26 Tom CleggMerge branch '3627-selectable-projects' closes #3627
2014-08-26 Tom Clegg3149: Merge branch 'master' into 3149-server-side-search
2014-08-26 Tom CleggMerge branch '3149-filter-any' refs #3149
2014-08-26 Tom CleggMerge branch '3660-project-editable' closes #3660
2014-08-26 Tom CleggMerge branch '3171-admin-groups' closes #3171
2014-08-25 Peter AmstutzMerge branch 'master' into 3036-collection-uuids
2014-08-25 Tom Clegg3171: Merge branch 'master' into 3171-group-membership
2014-08-25 Tim PierceMerge branch '3448-keep-put-timestamps'
2014-08-25 Tom CleggMerge branch 'multiple-dispatch' no issue #
2014-08-24 radhikaMerge branch 'master' into 3112-report-bug
2014-08-24 radhikacloses #3153
2014-08-24 radhikaMerge branch 'master' into 3153-auto-setup-user
2014-08-23 radhikaMerge branch 'master' into 3153-auto-setup-user
2014-08-23 radhikaMerge branch '3153-auto-setup-tests' into 3153-auto...
2014-08-23 Tom Clegg3153: Add integration tests.
2014-07-21 Tim PierceMerge branch '3072-empty-collection-bugfix'
2014-07-21 radhikaMerge branch 'master' into 3140-project-content-tabs
2014-07-21 Tom Clegg3170: Merge branch 'master' into 3170-refresh-tab-pane
2014-07-21 radhikaMerge branch 'master' into 3138-wiselinks
2014-07-19 Ward VandewegeMerge branch 'master' into 3219-further-docker-improvements
2014-07-19 Tom CleggMerge branch '3214-permission-to-use-owner-uuid'
2014-07-19 Tom Clegg3214: Merge branch 'master' into 3214-permission-to...
2014-07-18 Tom Clegg3214: Ensure current_user has write permission on the...
2014-05-29 Ward VandewegeMerge branch 'master' into 2681-new-inactive-user-notif...
2014-05-22 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2044...
2014-05-15 Tom Clegg2809: Merge branch 'master' refs #2809
2014-05-14 Tim PierceMerge branch '2328-keep-permission-flags' (closes ...
2014-05-14 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
2014-05-07 radhikaMerge branch 'master' into 2352-use-state
2014-05-07 Peter AmstutzMerge branch '2035-arv-mount-tags-folders' into origin...
2014-05-07 Tom CleggMerge branch '2744-update-dev-docs'
2014-05-07 Peter AmstutzMerge branch 'master' into origin-2035-arv-mount-tags...
2014-05-07 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-05-07 radhikaMerge branch 'master' into 2525-java-sdk
2014-05-07 Tom CleggFix crash creating new user during initial login. Add...
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-04-16 Peter AmstutzMerge branch '2376-show-collection-tags-everywhere'
2014-04-16 Peter AmstutzMerge branch '2488-jobs-pipeline-doc'
2014-04-15 Tom CleggMerge branch 'master' into 2596-refactor-pipeline-create
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-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 AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-11 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-11 Peter AmstutzMerged master
2014-03-25 Peter AmstutzRemoved internal uses of _kind column in API server...
2014-03-14 Tom CleggMerge branch '2257-inequality-conditions' into 2290...
2014-03-14 Tom CleggMerge branch 'master' into 2257-inequality-conditions
2014-03-13 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-12 Peter AmstutzAdds scopes: ["all"] when creating a new api client...
2014-02-21 Peter AmstutzMerge branch '1965-fuse-support-directories'
2014-02-16 Tom CleggMerge branch 'master' into 2060-edit-tags-in-workbench
2014-02-16 Tom CleggMerge branch 'master' into 2179-demo-feedback
2014-02-16 Tom CleggFix symbol key used in serialized attribute. closes...
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 CleggUpdate tests to match recent permission changes; dry...
next