5737: Merge branch 'master' into 5737-ruby231
[arvados.git] / services / api / app / models / user.rb
2016-11-22 Lucas Di Pentima5737: Merge branch 'master' into 5737-ruby231
2016-10-21 Tom CleggMerge branch '10232-non-exclusive-keys' refs #10232
2016-10-21 Tom Clegg10008: Merge branch 'master' into 10008-flaky-token...
2016-10-21 Peter AmstutzMerge branch 'master' into 10194-cwl-version-skew
2016-10-21 Tom CleggMerge branch 'crunch-job_finds_newer_docker_hashes...
2016-10-21 Peter AmstutzMerge branch '10025-arvbox-layers' closes #10025
2016-10-20 Peter AmstutzMerge branch 'master' into 10172-crunch2-container...
2016-10-20 Tom CleggMerge branch '10287-sso-username' refs #10287
2016-10-20 Tom Clegg10287: Perform blacklist and duplicate checks on userna...
2016-10-12 Tom Clegg5737: Fix some ruby warnings
2016-10-03 Lucas Di Pentima9701: Merge branch '9463-change-arvput-use-collection...
2016-06-29 Tom CleggMerge branch '9518-username-conflict'
2016-06-29 Tom Clegg9518: Fix username conflict resolution.
2016-06-08 radhikaMerge branch 'master' into wtsi-hgi-8087-arv-cli-reques...
2016-05-11 Peter AmstutzMerge branch '8886-async-permission-update' refs #8886
2016-05-11 Peter Amstutz8886: Restore behavior in group_permissions to call
2016-05-09 Peter Amstutz8886: Add timestamp checking to permission updates.
2016-05-04 Peter Amstutz8886: Experimental asynchronous permissions update.
2016-03-11 Tom CleggAdd 'build/' from commit '555b039609a3c8700c27767c255fd...
2016-03-01 Peter AmstutzAdd 'tools/arvbox/' from commit 'd3d368758db1f4a9fa5b89...
2015-09-04 Joshua C. RandallMerge pull request #2 from wtsi-hgi/feature/arv-view
2015-05-19 mishazMerge branch 'master' into 3408-production-datamanager
2015-05-11 Peter AmstutzMerge branch '3198-inode-cache' refs #3198
2015-05-07 Peter AmstutzMerge branch '3198-inode-cache' into 3198-writable...
2015-04-21 Peter AmstutzMerge branch 'master' into 3198-writable-fuse
2015-04-16 Radhika ChippadaMerge branch 'master' into 5417-not-start-pipeline...
2015-04-16 Brett Smith5742: User setup process uses username for VM login...
2015-04-08 Radhika ChippadaMerge branch 'master' into 5493-getting-started-modal
2015-04-01 Peter AmstutzMerge branch '5626-git-server-hostname' into 4752-docke...
2015-04-01 Radhika ChippadaMerge branch 'master' into 5420-collection-checkbox...
2015-04-01 Brett SmithMerge branch '4253-user-repos-wip'
2015-04-01 Brett Smith4253: Users can manage their own repositories.
2015-03-31 Peter AmstutzMerge branch '5539-better-docker' closes #5539
2015-03-30 Tom Clegg5416: Merge branch 'master' into 5416-arv-git-httpd
2015-03-25 Radhika ChippadaMerge branch 'master' into 5556-collection-show-timeout
2015-03-25 Radhika ChippadaMerge branch 'master' into 5247-anonymous-doc
2015-03-25 Radhika ChippadaMerge branch 'master' into 5534-limit-log-lines
2015-03-25 Radhika ChippadaMerge branch 'master' into 3762-delete-list-worker
2015-03-25 Radhika ChippadaMerge branch 'master' into 5420-collection-checkbox...
2015-03-25 Brett SmithMerge branch '4253-user-usernames-wip'
2015-03-25 Brett Smith4253: Use new username to set up repository and VM...
2015-03-25 Brett Smith4253: Clean up some user setup methods.
2015-03-25 Brett Smith4253: Add a username attribute to users.
2015-03-23 Joshua C. RandallMerge pull request #1 from curoverse/master
2015-02-21 Phil HodgsonMerge branch 'master' into 4232-slow-pipes-n-jobs
2015-02-13 Tom CleggMerge branch 'master' into 3408-production-datamanager
2015-02-13 mishazMerge branch 'master' of git.curoverse.com:arvados...
2015-02-13 Tom CleggMerge branch 'master' of git.curoverse.com:arvados...
2015-02-11 Peter AmstutzMerge branch 'master' into 4904-arv-web
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 '2659-anonymous-share-projects' of git...
2015-02-04 Tom Clegg2659: Fix infinite recursion while creating system_user.
2015-01-16 Peter AmstutzAdd 'apps/arv-web/' from commit 'f9732ad8460d013c2f2836...
2015-01-06 Peter AmstutzMerge branch 'master' into 4570-multi-auth-method
2014-11-25 Phil HodgsonMerge branch 'master' into 4233-graph-job-stats
2014-11-21 Tom Clegg4533: Merge branch 'master' into 4533-remote-reset
2014-11-20 Tom CleggMerge branch '4400-python-install-herring' refs #4400
2014-11-20 radhikaMerge branch 'master' into 4156-cli-tests
2014-11-20 Tom CleggFix syntax error in whitespace. refs #3824
2014-11-20 radhikaMerge branch 'master' into 4592-input-selection
2014-11-20 radhikaMerge branch 'master' into 4592-input-selection
2014-11-20 radhikaMerge branch 'master' into 4156-cli-tests
2014-11-20 Tom CleggMerge branch '3824-docker-fixes' refs #3824 refs #4186
2014-11-20 Tom Clegg3824: Merge branch 'master' into 3824-docker-fixes
2014-11-17 Tom Clegg3824: Create "all users" group in seeds.rb instead...
2014-11-12 Peter AmstutzMerge branch 'master' into 3400-workbench-all-items
2014-11-11 Tim PierceMerge branch '3857-python-sdk-timeouts'
2014-11-07 Peter AmstutzMerge branch '4084-log-pane-refresh' closes #4084
2014-11-07 Tom Clegg4434: Merge branch 'master' into 4434-collation
2014-11-07 radhikaMerge branch 'master' into 3177-collection-choose-files
2014-11-06 Tim PierceMerge branch '4088-collection-show-files-filter'
2014-11-06 Peter AmstutzMerge branch '4310-git-tag-race' closes #4310
2014-11-06 Ward VandewegeMerge branch '4383-easy-install'
2014-11-06 Ward VandewegeMerge branch 'master' into 4383-easy-install
2014-11-06 Ward VandewegeMerge branch 'master' into 4383-easy-install
2014-11-06 Ward VandewegeUpdate the behavior of the auto_admin_user configuratio...
2014-11-05 Peter AmstutzMerge branch 'origin-3609-arv-run' into master closes...
2014-11-05 Tom Clegg4389: Merge branch 'master' into 4389-breadcrumbs-infin...
2014-11-05 Ward VandewegeMerge branch 'master' into 4383-easy-install
2014-11-05 Tom Clegg4084: Merge branch 'master' into 4084-log-pane-refresh-TC
2014-11-04 Phil HodgsonMerge branch 'master' into 3618-column-ordering
2014-11-03 Ward VandewegeWhen auto_admin_first_user is set to true (default...
2014-11-03 Tom Clegg3706: Merge branch 'master' into 3706-keep-warning
2014-11-03 Peter AmstutzMerge remote-tracking branch 'origin/master' into 4031...
2014-11-03 Ward Vandewegesystem_user and anonymous_user should be excluded from
2014-11-03 Ward Vandewegesystem_user and anonymous_user should be excluded from
2014-10-24 Tim PierceMerge branch '3699-arv-copy'
2014-10-24 Tim PierceMerge branch '3699-arv-copy'
2014-10-24 Phil HodgsonMerge branch 'master' into 3618-column-ordering
2014-10-20 Peter AmstutzMerge branch '3787-docker-docs' closes #3787
2014-10-20 Tom Clegg3826: Merge branch 'master' into 3826-crunchstat-netstats
2014-10-17 Tom CleggMerge branch '4229-close-files' closes #4229
2014-10-17 radhikaMerge branch 'master' into 4062-infinite-scroll-repeat...
2014-10-16 Brett SmithMerge branch '4189-workbench-project-admin-attr-editing...
next