[ARVADOS] updated: 34081b99f265f9baaabcd791f7c520c3f5b37f19
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 5 15:01:23 EDT 2014
Summary of changes:
apps/workbench/Gemfile | 2 +
apps/workbench/Gemfile.lock | 36 ++++++
.../app/controllers/collections_controller.rb | 15 ++-
apps/workbench/app/models/collection.rb | 32 +++--
.../app/views/collections/_show_recent.html.erb | 74 ++++++------
.../app/views/collections/show_file_links.html.erb | 7 +-
sdk/cli/Gemfile | 2 +-
sdk/cli/Gemfile.lock | 42 ++++---
sdk/cli/bin/arv | 2 +-
sdk/cli/bin/crunch-job | 22 +++-
sdk/ruby/arvados.gemspec | 2 +-
sdk/ruby/lib/arvados/keep.rb | 134 +++++++++++++++++++++
sdk/ruby/test/test_big_request.rb | 21 ++--
sdk/ruby/test/test_keep_manifest.rb | 87 +++++++++++++
services/api/.gitignore | 1 -
services/api/Gemfile | 3 +-
services/api/Gemfile.lock | 7 +-
.../api/app/assets/stylesheets/application.css | 2 +-
.../arvados/v1/collections_controller.rb | 14 +--
.../controllers/arvados/v1/schema_controller.rb | 20 +--
services/api/app/models/collection.rb | 100 +++------------
services/api/app/models/locator.rb | 104 ----------------
.../api/app/views/layouts/application.html.erb | 2 +-
services/api/app/views/static/intro.html.erb | 10 +-
.../api/app/views/static/login_failure.html.erb | 2 +-
.../arvados/v1/collections_controller_test.rb | 52 +-------
26 files changed, 430 insertions(+), 365 deletions(-)
create mode 100644 sdk/ruby/lib/arvados/keep.rb
create mode 100644 sdk/ruby/test/test_keep_manifest.rb
delete mode 100644 services/api/app/models/locator.rb
via 34081b99f265f9baaabcd791f7c520c3f5b37f19 (commit)
via a6a9e10686e3ffc8c56b0aad61633524be7e5cc4 (commit)
via 9564076de96d8c0084cf00f47348c41d6abfe673 (commit)
via 33a6cc0d0b748b4ec5a01db6218b8fa21afb11ed (commit)
via f94f97fe63d3d860d373a25d3539d559b53542c5 (commit)
via 41c7f2010ebdbb76fada25a21f184e2d1f4049b3 (commit)
via 0c3c1a495e8048195151d30d831208a5c75e36f0 (commit)
via d13ad5bbb7f5e74cb43d0570d9d1a8159237f5ff (commit)
via d95e85ac808f5fedfaf573d3b5fcc0bb02605f38 (commit)
via ac80f69f2a4469891f70b86c9c196e3ebd256081 (commit)
from 74ac5edcb6ecff4003ec70cf904c900392a31814 (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 34081b99f265f9baaabcd791f7c520c3f5b37f19
Merge: a6a9e10 33a6cc0
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 5 15:00:53 2014 -0400
Merge branch 'master' into 3654-combine-selections
commit a6a9e10686e3ffc8c56b0aad61633524be7e5cc4
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 5 14:58:05 2014 -0400
3654: add selection dropdown to collections page
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index a041843..15e97c1 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -49,8 +49,6 @@
<% end %>
-</div>
-
<%= render partial: "paging", locals: {results: @collections, object: @object} %>
<% content_for :footer_js do %>
@@ -59,3 +57,5 @@ $(document).on('click', 'form[data-remote] input[type=submit]', function() {
return true;
});
<% end %>
+
+</div>
commit 9564076de96d8c0084cf00f47348c41d6abfe673
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 5 14:45:07 2014 -0400
3654: add selection dropdown to collections page
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 9573f6e..a041843 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -17,45 +17,45 @@
</div>
<p/>
- <%= render partial: "paging", locals: {results: @collections, object: @object} %>
-
- <div style="padding-right: 1em">
-
- <%= form_tag do |f| %>
-
- <table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
- <colgroup>
- <col width="10%" />
- <col width="10%" />
- <col width="40%" />
- <col width="10%" />
- <col width="30%" />
- </colgroup>
- <thead>
- <tr class="contain-align-left">
- <th></th>
- <th>uuid</th>
- <th>contents</th>
- <th>created at</th>
- <th>tags</th>
- </tr>
- </thead>
- <tbody>
- <%= render partial: 'index_tbody' %>
- </tbody>
- </table>
-
- <% end %>
+<%= render partial: "paging", locals: {results: @collections, object: @object} %>
- </div>
+<div style="padding-right: 1em">
+
+<%= form_tag do |f| %>
- <%= render partial: "paging", locals: {results: @collections, object: @object} %>
+</div>
- <% content_for :footer_js do %>
- $(document).on('click', 'form[data-remote] input[type=submit]', function() {
- $('table#collections-index tbody').fadeTo(200, 0.3);
- return true;
- });
- <% end %>
+<table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
+ <colgroup>
+ <col width="10%" />
+ <col width="10%" />
+ <col width="40%" />
+ <col width="10%" />
+ <col width="30%" />
+ </colgroup>
+ <thead>
+ <tr class="contain-align-left">
+ <th></th>
+ <th>uuid</th>
+ <th>contents</th>
+ <th>created at</th>
+ <th>tags</th>
+ </tr>
+ </thead>
+ <tbody>
+ <%= render partial: 'index_tbody' %>
+ </tbody>
+</table>
+
+<% end %>
</div>
+
+<%= render partial: "paging", locals: {results: @collections, object: @object} %>
+
+<% content_for :footer_js do %>
+$(document).on('click', 'form[data-remote] input[type=submit]', function() {
+ $('table#collections-index tbody').fadeTo(200, 0.3);
+ return true;
+});
+<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list