[ARVADOS] updated: 7aff46a6515cfb7531eaad04495430b0487d8375
git at public.curoverse.com
git at public.curoverse.com
Mon Jan 13 11:48:30 EST 2014
Summary of changes:
apps/workbench/Gemfile | 1 +
apps/workbench/Gemfile.lock | 3 +
.../app/controllers/application_controller.rb | 7 +-
.../app/controllers/collections_controller.rb | 1 +
apps/workbench/app/models/arvados_api_client.rb | 41 +++-
apps/workbench/app/models/repository.rb | 3 +
apps/workbench/app/models/virtual_machine.rb | 1 -
.../views/application/_arvados_attr_value.html.erb | 16 ++
.../app/views/application/_arvados_object.html.erb | 42 ++++
.../application/_arvados_object_attr.html.erb | 19 +--
.../app/views/authorized_keys/index.html.erb | 4 +-
apps/workbench/app/views/collections/show.html.erb | 21 ++-
.../app/views/layouts/application.html.erb | 15 +-
.../app/views/repositories/index.html.erb | 8 +-
.../app/views/user_agreements/index.html.erb | 39 +++-
.../views/users/{home.html.erb => _home.html.erb} | 4 +-
.../app/views/users/_notifications.html.erb | 10 +-
.../app/views/users/_quick_links.html.erb | 10 -
apps/workbench/app/views/users/_tables.html.erb | 20 +-
apps/workbench/app/views/users/home.html.erb | 74 +------
apps/workbench/app/views/users/welcome.html.erb | 15 +-
.../app/views/virtual_machines/index.html.erb | 4 +-
.../config/environments/development.rb.example | 7 +
.../config/environments/production.rb.example | 7 +
apps/workbench/config/environments/test.rb.example | 7 +
apps/workbench/config/routes.rb | 2 +
crunch_scripts/pgp-survey-import | 12 +-
doc/api/schema/Link.textile | 65 ++++--
doc/api/schema/Log.textile | 12 +-
doc/gen_api_schema_docs.py | 77 +++++++
doc/user/getting_started/community.textile | 25 ++
doc/user/getting_started/ssh-access.textile | 18 ++-
doc/user/reference/sdk-cli.textile | 3 +
doc/user/reference/sdk-python.textile | 8 -
doc/user/tutorials/tutorial-firstscript.textile | 2 +-
doc/user/tutorials/tutorial-trait-search.textile | 19 +-
docker/Makefile | 19 +-
docker/mkimage-debootstrap.sh | 8 +-
sdk/cli/arvados-cli.gemspec | 3 +-
sdk/cli/bin/arv | 36 +++-
sdk/cli/bin/arv-tag | 232 ++++++++++++++++++++
sdk/python/arvados/__init__.py | 20 ++-
.../api/app/controllers/application_controller.rb | 13 +
services/api/app/controllers/static_controller.rb | 2 +-
.../api/config/environments/development.rb.example | 3 +
.../api/config/environments/production.rb.example | 3 +
services/api/config/environments/test.rb.example | 3 +
services/api/script/rails | 2 +-
48 files changed, 731 insertions(+), 235 deletions(-)
create mode 100644 apps/workbench/app/views/application/_arvados_attr_value.html.erb
copy apps/workbench/app/views/users/{home.html.erb => _home.html.erb} (96%)
delete mode 100644 apps/workbench/app/views/users/_quick_links.html.erb
create mode 100755 doc/gen_api_schema_docs.py
create mode 100644 doc/user/getting_started/community.textile
create mode 100755 sdk/cli/bin/arv-tag
via 7aff46a6515cfb7531eaad04495430b0487d8375 (commit)
via ff458bd54745cc49632324f29934039a623f4287 (commit)
via 83f85a702927b37236b88ab9633d8e0e918e1218 (commit)
via 08a34a30d20d9adf5c1a87769a756a5fec87de71 (commit)
via e47f06d00fa65678102594eb6a85b0aba298b33c (commit)
via de09cec28729344b8bde815019563082b8e57fb5 (commit)
via 6696af28df909c0eb45f6cee8e7a3fc1d5658104 (commit)
via a999d262ee97000ed313cd4c127e0acf55e98c08 (commit)
via c2de465791157effa0b4d95fafe46e6976665439 (commit)
via 425cd406f61d2de51cd8d5923a22d6d54b9f6809 (commit)
via 7a8a6173026630b649a25d2c70d796d7f21dfb97 (commit)
via 4068171eb8ee0cb9fd57e10ff024e04464438891 (commit)
via 6ff244f2613d1f93f644f627f4cc5ba72790861f (commit)
via b4ca2d58ba0a42be2978d2d4a87c16a98d105e5a (commit)
via a61fbab411d08e5d7a1cbf5e9a9c711b7f2d601f (commit)
via f6911c2c1b39de18b136a6cf9566dba3089b33c2 (commit)
via 0c1b35bbef95a30c78f9ac79f3d4218e1f53ab0b (commit)
via 500c751e4c2b4903e35f97f65a675bd4dacf5ad6 (commit)
via 7f1b2e9a8faeafff938efdf9e1f93c68d6a2669a (commit)
via 4c259d9a05439830f3496166b5c6b92eb0f39de8 (commit)
via 29c763eb4a438cbaf48ad0a188a01e69b9ecebb8 (commit)
via ad6b2213951d8e2b0ec41e7b1aff70a32b75de9f (commit)
via 9ab5271a6bdd7a2b24f238e6348580bde850f2e4 (commit)
via b8c506206be876987bf17c6cacd2c01687b1c35a (commit)
via 20f1e7eaf6053d52210002720e2b0a0c26e5169e (commit)
via 2face69c76f5aa42b2204bf89d5194e83fca23c8 (commit)
via c190e60459f50d4a93f1a8f14315ea131f1e038a (commit)
via 79ee8eac7e5731b27375cc7f06cac109f26287ea (commit)
via ce02e1cb45e3189e5dbf9f517cc09ab3aaf1934f (commit)
via deef76cfbc581937c2327ba9178a9c84b8b1a97c (commit)
via 10c628c825ca50e7a054606da85947cbeff2f16f (commit)
via aefca1ea37be9e98c9ee07be918fa8249212faa8 (commit)
via d21013863bd48c838ee6148d30c9be26724411cc (commit)
via b411e0383ea297f76feb492ee99d52142491fb23 (commit)
via e4960a9fc343876bfa89f6354d4ac8867a949609 (commit)
via 0b9a7fb2c29104c40978ca4e97b8c1ecd2573d69 (commit)
via 810f32f306534bf9f16798608e550ef6e0b8025e (commit)
via 0fa7c220a6f9e0deb220fd3036aa89eb9f2a7599 (commit)
via ce5bfc0d76b442619c5c0376a16abdbb09605d92 (commit)
via 29c142861ce9da3f1cdb8a4c01185842ba3bf2a6 (commit)
via 75a6e153ef17e810565154a63a6dc48d869a66d3 (commit)
via 597fa321274909eb32af0c49a540f9fc07f13f7f (commit)
via ea12358e131b3528e101720edf896f074197dc1c (commit)
via e3d7eac7aa7067e32c0c8de26e66d84f370a7de8 (commit)
via 8966e4255dc7c507abbd7cb2bbd319e2da070e9a (commit)
via 36ca0d3ede8554a229d6872b151b7e79ce959ba9 (commit)
via c541edf2f95153dc2fc2fdd82182262a2ad30b43 (commit)
via fccdb6c00289936de09e3f911e2a5805a7df3281 (commit)
via 5cf53c5f133040aa21ebfb4e7687e8759cfea636 (commit)
via 7546b1b3ffb7ef649333c04c58eec6cdb7dd7ddd (commit)
via c8471ae15fddf918fd77045491aca20b3371b3d0 (commit)
via 7e951eab94d0c984779b673d915c2736e730103b (commit)
via 04eaf6ed0818f876017f59b3e22157a0165ad706 (commit)
via fe6783db8366694c5ac0a886eb00fa3f147f7a70 (commit)
via f7c6991be9078fffb8b200e83012c33a60ad4c18 (commit)
via 6562cb9dce40bee18424cab67b76b524f33e8c9a (commit)
via 037ee894b89df08f855e08b701f20944ec17dcf7 (commit)
via 30c250473cd62b845acbec8a9af182410d572873 (commit)
via 4c69fbec263b5eeea23d11ee93fb002d028e2b6f (commit)
via c185e2e2eb0a411b40e8d34c5e0bfe31addedcff (commit)
via 6376dc9ef711e339c10e17349eee4c0fc022899c (commit)
via c4afede392e6128009f24ec6eb7f87ef9f3869cb (commit)
via c2d962b16eb0a68a880326abfbc04d07db230815 (commit)
via 37a977fcc8d0fe24b0316d952349d7a7b09625c1 (commit)
via 259d69ccefce787f5d2a4f2828ac4b0135432c87 (commit)
via b54435b16c3f6b22d4526d543c276c314143d124 (commit)
from 11a238896a160b8dba4e185a369cda1fd4a55609 (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 7aff46a6515cfb7531eaad04495430b0487d8375
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 13 11:49:06 2014 -0500
Reworked Files tab of collection view a bit.
diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index d525c78..057ced8 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -32,9 +32,13 @@
<tr>
<th style="width: 10em; text-align:right">size</th>
<th>
- <div style="width:3.5em; display:inline-block"></div>
path
</th>
+ <th>
+ file
+ </th>
+ <th style="width:2em">
+ </th>
</tr>
</thead><tbody>
<% if @object then @object.files.sort_by{|f|f[1]}.each do |file| %>
@@ -42,14 +46,17 @@
<tr>
<td style="text-align:right">
<%= raw(human_readable_bytes_html(file[2])) %>
- </td><td>
- <div style="width:3.5em; display:inline-block">
+ </td>
+ <td>
+ <%= file[0] %>
+ </td>
+ <td>
+ <%= link_to file[1], {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'inline'}, {title: 'View in browser'} %>
+ </td>
+ <td>
+ <div style="display:inline-block">
<%= link_to raw('<i class="icon-download"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'attachment'}, {class: 'label label-info', title: 'Download'} %>
- <% if file_path.match /\.(txt|pdf|png|jpe?g|gif|tiff?|html?)$/i %>
- <%= link_to raw('<i class="icon-play"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'inline'}, {class: 'label label-info', title: 'View in browser'} %>
- <% end %>
</div>
- <%= file_path %>
</td>
</tr>
<% end; end %>
commit ff458bd54745cc49632324f29934039a623f4287
Merge: 08a34a3 83f85a7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 13 11:36:25 2014 -0500
Merge branch 'master' of git.clinicalfuture.com:arvados
commit 08a34a30d20d9adf5c1a87769a756a5fec87de71
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Jan 10 17:10:29 2014 -0500
Typo fix
diff --git a/doc/user/tutorials/tutorial-firstscript.textile b/doc/user/tutorials/tutorial-firstscript.textile
index bfde02c..dbc3631 100644
--- a/doc/user/tutorials/tutorial-firstscript.textile
+++ b/doc/user/tutorials/tutorial-firstscript.textile
@@ -39,7 +39,7 @@ This will create an git checkout in the directory called @you at .
{% include notebox-begin.html %}
For more information about using @git@, try
-notextile. <pre><code>$ <span class="userinput">man gittutoral</span></code></pre>
+notextile. <pre><code>$ <span class="userinput">man gittutorial</span></code></pre>
or "click here to search Google for git tutorials":http://google.com/#q=git+tutorial
{% include notebox-end.html %}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list