Merge branch 'release/0.5' into production

* release/0.5: Update changes. Fix fanstatic entry points.
disko · Apr 25, 2013 · 41b3baf · 41b3baf
2 parents 61748f6 + c300114
commit 41b3baf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,8 +1,8 @@
 CHANGES
 =======
 
-0.5
----
+0.5 - 2013-04-25
+----------------
 
 -   Upgrade to Kotti>=0.8.  This breaks backward compatibility.  Pin
     kotti_media to "<0.5dev" if you are on Kotti 0.7.x.

diff --git a/kotti_media/views/forms.py b/kotti_media/views/forms.py
@@ -9,8 +9,6 @@
 from deform import FileData
 from deform.widget import FileUploadWidget
 from kotti.views.edit import DocumentSchema
-from kotti.views.edit import make_generic_add
-from kotti.views.edit import make_generic_edit
 from kotti.views.edit.content import DocumentAddForm
 from kotti.views.edit.content import DocumentEditForm
 from kotti.views.edit.content import FileAddForm

diff --git a/setup.py b/setup.py
@@ -65,6 +65,6 @@
         ],
     },
     entry_points={
-        "fanstatic.libraries": ["kotti_media = kotti_media.static:library"],
+        "fanstatic.libraries": ["kotti_media = kotti_media.fanstatic:library"],
     }
 )