Merge branch 'master' into 3118-docker-fixes
[arvados.git] / apps / workbench / app / models / user.rb
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 branch 'origin-2939-re-run-job-button' into 2882...
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-03 Tom Clegg2872: Fix attribute_editable? to play nicer with group...
2014-06-02 Tom Clegg2872: Fix some tests and bugs
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-21 Peter AmstutzMerge branch 'master' into 2751-python-sdk-keep-proxy...
2014-05-15 radhikaMerge branch 'master' into 2756-eventbus-in-workbench
2014-05-15 Tom Clegg2809: Merge branch '2809-workbench-rails4' refs #2809
2014-05-15 Tom Clegg2809: Merge branch 'master' into 2809-workbench-rails4...
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 Peter AmstutzMerge branch '2035-arv-mount-tags-folders' into origin...
2014-05-06 Tom CleggMerge branch '2733-coverage-report'
2014-05-06 radhikaMerge branch 'master' into 2525-java-sdk
2014-05-06 radhikaMerge branch 'master' into 2352-use-state
2014-05-06 Peter AmstutzMerge branch 'master' into origin-2035-arv-mount-tags...
2014-05-05 Ward VandewegeMerge branch 'master' of git.curoverse.com:arvados
2014-05-05 Tom CleggMerge branch '2640-folder-api'
2014-05-05 Tom CleggMerge branch 'master' into 2640-folder-api
2014-05-04 Tom CleggUse one client per thread, via a factory method, instea...
2014-05-04 Tom CleggMerge branch 'master' into 2640-folder-api
2014-05-01 Tom CleggMerge branch 'master' into 2640-folder-api
2014-05-01 Tom CleggMerge branch 'master' into 2640-folder-api
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-29 Tom CleggMerge branch '2640-folder-api' into 1970-folder-view
2014-04-29 Tom CleggRename owned_items to contents, remove user method...
2014-04-29 Tom CleggMerge branch '0000-ruby-client-config'
2014-04-28 Tom CleggExpose names for owned_items as list_response.name_for...
2014-04-25 Tom CleggMerge branch 'master' into 1969-persistent-switch
2014-04-25 Tom CleggMerge branch '2505-update-docs'
2014-04-25 Peter AmstutzMerge remote-tracking branch 'origin/master' into origi...
2014-04-25 Tom CleggMerge branch '2640-folder-api'
2014-04-23 Tom CleggMerge branch 'master' of git.curoverse.com:arvados...
2014-04-22 Tom CleggAdd unit test for User#owned_items.
2014-04-15 Peter AmstutzMerge branch 'master' into 1971-show-image-thumbnails
2014-04-11 Tim PierceMerge branch '2449-keep-write-blocks' into 2449-keep...
2014-04-11 Peter AmstutzMerged master
2014-04-10 Brett SmithMerge branch 'master' into 2375-log-table
2014-04-08 Tim PierceMerge branch 'master' into 2449-keep-write-blocks
2014-04-08 radhika chippadaPass all parameters to the setup method
2014-04-08 radhika chippadaSetup popup display
2014-04-08 radhika chippadaAdd a setup action to users controller and user model
2014-04-01 Misha ZatsmanMerge branch 'master' of git.curoverse.com:arvados...
2014-03-28 Tim PierceMerge branch '2291-new-keepd-read-blocks'
2014-03-28 Tim PierceMerge branch 'master' into 2221-complete-docker
2014-03-28 Tom CleggMerge branch 'master' into 1932-job-output-persistent
2014-03-27 radhika chippadaImprove the api call invocation
2014-03-27 radhika chippadaMerge branch 'master' into 2068-reset-user
2014-03-27 radhika chippadaStory #2068: Invoke the user -> unsetup method when...
2014-02-07 Peter AmstutzMerge branch 'master' into 1786-replace-jekyll-with...
2014-02-04 Peter AmstutzMerge branch '1977-provenance-report' of git.clinicalfu...
2014-02-03 Tom CleggMerge branch 'master' into 1977-provenance-report
2014-02-03 Peter AmstutzMerge branch 'master' of git.clinicalfuture.com:arvados
2014-02-01 Tom CleggMerge branch 'master' into 1978-compare-pipelines
2014-02-01 Tom CleggUse generic index page for /users
2014-01-22 Peter AmstutzMerge remote-tracking branch 'origin' into 1786-replace...
2014-01-15 Tim PierceMerge branch '1510-arv-tag-unit-tests' of git.clinicalf...
2014-01-14 Tom CleggIf a GET fails while looking up a friendly name, skip...
2013-12-31 Peter AmstutzMerge branch '1692-redesign-dashboard'
2013-12-31 Tim PierceMerge branch 'master' of git.clinicalfuture.com:arvados
2013-12-30 Tom CleggMerge branch '1694-user-agreement'
2013-12-30 Tom CleggSupport user agreement viewing and signing in Workbench.
2013-06-27 Tom Cleggfix editable User attributes
2013-06-13 Tom Cleggadd tutorials and references to home page
2013-06-11 Tom Cleggadd Repositories resource, fix authorized_user attr...
2013-06-10 Tom Cleggadd users#index, allow non-admin users#show
2013-04-15 Tom Cleggrename projects
2013-04-10 Tom Cleggrename explorer -> workbench