Bumped version

TODO.txt

@@ -6,20 +6,19 @@
     - Reduce number of parameters passed to list view
     - Filters
         - Use table to draw filters so column names will line up?
-        - Custom filters for date fields?
         - Change boolean filter to True/False instead of Yes/No
     - Ability to sort by fields that are not visible?
     - List display callables?
 - SQLA Model Admin
     - Postprocess sort columns - do not resolve to attributes in runtime
-    - Many2Many support
-        - Verify if it is working properly
     - WYSIWYG editor support?
 - File admin
     - Header title
-    - Mass-delete functionality
     - File size restriction
 - Unit tests
     - Form generation tests
+    - Inline form generation tests
 - Documentation
     - Add all new stuff
+    - Fixed stylesheet
+

examples/peewee/simple.py

@@ -67,11 +67,6 @@ class PostAdmin(peeweemodel.ModelView):
                       'date',
                       User.username)
 
-    @admin.action('merge',
-            'Merge',
-            'Are you sure you want to merge selected models?')
-    def action_combine(self, ids):
-        pass
 
 @app.route('/')
 def index():

flask_admin/__init__.py

@@ -1,2 +1 @@
 from .base import expose, Admin, BaseView, AdminIndexView
-from .actions import action

setup.py

@@ -17,7 +17,7 @@ def desc():
 
 setup(
     name='Flask-Admin',
-    version='1.0.1',
+    version='1.0.2',
     url='https://github.com/mrjoes/flask-admin/',
     license='BSD',
     author='Serge S. Koval',