[ARVADOS] updated: 8453812fac25bae327b8fa52c5a920b1d921e8be

git at public.curoverse.com git at public.curoverse.com
Wed Dec 10 02:16:11 EST 2014


Summary of changes:
 apps/workbench/Gemfile                             |   2 +
 apps/workbench/Gemfile.lock                        |   2 +
 .../app/assets/javascripts/angular_shim.js         |  12 +
 .../app/assets/javascripts/application.js          |   7 +-
 .../app/assets/javascripts/arvados_client.js       | 101 +++++
 apps/workbench/app/assets/javascripts/tab_panes.js |   2 +-
 .../app/assets/javascripts/upload_to_collection.js | 476 +++++++++++++++++++++
 .../app/assets/stylesheets/application.css.scss    |  15 +-
 .../app/controllers/application_controller.rb      |  14 +-
 .../app/controllers/collections_controller.rb      |   4 +-
 .../app/views/collections/_show_upload.html.erb    |  66 +++
 .../app/views/layouts/application.html.erb         |   4 +-
 .../app/views/projects/_show_dashboard.html.erb    |  14 +-
 apps/workbench/app/views/projects/show.html.erb    |  50 ++-
 .../app/views/users/_add_ssh_key_popup.html.erb    |   6 +-
 .../app/views/users/_manage_ssh_keys.html.erb      |   6 +-
 .../test/integration/collection_upload_test.rb     | 100 +++++
 .../workbench/test/integration/collections_test.rb |   2 +-
 .../test/integration/pipeline_instances_test.rb    |   6 +-
 apps/workbench/test/test_helper.rb                 |  14 +
 .../api_client_authorizations.js.coffee            |   3 -
 .../app/assets/javascripts/api_clients.js.coffee   |   3 -
 services/api/app/assets/javascripts/application.js |   9 -
 .../assets/javascripts/authorized_keys.js.coffee   |   3 -
 .../app/assets/javascripts/collections.js.coffee   |   3 -
 .../assets/javascripts/commit_ancestors.js.coffee  |   3 -
 .../api/app/assets/javascripts/commits.js.coffee   |   3 -
 .../api/app/assets/javascripts/groups.js.coffee    |   3 -
 .../api/app/assets/javascripts/humans.js.coffee    |   3 -
 .../api/app/assets/javascripts/job_tasks.js.coffee |   3 -
 services/api/app/assets/javascripts/jobs.js.coffee |   3 -
 .../app/assets/javascripts/keep_disks.js.coffee    |   3 -
 .../api/app/assets/javascripts/links.js.coffee     |   3 -
 services/api/app/assets/javascripts/logs.js.coffee |   3 -
 services/api/app/assets/javascripts/nodes.js       |  17 -
 .../api/app/assets/javascripts/nodes.js.coffee     |   3 -
 .../javascripts/pipeline_instances.js.coffee       |   3 -
 .../javascripts/pipeline_templates.js.coffee       |   3 -
 .../app/assets/javascripts/repositories.js.coffee  |   3 -
 .../api/app/assets/javascripts/specimens.js.coffee |   3 -
 .../api/app/assets/javascripts/traits.js.coffee    |   3 -
 .../assets/javascripts/virtual_machines.js.coffee  |   3 -
 services/api/test/fixtures/collections.yml         |  11 +
 43 files changed, 854 insertions(+), 146 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/angular_shim.js
 create mode 100644 apps/workbench/app/assets/javascripts/arvados_client.js
 create mode 100644 apps/workbench/app/assets/javascripts/upload_to_collection.js
 create mode 100644 apps/workbench/app/views/collections/_show_upload.html.erb
 create mode 100644 apps/workbench/test/integration/collection_upload_test.rb
 delete mode 100644 services/api/app/assets/javascripts/api_client_authorizations.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/api_clients.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/application.js
 delete mode 100644 services/api/app/assets/javascripts/authorized_keys.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/collections.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/commit_ancestors.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/commits.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/groups.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/humans.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/job_tasks.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/jobs.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/keep_disks.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/links.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/logs.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/nodes.js
 delete mode 100644 services/api/app/assets/javascripts/nodes.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/pipeline_instances.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/pipeline_templates.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/repositories.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/specimens.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/traits.js.coffee
 delete mode 100644 services/api/app/assets/javascripts/virtual_machines.js.coffee

       via  8453812fac25bae327b8fa52c5a920b1d921e8be (commit)
       via  a311c787bd6f87abb6c1e4659cb02bc936b6ab9d (commit)
       via  4b88dab6ed8e3b583f0e4c1ea8b8e01adad4a6ad (commit)
       via  26196fc6633eb89ed3da425a73b601c5d1e376f2 (commit)
       via  00b0287c6ed1bdadd9e31bc2e2b5c0607be19114 (commit)
       via  44365f7532b85d73322b1a702bf458b489ee0e27 (commit)
       via  28cb528637cb4326def40d07d349108acce3d383 (commit)
       via  2d5c3de5600cd820e783a27e5d9ebceb6847f9c1 (commit)
       via  09cfb0083e572a6259b6e4d8dbed34a720b847aa (commit)
       via  3c06d760206dd94cc7f4ef5d59cbc1f419694f8d (commit)
       via  f180576ff3ec675e5ad27856a83773166ac6a5ca (commit)
       via  15277a3441d22e42b8291c64360d62e1e8355921 (commit)
       via  9afedf94c89f7545c2d46d9611250edb5174eda5 (commit)
       via  8475c105488dd42720abd071e9c3efe378b362f7 (commit)
       via  590cc75e138c891b2608d14ac5678035bc89e363 (commit)
       via  f74392126de1e4871d953fd5de7057c99fa30574 (commit)
       via  d013a55fb81f2dc7bdd521988b862cc54b7fabb5 (commit)
       via  f08c7181ff8a90060c8184f04d7d3da1e856c336 (commit)
       via  254bd074877ddc11a0ff846e2eb740dbfaa059fe (commit)
       via  90ecd742ac7b8560634d6f9ad557d149954596ad (commit)
       via  e320b9009a294a81a68e56e1998782c445d1affe (commit)
       via  caf3ebfb538efbfc0b2e3b360186d68bdb78b744 (commit)
       via  1701a77ed3bfbdf226d5877153f0ec393a8ec2e7 (commit)
       via  7bc525d5a14a19c4dbbe89e71516372a5190c4b3 (commit)
       via  fd20255387eccdcc9bf05f61131dca4835f1a57d (commit)
       via  1c8feea9305ca6fa78ddf1875f893304c3739db8 (commit)
       via  a7027755c735dcc063337fd3480606560c9783c2 (commit)
       via  dba925a5f1f7b566033bc993dacc0e9ec4e6dc57 (commit)
       via  db09f10caad8043d73834e5cad99f9235ec4fb4b (commit)
       via  f59d6d76acf9c6f5bb95c5902b2c9a1cca427e93 (commit)
       via  29b0dccdf90d3cf1e7472f0653cc9a38cbbadc26 (commit)
       via  12b9d77ecca3043b65015860359ce447b68fccfb (commit)
       via  556503e1f98b8e262fcc1227ac4afdc78a2c05ca (commit)
       via  03d9a63f77f5f1672186547870ef55c42e3a16a2 (commit)
      from  63f3b6068971a29723fd2b1902a0c71baaffa2f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8453812fac25bae327b8fa52c5a920b1d921e8be
Merge: 63f3b60 a311c78
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Dec 10 02:15:13 2014 -0500

    Merge branch '3781-browser-upload' closes #3781


-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list