Merge branch 'api'

diff --cc apps/catalogue/models.py
index cda5ba5,c1290fb..fd5dc98
--- 1/apps/catalogue/models.py
--- 2/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@@ -17,13 -19,12 +19,14 @@@ from django.conf import setting
  
  from newtagging.models import TagBase, tags_updated
  from newtagging import managers
 -from catalogue.fields import JSONField
 +from catalogue.fields import JSONField, OverwritingFileField
 +from catalogue.utils import ExistingFile
  
  from librarian import dcparser, html, epub, NoDublinCore
 +import mutagen
  from mutagen import id3
  from slughifi import slughifi
+ from sortify import sortify
  
  
  TAG_CATEGORIES = (
@@@ -66,9 -67,9 +69,12 @@@ class Tag(TagBase)
      gazeta_link = models.CharField(blank=True, max_length=240)
      wiki_link = models.CharField(blank=True, max_length=240)
  
+     created_at    = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
+     changed_at    = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
+ 
 +    class UrlDeprecationWarning(DeprecationWarning):
 +        pass
 +
      categories_rev = {
          'autor': 'author',
          'epoka': 'epoch',

diff --cc apps/catalogue/urls.py
Simple merge

diff --cc apps/catalogue/views.py
Simple merge

diff --cc wolnelektury/settings.py
Simple merge

diff --cc wolnelektury/templates/catalogue/book_text.html
Simple merge