[ARVADOS] updated: c912d9d8d9e2a055a53967c5b01242c321dfbeb6

git at public.curoverse.com git at public.curoverse.com
Mon Mar 10 17:08:06 EDT 2014


Summary of changes:
 apps/workbench/app/assets/javascripts/editable.js  |   10 ++-
 apps/workbench/app/assets/javascripts/selection.js |   25 +++--
 .../app/assets/stylesheets/application.css.scss    |    7 --
 .../app/controllers/actions_controller.rb          |   99 ++++++++++++++++++++
 .../app/controllers/collections_controller.rb      |   12 ++-
 apps/workbench/app/controllers/jobs_controller.rb  |    5 +-
 .../controllers/pipeline_instances_controller.rb   |    2 +
 apps/workbench/app/helpers/collections_helper.rb   |    2 +-
 apps/workbench/app/helpers/provenance_helper.rb    |   50 +++++++---
 apps/workbench/app/models/collection.rb            |   19 +----
 .../app/views/collections/_show_files.html.erb     |   56 ++++++------
 .../app/views/layouts/application.html.erb         |    5 +-
 apps/workbench/config/routes.rb                    |    3 +
 sdk/python/bin/arv-normalize                       |   17 +++-
 14 files changed, 229 insertions(+), 83 deletions(-)
 create mode 100644 apps/workbench/app/controllers/actions_controller.rb

       via  c912d9d8d9e2a055a53967c5b01242c321dfbeb6 (commit)
       via  26114a84293ea3fbcc5ef4adcf7900060716e62c (commit)
       via  5420797c32e73347a79b5ecd8cdfbd212fd8aae8 (commit)
       via  239cbf3997a084ae388ad89bdd7577f21d829251 (commit)
       via  ff7803d40cbfbf47a348d4e4eec7d6e48742bbeb (commit)
       via  9ba66dcc4f4c166fa08512ce0c75e324f26c7b0d (commit)
       via  38b9c64d051ebf0d1e430c498249caf608dcce2f (commit)
       via  550e20e00518ce51054e9c52549e77f74d033eba (commit)
      from  a2107d5fc7982769c2d667e51656a6e2529d9bc9 (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 c912d9d8d9e2a055a53967c5b01242c321dfbeb6
Merge: a2107d5 26114a8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 10 17:08:46 2014 -0400

    Merge branch '2042-new-collection-from-selected-files'

diff --cc apps/workbench/app/assets/javascripts/editable.js
index adb49d7,79bad15..e37b944
--- a/apps/workbench/app/assets/javascripts/editable.js
+++ b/apps/workbench/app/assets/javascripts/editable.js
@@@ -9,9 -17,3 +17,9 @@@ $.fn.editable.defaults.params = functio
      a[key][params.name] = params.value;
      return a;
  };
 +
 +$.fn.editable.defaults.validate = function (value) {
 +    if (value == "***invalid***") {
 +        return "Invalid selection";
 +    }
- }
++}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list