Merge branch 'master' into stable

galerie/migrations/0005_obrazek_ordering_datum.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('galerie', '0004_nepovinna_galerie_u_obrazku'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='obrazek',
+            options={'ordering': ['datum'], 'verbose_name': 'Obr\xe1zek', 'verbose_name_plural': 'Obr\xe1zky'},
+        ),
+    ]

galerie/models.py

@@ -84,6 +84,7 @@ class Obrazek(models.Model):
   class Meta:
     verbose_name = 'Obrázek'
     verbose_name_plural = 'Obrázky'
+    ordering = ['datum']
   def save(self):
     original = Image.open(self.obrazek_velky)
     # vycteni EXIFu

mamweb/settings_common.py

@@ -235,6 +235,10 @@ LOGGING = {
 SEMINAR_RESENI_DIR = os.path.join(BASE_DIR, 'media', 'reseni')
 
 
-
+CKEDITOR_CONFIGS = {
+    'default': {
+        'entities': False
+    }
+}