Merge branch 'master' into release

frankwiles · frankwiles · commit 8816a8599ce2 · 2014-09-11T09:19:28.000-05:00
diff --git a/downloads/models.py b/downloads/models.py
@@ -191,4 +191,4 @@ class ReleaseFile(ContentManageable, NameSlugModel):
     class Meta:
         verbose_name = 'Release File'
         verbose_name_plural = 'Release Files'
-        ordering = ('-release__is_published', 'release__name', 'os__name')
+        ordering = ('-release__is_published', 'release__name', 'os__name', 'name')
diff --git a/templates/downloads/release_detail.html b/templates/downloads/release_detail.html
@@ -38,7 +38,6 @@ <h1 class="page-title">Files</h1>
               <th>Version</th>
               <th>Operating System</th>
               <th>Description</th>
-              <th>Date</th>
               <th>MD5 Sum</th>
               <th>File Size</th>
               <th>GPG</th>
@@ -50,7 +49,6 @@ <h1 class="page-title">Files</h1>
                 <td><a href="{{ f.url }}">{{ f.name }}</a></td>
                 <td>{{ f.os.name }}</td>
                 <td>{{ f.description }}</td>
-                <td>{{ r.release.release_date|date }}</td>
                 <td>{{ f.md5_sum }}</td>
                 <td>{{ f.filesize }}</td>
                 <td>{% if f.gpg_signature_file %}<a href="{{ f.gpg_signature_file }}">SIG</a>{% endif %}</td>
