Merge branch 'develop'

otto-torino · Dec 14, 2020 · bb03582 · bb03582
2 parents c1b6769 + 756660f
commit bb03582
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,13 @@
 History
 -------
 
+0.2.1 (2020-12-14)
+++++++++++++++++++
+
+* Adds order field as editable in change list page
+
+* First stable release
+
 0.2.0 (2020-12-14)
 ++++++++++++++++++
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.2.0'
+version = u'0.2.1'
 # The full version, including alpha/beta/rc tags.
-release = u'0.2.0'
+release = u'0.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/lineup/__init__.py b/lineup/__init__.py
@@ -1 +1 @@
-__version__ = '0.2.0'
+__version__ = '0.2.1'
diff --git a/lineup/admin.py b/lineup/admin.py
@@ -28,6 +28,7 @@ class MenuItemInline(admin.StackedInline):
 class MenuItemAdmin(MPTTModelAdmin):
     list_display = ('slug', 'label', 'parent', 'link', 'order', 'login_required', 'enabled', )
     list_filter = (('parent', RelatedDropdownFilter, ) if baton else 'parent', 'enabled', 'login_required', )
+    list_editable = ('order', )
     search_fields = ('label', )
     filter_horizontal = ('permissions', )
     inlines = [MenuItemInline, ]

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.2.1
 
 [wheel]
 universal = 1