15531: Implement merge with redirect_to_new_user=false
[arvados.git] / services / api / app / controllers / arvados / v1 / users_controller.rb
2015-02-11 Radhika ChippadaMerge branch 'master' into 4951-request-vm
2015-02-10 Tom Clegg4958: Merge branch 'master' into 4958-old-browser-alert
2015-02-10 Tom Clegg5037: Merge branch 'master' into 5037-nonocache
2015-02-10 Brett SmithMerge branch '5176-escape-filenames'
2015-02-09 Radhika ChippadaMerge branch '4523-full-text-search' into 5110-workbenc...
2015-02-09 Radhika ChippadaMerge branch 'master' into 4523-full-text-search
2015-02-09 Nancy Ouyangrefs #4926 #5072 Merge branch '4926-fix-imagesizes'
2015-02-09 Brett SmithMerge branch '4464-api-project-contents-wip'
2015-02-09 Brett Smith4464: API group contents no longer include manifests.
2015-02-06 Tom Clegg3021: Merge branch 'master' into 3021-leave-api-running
2015-02-05 Radhika ChippadaMerge branch 'master' into 4523-full-text-search
2015-02-05 Peter AmstutzMerge branch 'master' into 4823-python-sdk-writable...
2015-02-05 Tom CleggMerge branch '4472-save-partial-output' closes #4472
2015-02-05 Tom Clegg5011: Merge branch 'master' into 5011-arv-put-replication
2015-02-04 Radhika ChippadaMerge branch 'master' into 4951-request-vm
2015-02-04 Tom CleggMerge branch '2659-anonymous-share-projects' refs ...
2015-02-04 Radhika ChippadaMerge branch 'master' of git.curoverse.com:arvados...
2015-02-03 Tom Clegg2659: Fix crash in /users/current when not logged in.
2015-01-30 Peter AmstutzMerge branch 'master' into 4823-python-sdk-writable...
2015-01-29 Peter AmstutzMerge branch 'master' into 4904-arv-web
2015-01-26 Tim PierceMerge branch '5010-trash-button-for-collections'
2015-01-26 Phil HodgsonMerge branch 'master' into 4232-slow-pipes-n-jobs
2015-01-23 Nancy Ouyangrefs #4926 Merge branch '4926-getting-started'
2015-01-22 Tim PierceMerge branch '4889-crunch-deadlock'
2015-01-22 Ward VandewegeMerge branch 'master' into 0000-workbench-user-profile...
2015-01-22 Radhika ChippadaMerge branch 'master' into 4523-full-text-search
2015-01-21 Tom CleggMerge branch '3021-api-performance' refs #3021
2015-01-20 Tom Clegg3021: Merge branch 'master' into 3021-api-performance
2015-01-20 Tom Clegg3021: Replace more "render json:..." with faster Oj.
2015-01-16 Peter AmstutzAdd 'apps/arv-web/' from commit 'f9732ad8460d013c2f2836...
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 Peter AmstutzMerge branch '3136-stale-pipeline-instance-display...
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-25 Peter AmstutzMerge branch 'master' into 3036-collection-uuids
2014-08-25 radhikaMerge branch '3112-report-bug' into 3620-admin-only...
2014-08-25 radhikaMerge branch '3112-report-bug' into 3642-search-for...
2014-08-25 radhikaMerge branch 'master' into 3112-report-bug
2014-08-25 Tom CleggMerge branch '3171-group-membership' refs #3171
2014-08-25 Tom Clegg3171: Merge branch 'master' into 3171-group-membership
2014-08-22 Tom Clegg3171: Update tests to conform to new permission behavior.
2014-08-22 Tom Clegg3171: Do not follow permission graph through a User...
2014-08-20 Phil HodgsonMerge branch 'master' into 3354-render-textile
2014-08-19 Peter AmstutzMerge branch 'master' into 3036-collection-uuids
2014-08-18 Tom Clegg3114: Merge branch 'master' into 3114-copy-to-project
2014-08-16 Tom CleggMerge branch '2800-python-global-state' into 2800-pgs
2014-08-13 Tom Clegg3551: Merge branch 'master' into 3551-go-layout
2014-08-12 Tom CleggMerge branch '3531-sort-jobs-with-pipelines' closes...
2014-08-12 Peter AmstutzMerge branch '3373-improve-gatk3-snv-pipeline' closes...
2014-08-12 radhikaMerge branch 'master' into 3296-user-profile
2014-08-12 Tom CleggMerge branch '3178-discoverable-parameters' closes...
2014-08-11 Tom Clegg3178: Merge bogus _setup_requires_parameters into exist...
2014-08-10 Tom Clegg3178: Add missing jobs.create and users.setup parameter...
2014-08-08 radhika3296: use update method and remove unnecessary update_p...
2014-08-07 radhikaMerge branch 'master' into 3296-user-profile
2014-08-05 radhikaMerge branch 'master' into 3296-user-profile
2014-08-05 radhika3296: send notification email when the user first creat...
2014-08-05 radhikaMerge branch 'master' into 3296-user-profile
2014-08-05 radhikaMerge branch 'master' into 3296-user-profile
2014-08-05 radhika3296: manage profile page added
2014-07-16 Tom Clegg3220: Merge branch '3220-http-status-codes' closes...
2014-07-15 radhikaMerge branch 'master' into 3106-modal-loading-indicator
2014-07-15 Ward VandewegeMerge branch 'master' into 3219-further-docker-improvements
2014-07-15 radhikaMerge branch 'master' into 3140-project-content-tabs
2014-07-14 Brett SmithMerge branch '2044-api-users-index-wip'
2014-07-14 Brett Smith2044: Non-admins get all users' basic info from index...
2014-06-06 Peter AmstutzMerge branch 'master' into 2955-fail-orphan-jobs
2014-06-05 Tom Clegg2872: Merge branch 'master' into 2872-folder-nav
2014-06-04 radhikaMerge branch 'master' into 2919-provenance-graph-cutoff
2014-06-04 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2882...
2014-06-04 Peter AmstutzMerge branch 'origin-2939-re-run-job-button' into 2882...
2014-06-04 radhikaMerge branch 'master' into 2871-preload-objects
2014-06-04 radhikaMerge branch 'master' into 2895-no-more-redis
2014-06-03 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-06-03 radhikaMerge branch 'master' into 2895-no-more-redis
2014-06-03 radhikaMerge branch 'master' into 2871-preload-objects
2014-06-02 Brett Smith2893: API server accepts all serialized parameters...
2014-05-30 radhikaMerge branch 'master' into 2895-no-more-redis
2014-05-30 radhikaMerge branch 'master' into 2895-no-more-redis
2014-05-30 radhika2895: remove users.event_stream api
2014-05-14 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
2014-04-30 Tim PierceMerge branch '2620-keep-serialize-io' (closes #2620)
2014-04-29 Tom CleggMerge branch '0000-ruby-client-config'
2014-04-23 Tom CleggMerge branch 'master' into 2505-update-docs
2014-04-23 Tom CleggMerge branch 'master' of git.curoverse.com:arvados...
2014-04-23 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-04-23 radhika chippadaMerge branch 'master' into 2352-phased-pipeline-instanc...
2014-04-23 Peter AmstutzMerge branch 'master' into origin-2608-websocket-event...
2014-04-23 Peter AmstutzSecurity bug fix to act_as_system_user to restore corre...
2014-04-23 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-04-17 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-04-17 Tom CleggMerge branch '2596-refactor-pipeline-create'
2014-04-17 Tom CleggMerge branch 'master' into 2596-refactor-pipeline-create
2014-04-16 Peter AmstutzMerge branch '2376-show-collection-tags-everywhere'
2014-04-16 Peter AmstutzMerge branch '2488-jobs-pipeline-doc'
2014-04-15 Tim PierceMerge branch 'master' into 2449-keep-index-status-handlers
2014-04-15 Tom CleggMerge branch 'master' into 2596-refactor-pipeline-create
2014-04-15 Peter AmstutzMerge branch '2376-show-collection-tags-everywhere...
next