arvados.git
9 years agotypo
Nancy Ouyang [Mon, 13 Apr 2015 19:39:29 +0000 (15:39 -0400)]
typo

9 years agodashed line
Nancy Ouyang [Mon, 13 Apr 2015 19:31:06 +0000 (15:31 -0400)]
dashed line

9 years agoformat pg 3, 4
Nancy Ouyang [Mon, 13 Apr 2015 19:16:45 +0000 (15:16 -0400)]
format pg 3, 4

9 years agominor format changes
Nancy Ouyang [Mon, 13 Apr 2015 18:20:33 +0000 (14:20 -0400)]
minor format changes

9 years agoformatted first 2 pages
Nancy Ouyang [Mon, 13 Apr 2015 18:16:41 +0000 (14:16 -0400)]
formatted first 2 pages

9 years agodropped a header
Nancy Ouyang [Mon, 13 Apr 2015 16:39:19 +0000 (12:39 -0400)]
dropped a header

9 years agotext content done; formatting needed
Nancy Ouyang [Mon, 13 Apr 2015 16:37:50 +0000 (12:37 -0400)]
text content done; formatting needed

9 years agoMerge branch '5493-getting-started-modal' of git.curoverse.com:arvados into 5493...
Nancy Ouyang [Fri, 10 Apr 2015 17:33:47 +0000 (13:33 -0400)]
Merge branch '5493-getting-started-modal' of git.curoverse.com:arvados into 5493-getting-started-modal

Conflicts:
apps/workbench/app/views/getting_started/_getting_started_popup.html.erb

9 years agofix merge conflicts
Nancy Ouyang [Fri, 10 Apr 2015 17:32:42 +0000 (13:32 -0400)]
fix merge conflicts

9 years agofirst page prototype
Nancy Ouyang [Fri, 10 Apr 2015 16:57:39 +0000 (12:57 -0400)]
first page prototype

9 years agoMerge branch 'master' into 5493-getting-started-modal
Radhika Chippada [Wed, 8 Apr 2015 14:37:01 +0000 (10:37 -0400)]
Merge branch 'master' into 5493-getting-started-modal

9 years agoMerge branch '5642-crunch-job-swap-limits-wip'
Brett Smith [Wed, 8 Apr 2015 13:47:09 +0000 (09:47 -0400)]
Merge branch '5642-crunch-job-swap-limits-wip'

Closes #5642, #5664.

9 years ago5642: crunch-job uses higher memory limit when running few tasks.
Brett Smith [Wed, 8 Apr 2015 13:46:51 +0000 (09:46 -0400)]
5642: crunch-job uses higher memory limit when running few tasks.

This gives a task all of the node's RAM when it's the only task
running this round, which is more in line with user expectations.

9 years ago5642: Explicitly make all swap available under Docker in crunch-job.
Brett Smith [Wed, 8 Apr 2015 13:46:23 +0000 (09:46 -0400)]
5642: Explicitly make all swap available under Docker in crunch-job.

Without this, Docker 1.2 through 1.5 send subprocesses SIGKILL if they
exceed the memory limit.  Refer to #5642 for an example.

--memory-swap is pretty new (newer than 1.3.3), so we don't want to
require it.  At the same time, we don't want to impose any memory
limits if we can't use it, because killing subprocesses that exceed a
--memory limit is too strict.  This commit arranges to use both
--memory and --memory-swap only if the latter is available.

9 years agoInclude arvados/collection in the Ruby SDK gem.
Brett Smith [Tue, 7 Apr 2015 21:43:10 +0000 (17:43 -0400)]
Include arvados/collection in the Ruby SDK gem.

No issue #.

9 years agoMerge branch '5653-arv-copy-multiple-branches-wip'
Brett Smith [Tue, 7 Apr 2015 14:34:31 +0000 (10:34 -0400)]
Merge branch '5653-arv-copy-multiple-branches-wip'

Closes #5653, #5673.

9 years ago5653: arv-copy copies multiple commits from the same repository+pipeline.
Brett Smith [Mon, 6 Apr 2015 18:27:21 +0000 (14:27 -0400)]
5653: arv-copy copies multiple commits from the same repository+pipeline.

arv-copy previously used the repository name alone to determine which
job scripts it had already copied to the destination.  If a pipeline
used unrelated commits from the same repository, it would skip copying
over all but the first.  Track script versions throughout the copy
process and make sure all of them are copied to the destination
repository.

9 years agoMerge branch '5352-crunch-dispatch-salloc-tempfail-wip'
Brett Smith [Tue, 7 Apr 2015 13:57:19 +0000 (09:57 -0400)]
Merge branch '5352-crunch-dispatch-salloc-tempfail-wip'

Closes #5352, #5670.

9 years ago5352: crunch-dispatch treats node allocation failure as temporary.
Brett Smith [Sun, 5 Apr 2015 21:10:22 +0000 (17:10 -0400)]
5352: crunch-dispatch treats node allocation failure as temporary.

Imagine a scenario where multiple crunch-dispatch processes are
sitting idle, then suddenly a new job appears in the queue.  They will
all race to dispatch the job.  When this happens, we frequently see
that salloc fails for most of them, because they all requested the
same node(s) and only the winner will get them.  crunch-dispatch has
no way to know the exit code "came from" salloc and not crunch-job,
and so marks the job failed.

This patch sets the SLURM_EXIT_IMMEDIATE environment variable to make
salloc use exit code 75 when the allocation fails.  crunch-dispatch
already recognizes this exit code as a temporary failure, and will
leave the Arvados job record unchanged.  Refer to salloc(1) and the
long comment in Dispatch#reap_children.

9 years agocloses #5565
Radhika Chippada [Mon, 6 Apr 2015 20:58:05 +0000 (16:58 -0400)]
closes #5565
Merge branch '5565-breadcrumbs-in-anonyymous-view'

9 years ago5565: show parent project hierarchy in breadcrumbs in anonymous view; not just curren...
Radhika Chippada [Mon, 6 Apr 2015 20:54:22 +0000 (16:54 -0400)]
5565: show parent project hierarchy in breadcrumbs in anonymous view; not just current objects's parent.

9 years agoMerge branch 'master' into 5565-breadcrumbs-in-anonyymous-view
Radhika Chippada [Mon, 6 Apr 2015 20:48:36 +0000 (16:48 -0400)]
Merge branch 'master' into 5565-breadcrumbs-in-anonyymous-view

9 years agocloses #5492
Radhika Chippada [Mon, 6 Apr 2015 20:16:02 +0000 (16:16 -0400)]
closes #5492
Merge branch '5492-home-project-in-my-account'

9 years agoMerge branch 'master' into 5492-home-project-in-my-account
Radhika Chippada [Mon, 6 Apr 2015 20:15:14 +0000 (16:15 -0400)]
Merge branch 'master' into 5492-home-project-in-my-account

9 years agoMerge branch 'master' into 5565-breadcrumbs-in-anonyymous-view
Radhika Chippada [Mon, 6 Apr 2015 19:31:49 +0000 (15:31 -0400)]
Merge branch 'master' into 5565-breadcrumbs-in-anonyymous-view

9 years ago5565: show trimmed down version of breadcrumbs in anonymous view.
Radhika Chippada [Mon, 6 Apr 2015 19:29:07 +0000 (15:29 -0400)]
5565: show trimmed down version of breadcrumbs in anonymous view.

9 years agoTighten up DNS check in arvdock.
Brett Smith [Mon, 6 Apr 2015 17:49:29 +0000 (13:49 -0400)]
Tighten up DNS check in arvdock.

I got arvdock stuck in an infinite loop because I had the right
nameserver line in /etc/resolv.conf, except it was commented out, so
arvdock kept checking for a name that it would never find.  Use awk to
find and check the first functional nameserver line instead.

No issue #.

9 years ago5492: add "Home project" link to my account menu.
Radhika Chippada [Mon, 6 Apr 2015 16:43:54 +0000 (12:43 -0400)]
5492: add "Home project" link to my account menu.

9 years agoAdd missing global declaration in arv-copy.
Brett Smith [Mon, 6 Apr 2015 15:38:08 +0000 (11:38 -0400)]
Add missing global declaration in arv-copy.

No issue #.

9 years agoFix debug log formatting in PySDK.
Brett Smith [Sun, 5 Apr 2015 21:39:33 +0000 (17:39 -0400)]
Fix debug log formatting in PySDK.

When multiple arguments are passed to a logger method, the first
argument is expected to be a printf-style format string, with the
remaining arguments expected to fill in the formatters.

No issue #.

9 years ago5518: PySDK arvados.util must import arvados.
Brett Smith [Sun, 5 Apr 2015 20:34:00 +0000 (16:34 -0400)]
5518: PySDK arvados.util must import arvados.

Closes #5518.

9 years ago5493: minor refactoring
Radhika Chippada [Fri, 3 Apr 2015 18:03:57 +0000 (14:03 -0400)]
5493: minor refactoring

9 years agoMerge branch '5416-repo-dir-is-uuid'
Brett Smith [Fri, 3 Apr 2015 14:28:35 +0000 (10:28 -0400)]
Merge branch '5416-repo-dir-is-uuid'

Refs #5416.

9 years ago4253: Gitolite migration makes a name symlink for arvados repository.
Brett Smith [Thu, 2 Apr 2015 21:37:53 +0000 (17:37 -0400)]
4253: Gitolite migration makes a name symlink for arvados repository.

This is necessary for other supporting infrastructure around this
repository in Gitolite installs; e.g., the cron job that keeps them in
sync with upstream.  Refs #4253.

9 years agoMerge branch '4752-docker-websockets' closes #4752
Peter Amstutz [Thu, 2 Apr 2015 19:23:18 +0000 (15:23 -0400)]
Merge branch '4752-docker-websockets' closes #4752

9 years agoMake arvdock abort with a nice error message if docker or curl can not
Ward Vandewege [Thu, 2 Apr 2015 19:17:04 +0000 (15:17 -0400)]
Make arvdock abort with a nice error message if docker or curl can not
be found.

refs #4752

9 years agoMerge branch '5626-git-server-hostname' closes #5626
Peter Amstutz [Thu, 2 Apr 2015 16:02:43 +0000 (12:02 -0400)]
Merge branch '5626-git-server-hostname' closes #5626

9 years ago5626: Expand test to check both positive and negative cases a bit per request.
Peter Amstutz [Thu, 2 Apr 2015 16:01:43 +0000 (12:01 -0400)]
5626: Expand test to check both positive and negative cases a bit per request.

9 years ago5626: Add test for git_hostname configuration option.
Peter Amstutz [Thu, 2 Apr 2015 14:38:39 +0000 (10:38 -0400)]
5626: Add test for git_hostname configuration option.

9 years ago4752: Websockets works. Fix compute node containers to restart correctly. Fix
Peter Amstutz [Thu, 2 Apr 2015 14:24:56 +0000 (10:24 -0400)]
4752: Websockets works.  Fix compute node containers to restart correctly.  Fix
git server hostname.  Arvdock waits for API/workbench to be ready before telling
the user to go to workbench.

9 years agoMerge branch '5626-git-server-hostname' into 4752-docker-websockets
Peter Amstutz [Wed, 1 Apr 2015 20:14:19 +0000 (16:14 -0400)]
Merge branch '5626-git-server-hostname' into 4752-docker-websockets

9 years ago5416: Prefer repos stored locally by uuid, fall back to name. Update tests to suit...
Tom Clegg [Wed, 1 Apr 2015 20:12:35 +0000 (16:12 -0400)]
5416: Prefer repos stored locally by uuid, fall back to name. Update tests to suit 4523 fixtures.

9 years ago5626: Add git_hostname configuration option.
Peter Amstutz [Wed, 1 Apr 2015 19:59:33 +0000 (15:59 -0400)]
5626: Add git_hostname configuration option.

9 years ago5627: Python file-like objects use SEET_SET as the default whence.
Brett Smith [Wed, 1 Apr 2015 19:50:08 +0000 (15:50 -0400)]
5627: Python file-like objects use SEET_SET as the default whence.

This is a brown paper bag commit.  All that time I spent grumbling
that we had the wrong default was completely incorrect.  We had it
right earlier, and I blew it.  See
<https://docs.python.org/2/library/stdtypes.html#file.seek>.

Closes #5627.

9 years ago4752: Fix failing setup by polling for API server to come up.
Peter Amstutz [Wed, 1 Apr 2015 16:08:35 +0000 (12:08 -0400)]
4752: Fix failing setup by polling for API server to come up.

9 years agocloses #5420
Radhika Chippada [Wed, 1 Apr 2015 15:08:06 +0000 (11:08 -0400)]
closes #5420
Merge branch '5420-collection-checkbox-selections'

9 years ago4752: Update documentation related to docker
Peter Amstutz [Wed, 1 Apr 2015 14:38:52 +0000 (10:38 -0400)]
4752: Update documentation related to docker

9 years ago5420: remove search box autocomplete off update so that this can be addressed in...
Radhika Chippada [Wed, 1 Apr 2015 14:32:48 +0000 (10:32 -0400)]
5420: remove search box autocomplete off update so that this can be addressed in a separate issue.

9 years agoMerge branch 'master' into 5420-collection-checkbox-selections
Radhika Chippada [Wed, 1 Apr 2015 14:23:08 +0000 (10:23 -0400)]
Merge branch 'master' into 5420-collection-checkbox-selections

9 years agoMerge branch '4253-gitolite-migration-wip'
Brett Smith [Wed, 1 Apr 2015 14:13:39 +0000 (10:13 -0400)]
Merge branch '4253-gitolite-migration-wip'

Closes #4253, #5617.

9 years ago4253: Add script to migrate existing Gitolite installations.
Brett Smith [Tue, 31 Mar 2015 21:02:38 +0000 (17:02 -0400)]
4253: Add script to migrate existing Gitolite installations.

9 years ago4752: Use passenger standalone for API server instead of passenger apache module...
Peter Amstutz [Wed, 1 Apr 2015 13:51:51 +0000 (09:51 -0400)]
4752: Use passenger standalone for API server instead of passenger apache module and set ARVADOS_WEBSOCKETS=1

9 years agoMerge branch '4253-user-repos-wip'
Brett Smith [Wed, 1 Apr 2015 13:45:07 +0000 (09:45 -0400)]
Merge branch '4253-user-repos-wip'

Refs #4253.  Closes #5605.

9 years ago4253: Add Workbench interface to create repositories.
Brett Smith [Mon, 30 Mar 2015 20:06:38 +0000 (16:06 -0400)]
4253: Add Workbench interface to create repositories.

Commit includes contributions from Tom Clegg.

9 years ago4253: Let Workbench Manage Account partials render their whole pane.
Brett Smith [Mon, 30 Mar 2015 18:28:40 +0000 (14:28 -0400)]
4253: Let Workbench Manage Account partials render their whole pane.

I'm about to add another "Add" button to the Repositories pane, so I'd
rather do it this way than try to maintain a generic loop inside
_manage_account.html.erb.

9 years ago4253: Sync up Docker with our production Gitolite setup.
Brett Smith [Mon, 30 Mar 2015 15:06:51 +0000 (11:06 -0400)]
4253: Sync up Docker with our production Gitolite setup.

This updates our API server Docker image to store repositories by
UUID, with name aliases available.  .gitolite.rc enables the aliasing,
and update-gitolite.rb generates the necessary configuration.  This
makes it possible to test the recent repository changes in Docker.

9 years ago4253: Users can manage their own repositories.
Brett Smith [Tue, 31 Mar 2015 13:23:56 +0000 (09:23 -0400)]
4253: Users can manage their own repositories.

This commit allows users to create their own repositories, as long as
the repository name starts with their own username.

To support this change, we've modified our Gitolite setup to store
repositories primarily by UUID, with a name alias for easier
checkout.  fetch_url and push_url become generated attributes
accordingly.  This makes it easier to rename the repository later and
allow checkouts to continue to work.

Commit includes contributions from Tom Clegg.

9 years agoMerge branch '5612-munge-docker-cleanup' closes #5612
Peter Amstutz [Wed, 1 Apr 2015 13:09:26 +0000 (09:09 -0400)]
Merge branch '5612-munge-docker-cleanup' closes #5612

9 years ago5612: Wrap munge with startup script that cleans up /var/run/munge of stale
Peter Amstutz [Tue, 31 Mar 2015 21:13:06 +0000 (17:13 -0400)]
5612: Wrap munge with startup script that cleans up /var/run/munge of stale
sockets and pidfiles.  Can now run jobs after stopping and restarting
containers.

9 years agoMerge branch 'master' into 5420-collection-checkbox-selections
Radhika Chippada [Tue, 31 Mar 2015 19:55:54 +0000 (15:55 -0400)]
Merge branch 'master' into 5420-collection-checkbox-selections

9 years ago5493: one more stale update
Radhika Chippada [Tue, 31 Mar 2015 19:28:42 +0000 (15:28 -0400)]
5493: one more stale update

9 years ago5493: test uncovered an issue with getting_started_shown handling; fixed it.
Radhika Chippada [Tue, 31 Mar 2015 19:21:21 +0000 (15:21 -0400)]
5493: test uncovered an issue with getting_started_shown handling; fixed it.

9 years agoMerge branch 'master' into 5493-getting-started-modal
Radhika Chippada [Tue, 31 Mar 2015 18:51:19 +0000 (14:51 -0400)]
Merge branch 'master' into 5493-getting-started-modal

9 years agoMerge branch '5539-better-docker' closes #5539
Peter Amstutz [Tue, 31 Mar 2015 15:18:58 +0000 (11:18 -0400)]
Merge branch '5539-better-docker' closes #5539

9 years agoMerge branch 'master' into 5493-getting-started-modal
Radhika Chippada [Tue, 31 Mar 2015 13:56:46 +0000 (09:56 -0400)]
Merge branch 'master' into 5493-getting-started-modal

9 years ago5493: improve test to verify Next button disables when last page is accessed
Radhika Chippada [Tue, 31 Mar 2015 13:55:59 +0000 (09:55 -0400)]
5493: improve test to verify Next button disables when last page is accessed

9 years ago5493: getting_started modal is served from layout html
Radhika Chippada [Tue, 31 Mar 2015 01:51:38 +0000 (21:51 -0400)]
5493: getting_started modal is served from layout html

9 years agoMerge branch '5416-arv-git-httpd' refs #5416
Tom Clegg [Mon, 30 Mar 2015 19:56:34 +0000 (15:56 -0400)]
Merge branch '5416-arv-git-httpd' refs #5416

9 years ago5493: do not show "Public pipelines and datasets" link in help menu if config paramet...
Radhika Chippada [Mon, 30 Mar 2015 19:42:48 +0000 (15:42 -0400)]
5493: do not show "Public pipelines and datasets" link in help menu if config parameter is not set.

9 years ago5493: update tests to use updated fixture active_no_prefs_profile_no_getting_started_...
Radhika Chippada [Mon, 30 Mar 2015 19:15:40 +0000 (15:15 -0400)]
5493: update tests to use updated fixture active_no_prefs_profile_no_getting_started_shown

9 years ago5416: Merge branch 'master' into 5416-arv-git-httpd
Tom Clegg [Mon, 30 Mar 2015 17:00:59 +0000 (13:00 -0400)]
5416: Merge branch 'master' into 5416-arv-git-httpd

9 years ago5416: Add permission-denied tests.
Tom Clegg [Mon, 30 Mar 2015 16:56:53 +0000 (12:56 -0400)]
5416: Add permission-denied tests.

9 years ago5416: Improve variable names & filenames. Report original error if git fails with...
Tom Clegg [Mon, 30 Mar 2015 16:56:00 +0000 (12:56 -0400)]
5416: Improve variable names & filenames. Report original error if git fails with nothing on stderr.

9 years ago5493: add pager-count where text such as "1 of 10" is shown.
Radhika Chippada [Sun, 29 Mar 2015 13:26:27 +0000 (09:26 -0400)]
5493: add pager-count where text such as "1 of 10" is shown.

9 years agoMerge branch 'master' into 5493-getting-started-modal
Radhika Chippada [Fri, 27 Mar 2015 23:45:53 +0000 (19:45 -0400)]
Merge branch 'master' into 5493-getting-started-modal

9 years ago5493: remove the helper method update_getting_started_shown_user_pref, and instead...
Radhika Chippada [Fri, 27 Mar 2015 23:44:25 +0000 (19:44 -0400)]
5493: remove the helper method update_getting_started_shown_user_pref, and instead perform prefs update in the view itself.

9 years agoMerge branch '5502-node-manager-gce-ssd-wip'
Brett Smith [Fri, 27 Mar 2015 21:16:09 +0000 (17:16 -0400)]
Merge branch '5502-node-manager-gce-ssd-wip'

Refs #5502.

9 years ago5493: add test for the getting_started help menu item.
Radhika Chippada [Fri, 27 Mar 2015 20:52:03 +0000 (16:52 -0400)]
5493: add test for the getting_started help menu item.

9 years ago5493: update user_profile test to expect getting_started modal for users with no...
Radhika Chippada [Fri, 27 Mar 2015 17:51:47 +0000 (13:51 -0400)]
5493: update user_profile test to expect getting_started modal for users with no previous profile configuration;
also, add one more user scenario where prefs exists with getting_started_shown but no profile.

9 years agoMerge branch 'master' into 5420-collection-checkbox-selections
Radhika Chippada [Fri, 27 Mar 2015 13:54:25 +0000 (09:54 -0400)]
Merge branch 'master' into 5420-collection-checkbox-selections

9 years ago5493: (thanks to tom) modal paging is awesome.
Radhika Chippada [Fri, 27 Mar 2015 13:52:49 +0000 (09:52 -0400)]
5493: (thanks to tom) modal paging is awesome.

9 years ago5493: fix a bug in user profile handling where any pre-existing prefs are being lost.
Radhika Chippada [Fri, 27 Mar 2015 01:25:36 +0000 (21:25 -0400)]
5493: fix a bug in user profile handling where any pre-existing prefs are being lost.

9 years ago5493: wiring for 'getting started' popup
Radhika Chippada [Thu, 26 Mar 2015 18:55:37 +0000 (14:55 -0400)]
5493: wiring for 'getting started' popup

9 years ago5502: Node Manager attaches a local SSD to GCE compute nodes.
Brett Smith [Thu, 26 Mar 2015 17:31:01 +0000 (13:31 -0400)]
5502: Node Manager attaches a local SSD to GCE compute nodes.

This is the best option to provide temporary working space for compute
work on GCE.

9 years ago5502: Adjust id and name of Node Manager cloud object mocks.
Brett Smith [Thu, 26 Mar 2015 16:29:38 +0000 (12:29 -0400)]
5502: Adjust id and name of Node Manager cloud object mocks.

Some GCE objects like disk types have predictable names, so it's
helpful to be able to mock objects with the same name.  Use the
name_id argument is the literal name, and generate an id from it.

9 years agocloses #5556
Radhika Chippada [Wed, 25 Mar 2015 23:00:55 +0000 (19:00 -0400)]
closes #5556
Merge branch '5556-collection-show-timeout'

9 years agoMerge branch 'master' into 5556-collection-show-timeout
Radhika Chippada [Wed, 25 Mar 2015 19:47:17 +0000 (15:47 -0400)]
Merge branch 'master' into 5556-collection-show-timeout

9 years agorefs #5247
Radhika Chippada [Wed, 25 Mar 2015 18:59:09 +0000 (14:59 -0400)]
refs #5247
closes #5248
Merge branch '5247-anonymous-doc'

9 years ago5247: couple more caption updates.
Radhika Chippada [Wed, 25 Mar 2015 18:58:27 +0000 (14:58 -0400)]
5247: couple more caption updates.

9 years agoMerge branch 'master' into 5556-collection-show-timeout
Radhika Chippada [Wed, 25 Mar 2015 18:26:45 +0000 (14:26 -0400)]
Merge branch 'master' into 5556-collection-show-timeout

9 years ago5247: some caption updates.
Radhika Chippada [Wed, 25 Mar 2015 18:19:01 +0000 (14:19 -0400)]
5247: some caption updates.

9 years ago5416: Fix overly sensitive error message regexp.
Tom Clegg [Wed, 25 Mar 2015 17:48:39 +0000 (13:48 -0400)]
5416: Fix overly sensitive error message regexp.

9 years agoMerge branch 'master' into 5247-anonymous-doc
Radhika Chippada [Wed, 25 Mar 2015 17:37:18 +0000 (13:37 -0400)]
Merge branch 'master' into 5247-anonymous-doc

9 years agocloses #5534
Radhika Chippada [Wed, 25 Mar 2015 17:26:34 +0000 (13:26 -0400)]
closes #5534
Merge branch '5534-limit-log-lines'

9 years agoMerge branch 'master' into 5534-limit-log-lines
Radhika Chippada [Wed, 25 Mar 2015 17:25:46 +0000 (13:25 -0400)]
Merge branch 'master' into 5534-limit-log-lines

9 years agocloses #3762
Radhika Chippada [Wed, 25 Mar 2015 17:24:50 +0000 (13:24 -0400)]
closes #3762
Merge branch '3762-delete-list-worker'

9 years agoMerge branch 'master' into 3762-delete-list-worker
Radhika Chippada [Wed, 25 Mar 2015 17:23:33 +0000 (13:23 -0400)]
Merge branch 'master' into 3762-delete-list-worker

9 years agoMerge branch 'master' into 5420-collection-checkbox-selections
Radhika Chippada [Wed, 25 Mar 2015 17:15:54 +0000 (13:15 -0400)]
Merge branch 'master' into 5420-collection-checkbox-selections

9 years ago5420: address checkbox selection caching issue with Safari and Chrome.
Radhika Chippada [Wed, 25 Mar 2015 17:15:11 +0000 (13:15 -0400)]
5420: address checkbox selection caching issue with Safari and Chrome.

9 years agoMerge branch '4253-user-usernames-wip'
Brett Smith [Wed, 25 Mar 2015 15:51:08 +0000 (11:51 -0400)]
Merge branch '4253-user-usernames-wip'

Refs #4253.  Closes #5512.