[ARVADOS] updated: a2107d5fc7982769c2d667e51656a6e2529d9bc9

git at public.curoverse.com git at public.curoverse.com
Mon Mar 10 17:04:24 EDT 2014


Summary of changes:
 apps/workbench/Gemfile                             |    3 +-
 apps/workbench/Gemfile.lock                        |    2 +
 .../app/assets/javascripts/application.js          |    3 +-
 apps/workbench/app/assets/javascripts/editable.js  |    9 +-
 .../app/assets/javascripts/pipeline_instances.js   |   46 ++++++
 .../javascripts/pipeline_instances.js.coffee       |    3 -
 apps/workbench/app/assets/javascripts/selection.js |  167 ++++++++++++++++++++
 apps/workbench/app/assets/javascripts/sizing.js    |    4 +-
 .../app/assets/stylesheets/application.css.scss    |   18 ++-
 .../assets/stylesheets/pipeline_templates.css.scss |   27 +++
 .../workbench/app/assets/stylesheets/selection.css |   29 ++++
 .../app/controllers/application_controller.rb      |    2 +
 .../app/controllers/keep_disks_controller.rb       |    5 +
 .../controllers/pipeline_instances_controller.rb   |   46 ++++++
 .../controllers/pipeline_templates_controller.rb   |   13 ++
 apps/workbench/app/helpers/application_helper.rb   |  125 +++++++++++++++-
 apps/workbench/app/helpers/collections_helper.rb   |    4 +
 .../app/helpers/pipeline_instances_helper.rb       |   53 +++----
 .../app/helpers/pipeline_templates_helper.rb       |   22 +++
 apps/workbench/app/helpers/provenance_helper.rb    |    2 +-
 apps/workbench/app/models/arvados_base.rb          |   25 +++
 apps/workbench/app/models/collection.rb            |   19 +++
 apps/workbench/app/models/pipeline_instance.rb     |    4 +-
 .../app/views/application/_content.html.erb        |    5 +-
 .../app/views/application/_job_progress.html.erb   |   20 +++
 .../views/application/_job_status_label.html.erb   |   11 ++
 .../views/application/_pipeline_progress.html.erb  |    8 +
 .../application/_pipeline_status_label.html.erb    |   13 ++
 .../views/application/_selection_checkbox.html.erb |    8 +
 .../app/views/application/_show_recent.html.erb    |    9 +
 .../app/views/collections/_index_tbody.html.erb    |    3 +
 .../app/views/collections/_show_files.html.erb     |   12 ++
 .../app/views/collections/_show_recent.html.erb    |    7 +
 .../workbench/app/views/jobs/_show_recent.html.erb |   18 +--
 .../app/views/layouts/application.html.erb         |   24 +--
 .../pipeline_instances/_show_components.html.erb   |   74 +++++----
 .../views/pipeline_instances/_show_recent.html.erb |   38 ++---
 .../app/views/pipeline_instances/show.js.erb       |    1 +
 .../pipeline_templates/_show_attributes.html.erb   |   38 +----
 .../pipeline_templates/_show_components.html.erb   |    8 +
 .../_show_components_template.html.erb             |   54 +++++++
 .../pipeline_templates/_show_pipelines.html.erb    |    2 +
 .../views/pipeline_templates/_show_recent.html.erb |   22 +++
 apps/workbench/app/views/users/_tables.html.erb    |   72 ++-------
 sdk/cli/bin/arv-run-pipeline-instance              |   74 +++++++--
 services/api/Gemfile                               |    5 +
 services/api/Gemfile.lock                          |   27 +++
 services/api/app/models/pipeline_instance.rb       |    4 +
 services/api/script/crunch-dispatch.rb             |   17 ++
 49 files changed, 975 insertions(+), 230 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/pipeline_instances.js
 delete mode 100644 apps/workbench/app/assets/javascripts/pipeline_instances.js.coffee
 create mode 100644 apps/workbench/app/assets/javascripts/selection.js
 create mode 100644 apps/workbench/app/assets/stylesheets/selection.css
 create mode 100644 apps/workbench/app/views/application/_job_progress.html.erb
 create mode 100644 apps/workbench/app/views/application/_job_status_label.html.erb
 create mode 100644 apps/workbench/app/views/application/_pipeline_progress.html.erb
 create mode 100644 apps/workbench/app/views/application/_pipeline_status_label.html.erb
 create mode 100644 apps/workbench/app/views/application/_selection_checkbox.html.erb
 create mode 100644 apps/workbench/app/views/pipeline_templates/_show_components.html.erb
 create mode 100644 apps/workbench/app/views/pipeline_templates/_show_components_template.html.erb
 create mode 100644 apps/workbench/app/views/pipeline_templates/_show_pipelines.html.erb

       via  a2107d5fc7982769c2d667e51656a6e2529d9bc9 (commit)
       via  906a7cae1fc6545750fa0557ea4a055d95f385e8 (commit)
       via  535c58d7e2415a10a81d2d53b41c51709bd7e04f (commit)
       via  ac2db7d4aa32a772d9f21db3f1a8a63b1ad0ca2f (commit)
       via  ec89d136c5ba9beee861391cedb3ec93f28c9109 (commit)
       via  7c3eb5137c7863947e6da221361ba98bfef227fd (commit)
       via  fc6c801e7448c34b3b916813a8792e32f22bb7a8 (commit)
       via  1d7f33382486f55ded52fea25271224b4ad88bd4 (commit)
       via  a7c1fecd8066bb6cfc1242ce1170716230e705bb (commit)
       via  5ddf9df205f089634cc39b8398dfee5e36faac87 (commit)
       via  03bee5d2ecc62b0fe7aaae67e8d5fffcdeeb4880 (commit)
       via  720512e987798e4135254e50d920d7ccd4cba6c2 (commit)
       via  19af0137f1bfa57bbb717e488ed5d9967b9cfbe8 (commit)
       via  24e38a335377c878955e302cd11b2097cd7c5e07 (commit)
       via  fb35b803418d6f732af4273dff8d0485f02f8290 (commit)
       via  d1e378c28ab57bd0d68a09343e84628202c404cc (commit)
       via  41c7c826a7e4c3a074a6ab5a719bf4c88e9a0e28 (commit)
       via  ac5a69c5c0aaf0786023caa4599a6c55d67310bc (commit)
       via  7d0e688094e19f54f966747c8dbfbd00e7ce5149 (commit)
       via  f26cbf1c4d949d3e7c7b26ab27c5f4d48d8059ed (commit)
       via  3baf79475a93929350590d17a95b636408cd603e (commit)
       via  89355aa0e2727373fa60c781ec6c00c31a79a7dc (commit)
       via  9e778a62184d4604f62e6c30fec8d1be1781de4b (commit)
       via  da5ff6947c567dfb391af544473475c029a78ece (commit)
       via  cf1e0b3f31b643899b556c3c7ae59630a0ec7495 (commit)
       via  52838f7dfc576e8a11411fd9f1710a758573a6e7 (commit)
       via  da2803a65e696bf85883e82a0bda6ef81dda5429 (commit)
       via  b354e03622eb2e47c055b6fcc38b24c22a59ab9f (commit)
       via  ad8e91c2c580b2a6188fccafb05672b7130ec931 (commit)
       via  98f0657745f2f38c19047ef9039c52c1b0fe0659 (commit)
       via  e2bee889bc406f30b66337d823242869abe7e98d (commit)
       via  bed3cfb9cce29a86e66201807c2289b79c34efcd (commit)
      from  d182bbb9a552e3d87f5da11b4b5ade069c9eb089 (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 a2107d5fc7982769c2d667e51656a6e2529d9bc9
Merge: 906a7ca d182bbb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 10 17:04:48 2014 -0400

    Merge branch 'master' of git.clinicalfuture.com:arvados
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list