[ARVADOS] updated: 2ff5d889c8d169a85781d13edcf7988fb94cc248

git at public.curoverse.com git at public.curoverse.com
Tue Jul 29 10:28:19 EDT 2014


Summary of changes:
 .../app/assets/javascripts/application.js          |  8 +-
 .../workbench/app/assets/javascripts/filterable.js | 11 +++
 .../app/assets/javascripts/infinite_scroll.js      | 84 +++++++++++++++------
 .../app/assets/javascripts/select_modal.js         | 34 +++++++--
 .../app/assets/stylesheets/application.css.scss    |  4 +
 .../app/assets/stylesheets/select_modal.css.scss   |  3 +
 .../app/controllers/actions_controller.rb          | 11 +++
 .../app/controllers/application_controller.rb      | 40 ++++++----
 .../app/controllers/collections_controller.rb      | 14 +---
 .../workbench/app/controllers/search_controller.rb | 10 +++
 apps/workbench/app/helpers/application_helper.rb   |  9 +++
 apps/workbench/app/models/group.rb                 |  9 +++
 .../app/views/application/_choose.html.erb         | 74 +++++++++---------
 .../workbench/app/views/application/_choose.js.erb | 22 +-----
 .../views/application/_projects_tree_menu.html.erb | 10 +--
 .../app/views/collections/_choose_rows.html.erb    |  4 +-
 .../app/views/groups/_choose_rows.html.erb         |  2 +-
 apps/workbench/app/views/layouts/body.html.erb     | 19 ++++-
 .../views/pipeline_templates/_choose_rows.html.erb |  2 +-
 .../app/views/search/_choose_rows.html.erb         | 22 ++++++
 .../app/views/users/_choose_rows.html.erb          |  2 +-
 apps/workbench/config/routes.rb                    |  5 ++
 .../search_controller_test.rb}                     |  2 +-
 apps/workbench/test/helpers/search_helper_test.rb  |  4 +
 apps/workbench/test/integration/smoke_test.rb      |  3 +
 .../controllers/arvados/v1/groups_controller.rb    | 88 +++++++++++++++-------
 services/api/app/models/user.rb                    |  2 +-
 services/api/config/routes.rb                      |  1 +
 services/api/test/fixtures/groups.yml              |  2 +-
 .../arvados/v1/groups_controller_test.rb           | 27 +++++++
 services/fuse/arvados_fuse/__init__.py             |  3 +-
 31 files changed, 373 insertions(+), 158 deletions(-)
 create mode 100644 apps/workbench/app/controllers/search_controller.rb
 create mode 100644 apps/workbench/app/views/search/_choose_rows.html.erb
 copy apps/workbench/test/{unit/job_test.rb => controllers/search_controller_test.rb} (57%)
 create mode 100644 apps/workbench/test/helpers/search_helper_test.rb

       via  2ff5d889c8d169a85781d13edcf7988fb94cc248 (commit)
       via  aa35b924e64697ba41d07017f92ae1bd7bafceb1 (commit)
       via  fd372f1484ad0b7a1eb3ac430c3345dbc0f61bc5 (commit)
       via  dde8b8b6e7b3beab98d93aeacc945b6f4cef9436 (commit)
       via  2db098fbaa7d8599ccdd208033c37209b033a5db (commit)
       via  86f3157d2fa86e6b36c2d112bf2e6598e4c06b6d (commit)
       via  751d20c579152596f77b2515c1a14e7ea05a8951 (commit)
       via  259fb182a339231b16c8eee1dd0bffe45b5483ea (commit)
       via  6c7373c9d66ab358ea48ea7c1d0e59551364e064 (commit)
       via  4ad1947da490a998d68380b1520c4f95b1784676 (commit)
       via  ca417c9626eb642e0e219d3928097c561e22b860 (commit)
       via  d13e8de76d48788a9198d4581205995f45464ff3 (commit)
       via  29e5eb86b1dbbb644c244ec6e08e935c06e50d1c (commit)
       via  38deaa21b890f880d415c96534bb6d230bcc87fa (commit)
       via  35e5f5ac9f0dcfe3868e9f31c6500f1af759a1af (commit)
       via  dea31790e175096c0df8f5a395696aab940f39d7 (commit)
       via  0dca88749fcd5615bf687c916fca9157bf258998 (commit)
       via  83561af02e156758b09ea771510ad4f9ee506b06 (commit)
       via  9591cf965cc6d780a88e713e7ee3c0530397dcd7 (commit)
       via  321bd2a34076f2f21714ebb9f1b92368607930c9 (commit)
       via  1e1712c0cb2f3eb9da5759ef9b356ad52f5749b7 (commit)
       via  ddfbe0de9bfc6e3d9cb0d26466ac61bb87f5d65a (commit)
       via  381fb2d7435e6cde2adf9574ba82043ff2a13204 (commit)
       via  93059e2f0e5ff27bec5e088b822f505863369307 (commit)
       via  8c87d1cf55e096ce472fa9a749b60f2aab7fbb74 (commit)
       via  4bbd2177505ff09d6d9e77d1a1ea80523fcfd395 (commit)
       via  22193a19dd10c71ae11cba977a76c9259735ad3c (commit)
       via  8f2cb724f85d77a3ef7365d6a2a4feba58e6f0f9 (commit)
       via  4898ba78d5cc0783a319f0742bb8bc0b4c15d7be (commit)
       via  e6e3c231b08a8f9786ea04c948f79c45604da1cc (commit)
       via  32b276821cd06f6d97fbc29d91b7bc786342bf91 (commit)
       via  e32805af332dfdbb973979482e25bc5466236821 (commit)
       via  fa92b2cbdac98908040f650b994df0d233380903 (commit)
       via  889d94070d54e47ddb44afcfe457cbaed2e6a2e3 (commit)
       via  dd198047ab128658010869830b27ef6b83f5182e (commit)
       via  7bb16e4139068847fc138a0c0375a05819e7bd00 (commit)
       via  12e7019819d6e595f676eac29805b6e518733d13 (commit)
      from  aab0e7a008eecb0e3dff1e2351b3ffab3f487ebc (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 2ff5d889c8d169a85781d13edcf7988fb94cc248
Merge: aab0e7a aa35b92
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 29 10:28:06 2014 -0400

    Merge branch 'master' into 2985-selection-button-move-copy
    
    Conflicts:
    	apps/workbench/config/routes.rb


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list