Merge branch 'release-1.13.1'

otto-torino · Dec 4, 2020 · 749ef4e · 749ef4e
2 parents 2534b4e + 93adf35
commit 749ef4e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -424,7 +424,7 @@ The dropdown is visible only if the filter contains at least three options, othe
 Usage:
 
 ``` python
-from baton.admin import DropdownFilter, RelatedDropdownFilter, ChoiceDropdownFilter
+from baton.admin import DropdownFilter, RelatedDropdownFilter, ChoicesDropdownFilter
 
 class MyModelAdmin(admin.ModelAdmin):
     # ...

diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/dist/baton.min.js.map b/baton/static/baton/app/dist/baton.min.js.map
diff --git a/baton/static/baton/app/package-lock.json b/baton/static/baton/app/package-lock.json
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/styles/_changelist.scss b/baton/static/baton/app/src/styles/_changelist.scss
@@ -387,6 +387,11 @@
     }
   }
 
+  .baton-cl-include-above,
+  .baton-cl-include-below {
+    width: 100%;
+  }
+
   .baton-cl-include-below {
     order: 2;
   }

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

diff --git a/docs/list_filters.rst b/docs/list_filters.rst
@@ -59,7 +59,7 @@ The dropdown is visible only if the filter contains at least three options, othe
 
 Usage: ::
 
-    from baton.admin import DropdownFilter, RelatedDropdownFilter, ChoiceDropdownFilter
+    from baton.admin import DropdownFilter, RelatedDropdownFilter, ChoicesDropdownFilter
 
     class MyModelAdmin(admin.ModelAdmin):
 

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='1.13.0',
+    version='1.13.1',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',