Merge branch 'master' into ackbar

templates/base.html

@@ -28,11 +28,11 @@
     <link rel="apple-touch-icon" sizes="152x152" href="/static/img/apple-touch-icon-152x152.png" />
     <!-- /Icons -->
 
-    {% for style_path in main_styles %}
+    {% for style_path, cache_buster in main_styles %}
       <link rel="stylesheet" href="/static/{{ style_path }}?v={{ cache_buster }}" type="text/css">
     {% endfor %}
 
-    {% for style_path in library_styles %}
+    {% for style_path, cache_buster in library_styles %}
       <link rel="stylesheet" href="/static/{{ style_path }}?v={{ cache_buster }}" type="text/css">
     {% endfor %}
 
@@ -53,7 +53,7 @@
       <script src="{{ script_url }}"></script>
     {% endfor %}
 
-    {% for script_path in library_scripts %}
+    {% for script_path, cache_buster in library_scripts %}
       <script src="/static/{{ script_path }}?v={{ cache_buster }}"></script>
     {% endfor %}
 
@@ -61,7 +61,7 @@
 
     {% endblock %}
 
-    {% for script_path in main_scripts %}
+    {% for script_path, cache_buster in main_scripts %}
       <script src="/static/{{ script_path }}?v={{ cache_buster }}"></script>
     {% endfor %}
 

templates/index.html

@@ -10,6 +10,10 @@
   <meta id="descriptionTag" name="description" content="Hosted private docker repositories. Includes full user management and history. Free for public repositories."></meta>
   <meta name="google-site-verification" content="GalDznToijTsHYmLjJvE4QaB9uk_IP16aaGDz5D75T4" />
   <meta name="fragment" content="!" />
+  <meta name="ac-discovery" content="{{ hostname }} {{ preferred_scheme }}://{{ hostname }}/c1/aci/{name}/{version}/{ext}/{os}/{arch}/">
+  <meta name="ac-discovery-pubkeys" content="{{ hostname }} {{ preferred_scheme }}://{{ hostname }}/aci-signing-key">
+
+
 {% endblock %}
 
 {% block body_content %}

templates/tos.html

@@ -28,7 +28,7 @@
 {% block body_content %}
   <div class="tos container">
     <h2>CoreOS Terms of Service</h2>
-    <h4>Last Revised: February 2, 2015</h4>
+    <h4>Last Revised: February 5, 2015</h4>
 
     <p>These Quay.io Terms of Service (these “<strong>Terms</strong>”) apply to the features and functions provided by CoreOS, Inc. (“<strong>CoreOS</strong>,” “<strong>our</strong>,” or “<strong>we</strong>”) via quay.io (the “<strong>Site</strong>”) (collectively, the “<strong>Services</strong>”). By accessing or using the Services, you agree to be bound by these Terms. If you do not agree to these Terms, do not use any of the Services. The “<strong>Effective Date</strong>” of these Terms is the date you first access any of the Services.</p>
     <p>If you are accessing the Services in your capacity as an employee, consultant or agent of a company (or other entity), you represent that you are an employee, consultant or agent of such company (or other entity) and you have the authority to agree (and be legally bound) on behalf of such company (or other entity) to all of the terms and conditions of these Terms.</p>
@@ -105,11 +105,11 @@
 	<p>Also, in accordance with the Digital Millennium Copyright Act (DMCA) and other applicable law, CoreOS has adopted a policy of terminating, in appropriate circumstances and at our discretion, account holders who are deemed to be repeat infringers. CoreOS also may, at its discretion, limit access to the Services and terminate the accounts of any users who infringe any intellectual property rights of others, whether or not there is any repeat infringement.</p>
 	<p>If you think that anything on the Services infringes upon any copyright that you own or control, you may file a notification with CoreOS’ Designated Agent as set forth below:</p>
 	<table border=0>
-	  <tr><td>Designated Agent:</td><td>[insert name]</td></tr>
-	  <tr><td>Address of Designated Agent:</td><td>[insert address]</td></tr>
-	  <tr><td>Telephone Number of Designated Agent:</td><td>[insert telephone]</td></tr>
-	  <tr><td>Fax Number of Designated Agent:</td><td>[insert telephone number]</td></tr>
-	  <tr><td>Email Address of Designated Agent:</td><td>[insert email address]</td></tr>
+	  <tr><td>Designated Agent:</td><td>DMCA Agent</td></tr>
+	  <tr><td>Address of Designated Agent:</td><td>3043 Mission Street, San Francisco, CA 94110</td></tr>
+	  <tr><td>Telephone Number of Designated Agent:</td><td>(800) 774-3507</td></tr>
+	  <tr><td>Fax Number of Designated Agent:</td><td>(415) 580-7362</td></tr>
+	  <tr><td>Email Address of Designated Agent:</td><td>support@quay.io</td></tr>
 	</table>
 	<p>Please see <a href="http://www.copyright.gov/title17/92chap5.html#512">17 U.S.C. § 512(c)(3)</a> for the requirements of a proper notification. If you knowingly misrepresent that any material or activity is infringing, you may be liable for any damages, including costs and attorneys’ fees, CoreOS or the alleged infringer incurs because we relied on the misrepresentation when removing or disabling access to the material or activity.</p>
       </li>