arvados.git
10 years agoMerge branch 'master' into 3112-report-bug
radhika [Sun, 24 Aug 2014 22:55:51 +0000 (18:55 -0400)]
Merge branch 'master' into 3112-report-bug

Conflicts:
services/api/config/application.default.yml

10 years agocloses #3153
radhika [Sun, 24 Aug 2014 22:07:07 +0000 (18:07 -0400)]
closes #3153
Merge branch '3153-auto-setup-user'

10 years ago3153: update the newly added vm login link to not point to the "active" user
radhika [Sun, 24 Aug 2014 22:06:10 +0000 (18:06 -0400)]
3153: update the newly added vm login link to not point to the "active" user

10 years agocloses #3153
radhika [Sun, 24 Aug 2014 21:15:09 +0000 (17:15 -0400)]
closes #3153
Merge branch '3153-auto-setup-user'

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Sun, 24 Aug 2014 21:14:32 +0000 (17:14 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years agoFix user agreements page when no signatures needed. Add tests. No issue #
Tom Clegg [Sun, 24 Aug 2014 20:05:15 +0000 (16:05 -0400)]
Fix user agreements page when no signatures needed. Add tests. No issue #

10 years agoFix disabled Continue button on user agreements page. No issue #
Tom Clegg [Sun, 24 Aug 2014 18:35:02 +0000 (14:35 -0400)]
Fix disabled Continue button on user agreements page. No issue #

10 years ago3112: trailing white space
radhika [Sun, 24 Aug 2014 12:31:54 +0000 (08:31 -0400)]
3112: trailing white space

10 years ago3112: report issue success event handling working in 404 error page.
radhika [Sun, 24 Aug 2014 12:11:13 +0000 (08:11 -0400)]
3112: report issue success event handling working in 404 error page.

10 years ago3112: update report_issue.js to confine event handling to report issue. WIP: mostly...
radhika [Sun, 24 Aug 2014 04:12:44 +0000 (00:12 -0400)]
3112: update report_issue.js to confine event handling to report issue. WIP: mostly working, except from the 404 error page.

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Sat, 23 Aug 2014 22:22:19 +0000 (18:22 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years ago3153: minor test updates: rename the variable "active_recipients" as "new_user_recipi...
radhika [Sat, 23 Aug 2014 19:32:02 +0000 (15:32 -0400)]
3153: minor test updates: rename the variable "active_recipients" as "new_user_recipients" to ensure test readability.

10 years ago3153: update tests to look for new user created message also when an inactive user...
radhika [Sat, 23 Aug 2014 19:17:15 +0000 (15:17 -0400)]
3153: update tests to look for new user created message also when an inactive user is being created.

10 years ago3153: when new_users_are_active config param is set, even blacklisted users will...
radhika [Sat, 23 Aug 2014 17:19:39 +0000 (13:19 -0400)]
3153: when new_users_are_active config param is set, even blacklisted users will be "active", and hence the email notification would say the user is setup when auto_setup_new_users is set.

10 years agoMerge branch '3153-auto-setup-tests' into 3153-auto-setup-user
radhika [Sat, 23 Aug 2014 15:07:57 +0000 (11:07 -0400)]
Merge branch '3153-auto-setup-tests' into 3153-auto-setup-user

10 years ago3153: change variable name in test from valid_username to ok_to_auto_setup
radhika [Sat, 23 Aug 2014 15:00:29 +0000 (11:00 -0400)]
3153: change variable name in test from valid_username to ok_to_auto_setup

10 years ago3153: directly invoke setup method during auto-setup
radhika [Sat, 23 Aug 2014 14:50:43 +0000 (10:50 -0400)]
3153: directly invoke setup method during auto-setup

10 years ago3153: Add integration tests.
Tom Clegg [Sat, 23 Aug 2014 02:46:53 +0000 (22:46 -0400)]
3153: Add integration tests.

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Fri, 22 Aug 2014 20:22:32 +0000 (16:22 -0400)]
Merge branch 'master' into 3112-report-bug

10 years agoReject empty fields in job creation filters. no issue #
Peter Amstutz [Fri, 22 Aug 2014 20:10:42 +0000 (16:10 -0400)]
Reject empty fields in job creation filters. no issue #

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Fri, 22 Aug 2014 20:09:32 +0000 (16:09 -0400)]
Merge branch 'master' into 3112-report-bug

10 years agocloses #3183
radhika [Fri, 22 Aug 2014 20:08:46 +0000 (16:08 -0400)]
closes #3183
Merge branch '3188-remove-selected-button'

10 years agoMerge branch 'master' into 3188-remove-selected-button
radhika [Fri, 22 Aug 2014 20:05:43 +0000 (16:05 -0400)]
Merge branch 'master' into 3188-remove-selected-button

10 years ago3153: fix the while loop logic.
radhika [Fri, 22 Aug 2014 20:02:19 +0000 (16:02 -0400)]
3153: fix the while loop logic.

10 years agoImprove error checking a bit on find_commit_range for bad revisions and missing
Peter Amstutz [Fri, 22 Aug 2014 19:54:12 +0000 (15:54 -0400)]
Improve error checking a bit on find_commit_range for bad revisions and missing
repositories.  no issue #

10 years ago3112: reload current location when error report modal is closing. otherwise, the...
radhika [Fri, 22 Aug 2014 19:51:08 +0000 (15:51 -0400)]
3112: reload current location when error report modal is closing. otherwise, the modal does not show up if the help menu dropdown option is used right after sending an error report from within the 404 page.

10 years ago3112: modal is shown by js
radhika [Fri, 22 Aug 2014 19:31:32 +0000 (15:31 -0400)]
3112: modal is shown by js

10 years agoDisplay first file in collection if name field is nil or empty. refs #3504
Peter Amstutz [Fri, 22 Aug 2014 17:56:59 +0000 (13:56 -0400)]
Display first file in collection if name field is nil or empty. refs #3504

10 years ago3112: ajax event handling on form not working. reverting back to document for now.
radhika [Fri, 22 Aug 2014 17:49:21 +0000 (13:49 -0400)]
3112: ajax event handling on form not working. reverting back to document for now.

10 years ago3153: when exsiting repository name or vm login link is used as username, assert...
radhika [Fri, 22 Aug 2014 15:14:32 +0000 (11:14 -0400)]
3153: when exsiting repository name or vm login link is used as username, assert the generated unique username starts with the given username and ends with a number.

10 years ago3153: when deriving unique name, look for all can_login links, not just the vm_uuid...
radhika [Fri, 22 Aug 2014 15:09:31 +0000 (11:09 -0400)]
3153: when deriving unique name, look for all can_login links, not just the vm_uuid configured. update tests to assert the generated username ends with a number when using a preconfigured username for this link.

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Fri, 22 Aug 2014 14:30:59 +0000 (10:30 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Fri, 22 Aug 2014 14:30:10 +0000 (10:30 -0400)]
Merge branch 'master' into 3112-report-bug

10 years ago3112: limit ajax event handling only to the report form
radhika [Fri, 22 Aug 2014 14:29:35 +0000 (10:29 -0400)]
3112: limit ajax event handling only to the report form

10 years agoMerge branch '3504-clients-compatible-with-3036' refs #3504
Peter Amstutz [Fri, 22 Aug 2014 13:58:19 +0000 (09:58 -0400)]
Merge branch '3504-clients-compatible-with-3036' refs #3504

10 years ago3504: Don't create stand-in "name" links for post #3036 apiserver
Peter Amstutz [Fri, 22 Aug 2014 12:42:45 +0000 (08:42 -0400)]
3504: Don't create stand-in "name" links for post #3036 apiserver

10 years ago3504: Support copy and moving collections on new apiserver
Peter Amstutz [Thu, 21 Aug 2014 21:10:45 +0000 (17:10 -0400)]
3504: Support copy and moving collections on new apiserver

10 years ago3504: Back out tags on project rows. Revisit in a later story.
Peter Amstutz [Fri, 22 Aug 2014 12:35:01 +0000 (08:35 -0400)]
3504: Back out tags on project rows.  Revisit in a later story.

10 years ago3153: trailing white space
radhika [Thu, 21 Aug 2014 22:54:52 +0000 (18:54 -0400)]
3153: trailing white space

10 years ago3153: return nil if no unique username can be derived from an email address. no setup...
radhika [Thu, 21 Aug 2014 22:25:16 +0000 (18:25 -0400)]
3153: return nil if no unique username can be derived from an email address. no setup will happen in that case.

10 years ago3112: change submit button text
radhika [Thu, 21 Aug 2014 20:50:29 +0000 (16:50 -0400)]
3112: change submit button text

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Thu, 21 Aug 2014 20:22:51 +0000 (16:22 -0400)]
Merge branch 'master' into 3112-report-bug

10 years ago3153: use loop with counter than while(true) to derive unique username
radhika [Thu, 21 Aug 2014 19:43:50 +0000 (15:43 -0400)]
3153: use loop with counter than while(true) to derive unique username

10 years ago3504: Remove link to links index page on tags. Add comment to
Peter Amstutz [Thu, 21 Aug 2014 19:08:38 +0000 (15:08 -0400)]
3504: Remove link to links index page on tags.  Add comment to
CollectionsController#choose.  Adjust column width in collections file table.

10 years ago3153: update tests to check for existing repo name
radhika [Thu, 21 Aug 2014 18:52:00 +0000 (14:52 -0400)]
3153: update tests to check for existing repo name

10 years ago3504: Don't set owner_uuid redundantly.
Peter Amstutz [Thu, 21 Aug 2014 18:49:28 +0000 (14:49 -0400)]
3504: Don't set owner_uuid redundantly.

10 years ago3036: Use preload_objects to fetch owner_uuids in the controller instead of in the...
Peter Amstutz [Thu, 21 Aug 2014 18:44:30 +0000 (14:44 -0400)]
3036: Use preload_objects to fetch owner_uuids in the controller instead of in the view.

10 years ago3153: username regexp is updated
radhika [Thu, 21 Aug 2014 17:56:28 +0000 (13:56 -0400)]
3153: username regexp is updated

10 years agoBe smarter about cleanup in crunch-job after a job finishes. This should
Ward Vandewege [Thu, 21 Aug 2014 17:23:08 +0000 (13:23 -0400)]
Be smarter about cleanup in crunch-job after a job finishes. This should
resolve the problem of the many leftover stale mount points.

no issue #

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Thu, 21 Aug 2014 17:21:16 +0000 (13:21 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years ago3153: update regexp, email message
radhika [Thu, 21 Aug 2014 17:19:25 +0000 (13:19 -0400)]
3153: update regexp, email message

10 years ago3504: Set owner_uuid when creating collection (will set owner_uuid of name link
Peter Amstutz [Thu, 21 Aug 2014 16:13:11 +0000 (12:13 -0400)]
3504: Set owner_uuid when creating collection (will set owner_uuid of name link
on old apiserver, and set owner of collection object directly on new
apiserver.)

10 years ago3504: Set the capybara driver explicitly so tests pass again.
Peter Amstutz [Thu, 21 Aug 2014 15:39:09 +0000 (11:39 -0400)]
3504: Set the capybara driver explicitly so tests pass again.

10 years agoMerge remote-tracking branch 'origin/master' into 3504-clients-compatible-with-3036
Peter Amstutz [Thu, 21 Aug 2014 15:04:17 +0000 (11:04 -0400)]
Merge remote-tracking branch 'origin/master' into 3504-clients-compatible-with-3036

10 years ago3504: Fixed preload_links_for_objects to use @objects.to_a. Fix collections
Peter Amstutz [Thu, 21 Aug 2014 15:03:58 +0000 (11:03 -0400)]
3504: Fixed preload_links_for_objects to use @objects.to_a.  Fix collections
page to restore link names.  Remove obsolete tests for "persist" button.  Tweak
pipeline instance tests.

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Thu, 21 Aug 2014 02:08:18 +0000 (22:08 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years ago3112: move ajax event handling into a separate js file
radhika [Thu, 21 Aug 2014 02:06:28 +0000 (22:06 -0400)]
3112: move ajax event handling into a separate js file

10 years ago3112: use jquery syntax for find buttons
radhika [Wed, 20 Aug 2014 22:38:02 +0000 (18:38 -0400)]
3112: use jquery syntax for find buttons

10 years ago3112: and it would help if that said partial is committed :)
radhika [Wed, 20 Aug 2014 21:37:17 +0000 (17:37 -0400)]
3112: and it would help if that said partial is committed :)

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Wed, 20 Aug 2014 21:26:31 +0000 (17:26 -0400)]
Merge branch 'master' into 3112-report-bug

10 years ago3112: use partial to report error
radhika [Wed, 20 Aug 2014 21:23:52 +0000 (17:23 -0400)]
3112: use partial to report error

10 years ago3504: Use preload_links_for_objects in projects_controller. Use
Peter Amstutz [Wed, 20 Aug 2014 21:10:37 +0000 (17:10 -0400)]
3504: Use preload_links_for_objects in projects_controller.  Use
self[:portable_data_hash] in collection.rb to avoid recursive definition of
.uuid and .portable_data_hash.  Revert change to show_attributes.  Removed
column from collections show_recent.  Reverted python tests to correspond to
behavior of pre-3036 API server so test pass.

10 years agoFix run_test_server Keep blob filename handling.
Brett Smith [Wed, 20 Aug 2014 20:42:11 +0000 (16:42 -0400)]
Fix run_test_server Keep blob filename handling.

No issue #.

10 years ago3504: CollectionReader accepts arvados object collection uuids. 'arv-put' sets
Peter Amstutz [Wed, 20 Aug 2014 20:33:27 +0000 (16:33 -0400)]
3504: CollectionReader accepts arvados object collection uuids.  'arv-put' sets
owner_uuid when collection is created.  Fixed indentation.

10 years ago3036: Fix arv-put to write name/owner of collections object directly when
Peter Amstutz [Wed, 20 Aug 2014 02:10:10 +0000 (22:10 -0400)]
3036: Fix arv-put to write name/owner of collections object directly when
'name' field is present on the returned object.  Python SDK tests pass.

10 years ago2800: run_test_server only uses tests/tmp for real Python tests.
Brett Smith [Wed, 20 Aug 2014 20:08:38 +0000 (16:08 -0400)]
2800: run_test_server only uses tests/tmp for real Python tests.

tests/tmp is not available for Go tests.
This fixes a bug introduced in da01d7e1.
No issue #.

10 years agoUpdate "standard objects" page to reflect change from keep_disks to
Tom Clegg [Wed, 20 Aug 2014 20:05:11 +0000 (16:05 -0400)]
Update "standard objects" page to reflect change from keep_disks to
keep_services, and add some sanity checks. No issue #

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Wed, 20 Aug 2014 19:54:12 +0000 (15:54 -0400)]
Merge branch 'master' into 3112-report-bug

10 years agoAdd libpcre3-dev dependency. Sort package names in apt-get install command.
Tom Clegg [Wed, 20 Aug 2014 19:51:41 +0000 (15:51 -0400)]
Add libpcre3-dev dependency. Sort package names in apt-get install command.

No issue #

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Wed, 20 Aug 2014 19:33:18 +0000 (15:33 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years ago3153: update the new user email to include a phrase saying the user is setup when...
radhika [Wed, 20 Aug 2014 19:29:29 +0000 (15:29 -0400)]
3153: update the new user email to include a phrase saying the user is setup when config is on.

10 years ago2800: Delay API client creation in Python CollectionReader.
Brett Smith [Wed, 20 Aug 2014 19:12:20 +0000 (15:12 -0400)]
2800: Delay API client creation in Python CollectionReader.

This more closely matches prior behavior, and is necessary to make the
Keep tests pass.  See included comments for detailed rationale.
Refs #2800.

10 years agoTreat success=true exitcode!=0 as success when collating output,
Tom Clegg [Wed, 20 Aug 2014 19:04:33 +0000 (15:04 -0400)]
Treat success=true exitcode!=0 as success when collating output,
just like we did when we decided the task completed. No issue #

10 years ago3153: tests with duplicate username
radhika [Wed, 20 Aug 2014 18:36:25 +0000 (14:36 -0400)]
3153: tests with duplicate username

10 years agoMerge branch '2800-pysdk-no-global-keep-client-wip'
Brett Smith [Wed, 20 Aug 2014 18:18:24 +0000 (14:18 -0400)]
Merge branch '2800-pysdk-no-global-keep-client-wip'

Closes #2800, #3639.

10 years ago2800: Use local KeepClients in Python SDK tests.
Brett Smith [Wed, 20 Aug 2014 13:24:22 +0000 (09:24 -0400)]
2800: Use local KeepClients in Python SDK tests.

This improves test isolation, and demonstrates the preferred way to
use the API.

10 years ago2800: Introduce TestCaseWithServers to Python SDK.
Brett Smith [Wed, 20 Aug 2014 13:46:49 +0000 (09:46 -0400)]
2800: Introduce TestCaseWithServers to Python SDK.

This is a subclass of unittest.TestCase.  It looks for specific class
variables to launch supporting Arvados servers for subclass test
cases, taking care to adjust the environment and local Arvados
configuration to match.  Put another away, this refactors a number of
similar setUpClass/tearDownClass methods throughout the SDK tests.

10 years ago2800: Make run_test_server put Keep tempfiles in tests/tmp/.
Brett Smith [Tue, 19 Aug 2014 20:41:33 +0000 (16:41 -0400)]
2800: Make run_test_server put Keep tempfiles in tests/tmp/.

10 years ago2800: Use dedicated logger in Python SDK api module.
Brett Smith [Tue, 19 Aug 2014 20:37:42 +0000 (16:37 -0400)]
2800: Use dedicated logger in Python SDK api module.

10 years ago2800: Migrate from Keep to KeepClient in the Python SDK.
Brett Smith [Wed, 20 Aug 2014 13:46:33 +0000 (09:46 -0400)]
2800: Migrate from Keep to KeepClient in the Python SDK.

10 years ago2800: Remove global state from KeepClient.
Brett Smith [Tue, 19 Aug 2014 14:17:57 +0000 (10:17 -0400)]
2800: Remove global state from KeepClient.

This commit makes it possible to build and use a KeepClient that isn't
influenced by changes in outside state.  Changing the KeepClient based
on global state has been pushed up to the simple Keep class.

This commit changes the tests as little as possible to demonstrate
backward compatibility.  Refactoring the tests to build KeepClients
directly will come in the future.

10 years ago2800: Improve spec conformance of Python SDK KeepLocator.
Brett Smith [Tue, 19 Aug 2014 14:01:36 +0000 (10:01 -0400)]
2800: Improve spec conformance of Python SDK KeepLocator.

* Require size to immediately follow digest.
* Accept all valid hints.

10 years ago2800: Introduce config.flag_is_true() to Python SDK.
Brett Smith [Tue, 19 Aug 2014 13:59:53 +0000 (09:59 -0400)]
2800: Introduce config.flag_is_true() to Python SDK.

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Wed, 20 Aug 2014 15:43:34 +0000 (11:43 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Wed, 20 Aug 2014 15:40:49 +0000 (11:40 -0400)]
Merge branch 'master' into 3112-report-bug

10 years ago3112: update config param names for report notification
radhika [Wed, 20 Aug 2014 15:39:58 +0000 (11:39 -0400)]
3112: update config param names for report notification

10 years agoMerge branch '3499-home-project-docs-wip'
Brett Smith [Wed, 20 Aug 2014 15:18:54 +0000 (11:18 -0400)]
Merge branch '3499-home-project-docs-wip'

Closes #3516.  Refs #3499.

10 years ago3499: Update Keep tutorial for recent UI changes.
Brett Smith [Fri, 15 Aug 2014 20:08:52 +0000 (16:08 -0400)]
3499: Update Keep tutorial for recent UI changes.

10 years ago3499: Update pipeline tutorial for recent UI changes.
Brett Smith [Fri, 15 Aug 2014 19:38:04 +0000 (15:38 -0400)]
3499: Update pipeline tutorial for recent UI changes.

10 years ago3499: Improve style consistency throughout docs.
Brett Smith [Fri, 15 Aug 2014 15:44:46 +0000 (11:44 -0400)]
3499: Improve style consistency throughout docs.

* Capitalize Dashboard.

* Article use: "access Workbench," "access the Dashboard."

* Bold references to Workbench UI elements.

* Make example Arvados environment variables more realistic.

10 years agoMerge branch 'master' into 3112-report-bug
radhika [Wed, 20 Aug 2014 14:51:09 +0000 (10:51 -0400)]
Merge branch 'master' into 3112-report-bug

10 years agoMerge branch 'master' into 3112-report-bug. Also, break search testing into a separat...
radhika [Wed, 20 Aug 2014 14:31:50 +0000 (10:31 -0400)]
Merge branch 'master' into 3112-report-bug. Also, break search testing into a separate project.

Conflicts:
apps/workbench/app/controllers/application_controller.rb
apps/workbench/config/application.default.yml
apps/workbench/test/integration/application_layout_test.rb

10 years agoMerge branch '3610-pipeline-log-refresh' closes #3610
Tom Clegg [Wed, 20 Aug 2014 14:10:33 +0000 (10:10 -0400)]
Merge branch '3610-pipeline-log-refresh' closes #3610

10 years ago3610: Move live log display into its own tab, avoid clobbering with tab reload.
Tom Clegg [Wed, 20 Aug 2014 00:57:46 +0000 (20:57 -0400)]
3610: Move live log display into its own tab, avoid clobbering with tab reload.

* PipelineInstances#show gets a Log tab dedicated to the live log
  window, rather than hiding it below the components table.

* Jobs#show uses its Log tab to show a live log window (instead of a
  teaser) when the log is not yet finished/written to disk.

* In both cases, the live log window's tab pane intercepts and ignores
  the arv:tab:reload event. (Previously, in addition to appending log
  entries to the live window, websocket events would trigger a
  "refresh all tabs" event, which would blow away the whole log viewer
  anyway.)

* Behave sensibly when multiple lines of stderr arrive in a single
  websocket update event.

* Stop displaying "update {pipeline-uuid}" messages that have no
  additional content.

* Stop scrolling to bottom every time an ajax:complete fires
  somewhere. (Previously, seeing anything above the last page of logs
  was somewhere between annoying and impossible.)

* Make the log window taller.

10 years agoMerge branch 'master' into 3153-auto-setup-user
radhika [Tue, 19 Aug 2014 21:30:26 +0000 (17:30 -0400)]
Merge branch 'master' into 3153-auto-setup-user

10 years ago3153: auto-setup user during creation.
radhika [Tue, 19 Aug 2014 21:29:46 +0000 (17:29 -0400)]
3153: auto-setup user during creation.

10 years agoMerge branch 'master' into 3504-clients-compatible-with-3036
Peter Amstutz [Tue, 19 Aug 2014 15:05:33 +0000 (11:05 -0400)]
Merge branch 'master' into 3504-clients-compatible-with-3036

10 years ago3504: Fix collection chooser. Fix generic link render to use uuid if nothing
Peter Amstutz [Tue, 19 Aug 2014 13:40:07 +0000 (09:40 -0400)]
3504: Fix collection chooser.  Fix generic link render to use uuid if nothing
else is available.  Fix tags for objects other than collections.

10 years ago3504: Fix collection page rendering to work with collections as regular uuids.
Peter Amstutz [Tue, 19 Aug 2014 03:13:19 +0000 (23:13 -0400)]
3504: Fix collection page rendering to work with collections as regular uuids.
Render tags onn project page.  Improve helper function for rendering links to
Arvados objects.

10 years agoMerge branch '3114-copy-to-project' closes #3114
Tom Clegg [Mon, 18 Aug 2014 22:58:06 +0000 (18:58 -0400)]
Merge branch '3114-copy-to-project' closes #3114