Merge remote-tracking branch 'origin/master' into 4084-log-pane-refresh
[arvados.git] / services / api / app / controllers / user_sessions_controller.rb
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...
2013-12-31 Peter AmstutzMerge branch '1692-redesign-dashboard'
2013-12-31 Tim PierceMerge branch 'master' of git.clinicalfuture.com:arvados
2013-12-31 Tom CleggMerge branch '1675-preactivation'
2013-12-31 Tom CleggAllow authentication from multiple OpenIDs using permis...
2013-12-10 Tom CleggMerge branch 'master' into 1646-arv-put
2013-12-09 Tim PierceMerge branch '1587-fix-test-suites-in-devsandbox'
2013-12-05 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados...
2013-12-03 Tom CleggFix PermissionDeniedError when a non-admin user is...
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-06-26 Tom Cleggadd user#is_active flag
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