Merge pull request #1 from arvados/master
[arvados.git] / apps / workbench / app / views / users / _show_admin.html.erb
2019-11-28 Tom CleggMerge branch '15795-sys-root-token'
2019-11-26 Tom CleggMerge branch '15877-accept-json-in-json'
2019-11-26 Lucas Di PentimaMerge branch '15849-vocab-migration-example'
2019-11-26 Peter AmstutzMerge branch '15795-sys-root-token' refs #15795
2019-11-26 Peter AmstutzMerge branch '15803-unsetup' refs #15803
2019-11-26 Peter Amstutz15803: Add test that inactive user is not activated...
2019-11-25 Peter AmstutzMerge branch 'master' into 15803-unsetup
2019-11-18 Peter AmstutzMerge branch 'master' into 15803-unsetup
2019-11-08 Peter Amstutz15803: Tweak text on user admin page
2019-11-07 Peter Amstutz15803: Remove the 'email' can_login permission created...
2019-11-07 Peter Amstutz15803: Adjust workbench1 user panel to promote setup...
2019-07-29 Tom CleggMerge branch '14813-config-cors'
2019-07-29 Peter AmstutzMerge branch '15467-config-fixups'
2019-07-29 Tom CleggMerge branch '12020-flaky-py-test'
2019-07-26 Lucas Di PentimaMerge branch '15496-wb1-group-membership-admin'
2019-07-26 Lucas Di Pentima15496: Sets default attribute to 'x' instead of nil...
2019-03-14 Peter AmstutzAdd 'sdk/java-v2/' from commit '55f103e336ca9fb8bf1720d...
2017-07-05 Tom CleggMerge branch '8784-dir-listings'
2017-06-30 Tom CleggMerge branch '11807-yaml-to-json'
2017-06-30 radhikaArvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhik...
2017-06-29 Lucas Di Pentima11789: Merge branch 'master' into 11789-arvput-exclude...
2017-06-29 Tom CleggMerge branch '2411-check-copyright'
2017-06-28 Tom Clegg2411: Add copyright notices to everything.
2016-03-11 Tom CleggAdd 'build/' from commit '555b039609a3c8700c27767c255fd...
2016-03-01 Peter AmstutzAdd 'tools/arvbox/' from commit 'd3d368758db1f4a9fa5b89...
2015-12-11 Peter AmstutzMerge branch 'master' into 7454-azure-custom-data
2015-11-02 Peter AmstutzMerge branch '7593-cwl-crunchrunner' closes #7593
2015-10-30 Tom CleggMerge branch '5824-keep-web' into 5824-keep-web-workbench
2015-10-29 Tom Clegg5824: Merge branch 'master' into 5824-keep-web
2015-10-27 radhikaMerge branch 'master' into 7492-keepproxy-upstream...
2015-10-27 radhikacloses #7453
2015-10-26 radhika7453: Add "Add new group" button to user admin page.
2015-09-04 Joshua C. RandallMerge pull request #2 from wtsi-hgi/feature/arv-view
2015-07-31 Tom CleggMerge branch 'git-commit-debug' of https://github.com...
2015-07-31 Tom CleggMerge branch 'crunch-dispatch-docker-bin-env' of https...
2015-07-22 Peter AmstutzMerge branch '6264-cwl-runner' closes #6264
2015-07-14 Peter AmstutzMerge branch 'master' into github-3408-production-datam...
2015-07-14 radhikaMerge branch 'master' into 6219-fuse-performance-testing
2015-07-08 Ward VandewegeMerge branch 'master' into 6384-libpam-arvados
2015-07-07 ManojMerge branch 'master' into 6465-optimize-workbench...
2015-07-07 ManojMerge branch 'master' into 6466-disable-public-projects
2015-07-06 radhikacloses #6013
2015-07-03 radhika6013: revert back the deactivate user button leading...
2015-07-03 radhika6013: remove "repository" from user setup popup in...
2015-03-23 Joshua C. RandallMerge pull request #1 from curoverse/master
2015-02-13 mishazMerge branch 'master' of git.curoverse.com:arvados...
2015-01-16 Peter AmstutzAdd 'apps/arv-web/' from commit 'f9732ad8460d013c2f2836...
2015-01-06 Peter AmstutzMerge branch 'master' into 4570-multi-auth-method
2014-12-04 Tom Clegg3781: Merge branch 'master' into 3781-browser-upload
2014-12-02 Tim PierceMerge branch '4621-crunch-memory-usage'
2014-12-01 Tom CleggMerge branch '3781-browser-friendly-servers' refs ...
2014-12-01 radhikaMerge branch 'master' into 4487-and-4558
2014-12-01 radhikaMerge branch 'master' into 4644-collection-file-filtering
2014-12-01 Tom CleggMerge branch '4533-remote-reset' closes #4533
2014-11-26 Tom Clegg4533: Merge branch 'master' into 4533-remote-reset
2014-11-24 Tom Clegg4533: Merge branch 'master' into 4533-remote-reset
2014-11-21 Tom Clegg4533: Merge branch 'master' into 4533-remote-reset
2014-11-20 Phil HodgsonMerge branch 'master' into 4233-graph-job-stats
2014-11-18 Tom Clegg4533: Fix crash on nonexistent (or non-User) owner_uuid...
2014-11-17 Phil HodgsonMerge branch 'master' into 3382-always-show-inputs
2014-11-16 Tom Clegg4024: Merge branch 'master' into 4024-pipeline-instance...
2014-11-14 radhikaMerge branch 'master' into 4024-pipeline-instances...
2014-11-12 radhikaMerge branch 'master' into 3177-collection-choose-files
2014-11-12 Tom Clegg2853: Merge branch 'master' into 2853-rendezvous
2014-11-12 Tom CleggMerge branch '4434-collation' closes #4434
2014-11-12 Peter AmstutzMerge branch '3400-workbench-all-items' closes #3400
2014-11-12 Peter AmstutzMerge branch 'master' into 3400-workbench-all-items
2014-11-05 Peter Amstutz3400: ArvadosResourceList returns all items (paging...
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 Peter AmstutzMerge branch 'master' into 3036-collection-uuids
2014-08-26 radhikaMerge branch '3112-report-bug' into 3642-search-for...
2014-08-26 radhikaMerge branch '3112-report-bug' into 3620-admin-only...
2014-08-26 Tom CleggMerge branch '3149-filter-any' refs #3149
2014-08-26 radhikaMerge branch 'master' into 3112-report-bug
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 Tom Clegg3171: Fix wording, update docs.
2014-08-24 Tom Clegg3171: Add administrator UI for toggling user<->role...
2014-06-12 Tom Clegg2872: Merge branch 'master' into 2872-folder-nav
2014-06-10 radhikaMerge branch 'master' into 2871-preload-objects
2014-06-10 Peter AmstutzMerge branch '2961-load-tab-partials' closes #2961
2014-06-10 Peter Amstutz2961: user-setup-modal-window div is no longer in foote...
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 Misha ZatsmanMerge branch '1968-monitor-disk-usage'
2014-05-04 Tom CleggUpdate to Rails 4
2014-04-15 Peter AmstutzMerge branch 'master' into 1971-show-image-thumbnails
next