update media order to follow last modification date

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644 (file)
index 0114806..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2014-2015 Guillaume Pellerin
-# Copyright 2014-2015 Thomas Fillon
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# FROM parisson/timeside:latest-dev
-FROM parisson/telemeta:latest-dev
-
-MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@parisson.com>
-
-# Clone app
-RUN mkdir /opt/TeleForma
-ADD . /opt/TeleForma
-WORKDIR /opt/TeleForma
-
-# Install deps
-RUN mkdir /opt/src
-RUN pip install -r requirements.txt --src /opt/src
-
-EXPOSE 8000

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index d6320b062b84567bc896ecbae6ab77e34d9e8f0e..487ca5a2663d3289c4908e902f23e4d2a91beda9 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -292,9 +292,6 @@ class Conference(Model):
                          self.course_type.name.lower()])
         return slug
 
-    def __unicode__(self):
-        return self.description
-
     def save(self, *args, **kwargs):
         if not self.public_id:
             self.public_id = get_random_hash()
@@ -628,7 +625,7 @@ class Media(MediaBase):
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'media'
-        ordering = ['-conference__session', '-date_modified']
+        ordering = ['-date_modified', '-conference__session']
 
 
 class NamePaginator(object):

diff --git a/teleforma/settings.py b/teleforma/settings.py
deleted file mode 100644 (file)
index e69de29..0000000