[ARVADOS] updated: 0c1b35bbef95a30c78f9ac79f3d4218e1f53ab0b

git at public.curoverse.com git at public.curoverse.com
Thu Jan 9 17:17:40 EST 2014


Summary of changes:
 apps/workbench/app/views/users/welcome.html.erb |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

       via  0c1b35bbef95a30c78f9ac79f3d4218e1f53ab0b (commit)
       via  500c751e4c2b4903e35f97f65a675bd4dacf5ad6 (commit)
       via  7f1b2e9a8faeafff938efdf9e1f93c68d6a2669a (commit)
       via  4c259d9a05439830f3496166b5c6b92eb0f39de8 (commit)
      from  29c763eb4a438cbaf48ad0a188a01e69b9ecebb8 (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 0c1b35bbef95a30c78f9ac79f3d4218e1f53ab0b
Merge: 500c751 29c763e
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jan 9 17:17:30 2014 -0500

    Merge branch 'master' of git.curoverse.com:arvados


commit 500c751e4c2b4903e35f97f65a675bd4dacf5ad6
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jan 9 17:13:20 2014 -0500

    Remove hardcoded references to Arvados Workbench, replace with
    config.site_name. Also improve wording on the welcome page.

diff --git a/apps/workbench/app/views/users/welcome.html.erb b/apps/workbench/app/views/users/welcome.html.erb
index e11382f..b782108 100644
--- a/apps/workbench/app/views/users/welcome.html.erb
+++ b/apps/workbench/app/views/users/welcome.html.erb
@@ -1,17 +1,18 @@
 <%= image_tag "dax.png", style: "float: left; max-width: 25%; margin-right: 2em" %>
-<h1>Hi there!  Please log in to use Arvados Workbench.</h1>
+<h1>Hi there!  Please log in to use <%= Rails.configuration.site_name %>.</h1>
 <div class="row-fluid">
   <div class="col span8" style="margin-top: 1em">
     <div class="well clearfix">
       <p>When you click on the button below you will be taken to a Google sign-in page.
-	After entering your information, you will be redirected back to the Arvados
-	Workbench.  If you have never used Arvados before, logging in for the first
-	time will also create a new user account.  Arvados uses your your name and
-	email address from Google services only for identification, and will never
-	access any personal information.</p>
+	After entering your information, you will be redirected back to <%= Rails.configuration.site_name %>
+	If you have never used <%= Rails.configuration.site_name %> before, logging in for the first
+	time will also create a new user account. <%= Rails.configuration.site_name %> uses your name and
+	email address from Google services only for identification, and can not access any personal information
+  beyond that.
+  </p>
       <p>
 	<a  class="pull-right btn btn-primary" href="<%= $arvados_api_client.arvados_login_url(return_to: request.url) %>">
-	  Click here to log in to Arvados Workbench with a Google account</a>
+	  Click here to log in to <%= Rails.configuration.site_name %> with a Google account</a>
       </p>
     </div>
   </div>

commit 7f1b2e9a8faeafff938efdf9e1f93c68d6a2669a
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 9 09:02:58 2014 -0800

    Add "Links" entry to Data menu. closes #1852

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 6b8a352..2c44a26 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -74,6 +74,7 @@
             </a>
             <ul class="dropdown-menu">
               <li><%= link_to 'Collections', collections_path %></li>
+              <li><%= link_to 'Links', links_path %></li>
               <li><%= link_to 'Humans', humans_path %></li>
               <li><%= link_to 'Traits', traits_path %></li>
             </ul>

commit 4c259d9a05439830f3496166b5c6b92eb0f39de8
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 9 08:55:26 2014 -0800

    Add "arv delete" example.

diff --git a/doc/user/reference/sdk-cli.textile b/doc/user/reference/sdk-cli.textile
index 706fe93..17d2a3c 100644
--- a/doc/user/reference/sdk-cli.textile
+++ b/doc/user/reference/sdk-cli.textile
@@ -58,6 +58,9 @@ Get list of groups (showing just UUIDs)
 Get list of groups (showing entire records)
 @arv -h group list@
 
+Delete a group
+ at arv group delete --uuid 6dnxa-j7d0g-iw7i6n43d37jtog@
+
 h3. Global options
 
 <!-- _Move these up to before "basic examples", and give examples of what

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list