Merge branch 'master' into 7329-empty-block-issue
[arvados.git] / docker / sso /
2015-06-10 Peter AmstutzMerge branch 'master' into 3198-writable-fuse
2015-06-09 mishazMerge branch 'master' into 3408-production-datamanager
2015-06-03 Nancy Ouyangcloses #5930. Merge branch '5930-smalldocfix'
2015-05-28 radhikaMerge branch 'master' into 6087-collection-timing
2015-05-27 radhikaMerge branch 'master' into 6093-refresh-docs
2015-05-27 Peter AmstutzMerge branch '6141-doc-workbench-links' refs #6141
2015-05-27 radhikaMerge branch 'master' into 6057-public-projects-page
2015-05-27 Peter AmstutzMerge branch '6090-docker-use-local-sso' closes #6138
2015-05-22 Peter Amstutz6138: Added --domain to set ARVADOS_DOMAIN. Removed...
2015-05-19 mishazMerge branch 'master' into 3408-production-datamanager
2015-05-19 Radhika ChippadaMerge branch 'master' into 4717-read-only-keep-services...
2015-05-19 Radhika Chippadacloses #5720
2015-05-18 Peter AmstutzMerge branch 'master' into 3198-writable-fuse
2015-05-15 Nico CesarMerge branch '5998-arvdock-bridge-option'
2015-05-15 Ward VandewegeCheck in docker/sso/database.yml.in, forgotten in commi...
2015-05-14 Peter AmstutzMerge branch 'master' into 3198-writable-fuse
2015-05-14 Radhika ChippadaMerge branch 'master' into 5645-open-graph-meta-tags
2015-05-12 Nico CesarMerge branch 'master' into 5998-arvdock-bridge-option
2015-05-12 Ward VandewegeFix sso docker container build, and enable local accoun...
2015-05-12 Radhika ChippadaMerge branch 'master' into 5720-ajax-loading-error
2015-05-12 Peter AmstutzMerge branch 'master' into 3198-writable-fuse
2015-05-11 Peter AmstutzMerge branch '3198-inode-cache' refs #3198
2015-05-07 Peter AmstutzMerge branch '3198-inode-cache' into 3198-writable...
2015-05-07 Radhika ChippadaMerge branch 'master' into 4467-project-contents-select-all
2015-05-07 Tom CleggMerge branch '5523-stats-error' closes #5523
2015-05-06 Ward VandewegeFix docker image build for SSO server after refactoring...
2015-04-21 Radhika ChippadaMerge branch 'master' into 5663-doc-rake-secret
2015-04-21 Radhika ChippadaMerge branch 'master' into 5675-project-subprojects...
2015-04-21 Radhika ChippadaMerge branch 'master' into 5720-ajax-loading-error
2015-04-21 Peter AmstutzMerge branch 'master' into 3198-writable-fuse
2015-04-21 Radhika ChippadaMerge branch 'master' into 5179-dirs-in-filenames
2015-04-20 Ward VandewegeDocker: fix the build of the sso docker container.
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-29 Tom CleggMerge branch '4523-owner_uuid-index' refs #4523
2014-12-11 Radhika ChippadaMerge branch 'master' into 4523-search-index
2014-12-10 Tom Clegg3781: Merge branch 'master' into 3781-browser-upload
2014-12-09 Brett SmithMerge branch '4027-crunch-sdk-install-wip'
2014-12-09 Brett Smith4027: Revamp SSH use in our Docker images.
2014-07-15 radhikaMerge branch 'master' into 3106-modal-loading-indicator
2014-07-10 Ward VandewegeMerge branch '3219-further-docker-improvements'
2014-07-10 Ward VandewegeBe consistent about the version of ruby that is install...
2014-07-03 Tim PierceMerge branch '2873-permission-links-ownership'
2014-07-01 Tom CleggMerge branch '3099-spinner-assets' closes #3099
2014-06-30 Peter AmstutzMerge branch 'arv-crunch-HOME-envvar' no issue #
2014-06-30 Ward VandewegeMerge branch '3118-docker-fixes'
2014-06-30 Ward VandewegeMerge branch 'master' into 3118-docker-fixes
2014-06-30 Ward Vandewegedocker: bump up passenger version. This is highly unsat...
2014-02-25 Peter AmstutzMerge remote-tracking branch 'origin/master' into 2049...
2014-02-25 Tom CleggMerge branch 'master' into 2060-edit-tags-in-workbench
2014-02-24 Tim PierceUpdate Docker-based services to ruby-2.1.0.
2014-02-16 Tom CleggMerge branch 'master' into 2060-edit-tags-in-workbench
2014-02-12 Tom CleggMerge branch '2096-demo-feedback'
2014-02-12 Tim PierceMerge branch '2099-CORRECT-docker-stop-and-restart'
2014-02-12 Ward VandewegeRename clinicalfuture -> curoverse everywhere.
2013-12-31 Peter AmstutzMerge branch '1692-redesign-dashboard'
2013-12-31 Tim PierceMerge branch 'master' of git.clinicalfuture.com:arvados
2013-12-31 Tim PierceFix makefile brittleness.
2013-11-26 Ward VandewegeAdd an SSH server in each docker container.
2013-11-23 Tim PierceRuby 2.0.0-p247 -> p353 (now installed as stable).
2013-11-20 Ward Vandewege* Mention SSO server to documentation in README
2013-11-20 Tim PierceFixed Makefile dependencies, added docker_build script...
2013-11-19 Ward Vandewege* Make arvados/passenger container
2013-11-19 Tim PierceMerge branch 'master' of git.clinicalfuture.com:arvados
2013-11-19 Ward VandewegeLet API server use SSO container.
2013-11-19 Ward VandewegeFixes for SSO rails app.
2013-11-19 Ward VandewegeGenerated files shouldn't have been committed.
2013-11-18 Ward VandewegeMerge branch 'master' of git.clinicalfuture.com:arvados
2013-11-18 Ward VandewegeAdd SSO docker container