[ARVADOS] updated: a1e0f75938c65b827396e6796e9ccb99eecfe608

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/select_modal.js         | 39 +++++++++++++
 .../app/assets/stylesheets/folders.css.scss        | 16 +++++-
 .../app/assets/stylesheets/select_modal.css.scss   |  3 +
 .../app/controllers/application_controller.rb      | 24 +++-----
 .../app/controllers/folders_controller.rb          | 65 ++++++++++++++--------
 apps/workbench/app/models/arvados_base.rb          | 13 +++--
 apps/workbench/app/views/folders/_choose.html.erb  | 42 ++++++++++++++
 apps/workbench/app/views/folders/_choose.js.erb    |  8 +++
 .../app/views/folders/_show_folders.html.erb       | 29 ++++++++++
 .../app/views/folders/_show_my_folders.html.erb    |  2 -
 .../views/folders/_show_shared_with_me.html.erb    |  2 -
 apps/workbench/app/views/folders/show.html.erb     | 35 ++++++++++--
 .../app/views/layouts/application.html.erb         | 15 ++---
 apps/workbench/config/routes.rb                    |  1 +
 apps/workbench/test/integration/folders_test.rb    | 41 +++++++++++++-
 services/api/app/models/group.rb                   | 16 ++++++
 16 files changed, 279 insertions(+), 72 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/select_modal.js
 create mode 100644 apps/workbench/app/assets/stylesheets/select_modal.css.scss
 create mode 100644 apps/workbench/app/views/folders/_choose.html.erb
 create mode 100644 apps/workbench/app/views/folders/_choose.js.erb
 create mode 100644 apps/workbench/app/views/folders/_show_folders.html.erb
 delete mode 100644 apps/workbench/app/views/folders/_show_my_folders.html.erb
 delete mode 100644 apps/workbench/app/views/folders/_show_shared_with_me.html.erb

       via  a1e0f75938c65b827396e6796e9ccb99eecfe608 (commit)
       via  6df740c374ba869fd2aba618ab6d26ef641b6efd (commit)
       via  b25c3bd978ccc68b42b3b68392863456fe4441fa (commit)
       via  7c8e4a8d357ad8140eab83687c36cafd4e110e71 (commit)
       via  56d21dc3d5823117729df3db6186da96f277b328 (commit)
       via  7a82503a45c632918f8f032913dbbf6711a02e2e (commit)
       via  c95e2762749ac2eb98fd7aec45134549174213d8 (commit)
       via  84decc8949fc51ec2eaf906fc2c4cbbb3df807dd (commit)
       via  5aac4c685edaa685c255dcf79aefde46c267e6d7 (commit)
       via  8ab98660dfc1973cced8b1deed355336cf4c5e64 (commit)
       via  540dbe405430bc8d58a07cfff141b4b4bc9811c1 (commit)
       via  8f20c1723c0614fabedb2c2468932d9245a1fc86 (commit)
      from  2b2adb421b9b82b75fe8a635442dfe8e1fab775a (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 a1e0f75938c65b827396e6796e9ccb99eecfe608
Merge: 2b2adb4 6df740c
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue May 27 10:44:56 2014 -0400

    2760: Merge branch '2760-folder-hierarchy' refs #2760


commit 6df740c374ba869fd2aba618ab6d26ef641b6efd
Merge: b25c3bd 8633979
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue May 27 10:17:33 2014 -0400

    2760: Merge branch 'master' into 2760-folder-hierarchy


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


hooks/post-receive
--