Merge branch 'master' into 3036-collection-uuids
[arvados.git] / services / api / app / models / collection.rb
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-17 Peter Amstutz3036: API server tests pass
2014-08-16 Tom CleggMerge branch '2800-python-global-state' into 2800-pgs
2014-08-16 Peter Amstutz3036: Remove include_linked from project contents metho...
2014-08-15 Peter Amstutz3036: Test fixing work in progress.
2014-08-15 Peter Amstutz3036: Adding pre-validation callback to set the portabl...
2014-08-14 Peter Amstutz3036: Split out logic to determine if a user is actuall...
2014-08-14 Peter Amstutz3036: Removed special case uuid_like_pattern. Removed...
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 Tom CleggMerge branch '3178-discoverable-parameters' closes...
2014-08-12 Tom CleggMerge branch '3570-crunch-race' closes #3570
2014-08-12 Brett SmithMerge branch '3412-full-collections-index'
2014-08-12 radhikaMerge branch 'master' into 3296-user-profile
2014-08-12 Brett Smith3412: Make manifest_text selectable from Collections...
2014-08-12 Brett Smith3412: Make non-database fields selectable from API...
2014-08-11 Peter Amstutz3036: Work on migration code for 'name' and 'can_read...
2014-08-11 Peter AmstutzMerge branch '3254-run-job-locally-docs' closes #3254...
2014-08-11 Phil HodgsonMerge branch 'master' into 3114-copy-to-project
2014-08-08 radhikaMerge branch 'master' into 3296-user-profile
2014-08-08 Brett SmithMerge branch '3527-infer-docker-hash-wip'
2014-08-08 Brett Smith3527: Support using a Docker image from any stream...
2014-08-08 Brett Smith3527: Find Docker images natively inside Collections.
2014-08-08 Tom CleggMerge branch '3525-manage-own-repo' refs #3525
2014-08-08 Tom Clegg3499: Merge branch 'master' into 3499-home-project
2014-08-07 Tom CleggMerge branch '3036-mutable-collections' refs #3504
2014-08-07 Tom Clegg3036: Merge branch 'master' into 3036-mutable-collections
2014-08-07 Tom Clegg3036: Remove unnecessary code path.
2014-07-27 Tom Clegg3036: Add TODOs for mutable collection uuids
2014-07-27 Tom Clegg3036: Assign collection uuid without complaint if not...
2014-06-23 Peter AmstutzMerge branch '2986-arv-edit' closes #2986
2014-06-19 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2884...
2014-06-19 Brett SmithMerge branch '2879-docker-image-job-reuse'
2014-06-19 Brett Smith2879: API server can find_or_create Jobs based on Docke...
2014-06-18 Peter AmstutzMerge branch 'master' into origin-2883-job-log-viewer
2014-06-17 Tim PierceMerge branch '2936-job-progress-bar'
2014-06-17 radhikaMerge branch 'master' into 2896-websocket-cli
2014-06-16 Brett SmithMerge branch '2879-job-api-docker-images'
2014-06-16 Brett Smith2879: API server maps Job Docker image constraints...
2014-05-29 Ward VandewegeMerge branch 'master' into 2681-new-inactive-user-notif...
2014-05-23 Peter AmstutzMerge branch '2798-go-keep-client' into 1885-keep-proxy...
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 '2755-api-collection-permissions'
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-14 Tom CleggMerge branch '2762-owner-uuid-integrity'
2014-05-14 Tom Clegg2762: Merge branch 'master' into 2762-owner-uuid-integrity
2014-05-14 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
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-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-02-25 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-02-25 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2049...
2014-02-25 Tom CleggMerge branch '2060-edit-tags-in-workbench'
2014-02-25 Tom CleggFix files=nil -> files=[] in API response for empty...
2014-02-25 Tom CleggMerge branch 'master' into 2060-edit-tags-in-workbench
2014-02-21 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-02-21 Peter AmstutzMerge branch '1965-fuse-support-directories'
2014-02-17 Peter AmstutzDo a partial normalization of file list before sending...
2014-02-17 Peter AmstutzPut some code into collection model to do normalization...
2014-02-16 Tom CleggMerge branch 'master' into 2060-edit-tags-in-workbench
2014-02-14 Tom CleggProvide manifest_text in collections.get API response...
2014-02-13 Tom CleggNormalize collection hashes provided by clients as...
2014-02-07 Peter AmstutzMerge branch 'master' into 1786-replace-jekyll-with...
2014-01-22 Peter AmstutzMerge remote-tracking branch 'origin' into 1786-replace...
2014-01-21 Tim PierceMerge branch '1943-client-sdk-config-files'
2014-01-21 Tom CleggMerge branch '1881-normalize-collection-uuids'
2014-01-20 Tom CleggNormalize collection UUID to {hash}+{size} before save...
2014-01-17 Tim PierceMerge branch 'master' of git.clinicalfuture.com:arvados
2014-01-17 Tom CleggMerge branch '1880-check-duplicate-public-key'
2014-01-17 Peter AmstutzFixed spaces in manifest stream names. Refs #1849.
2014-01-14 Tim PierceMerge branch '1510-arv-tag-unit-tests' of git.clinicalf...
2014-01-14 Peter AmstutzMerge branch '1748-workbench-view-files'
2014-01-14 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-01-13 Tom CleggMerge branch '1499-workbench-tags'
2014-01-13 Tom CleggUnescape filenames from manifests. refs #1849
2013-11-12 Tim PierceMerge branch '1578-api-server-in-docker'
2013-11-07 Tom CleggUse current_user to select API response template. fixes...
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