Merge pull request #5565 from wenzhixin/develop

v1.18.2
wenzhixin · Jan 23, 2021 · be02639 · be02639
2 parents 8139153 + 8760963
commit be02639
Show file tree

Hide file tree

Showing 210 changed files with 9,121 additions and 11,736 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,24 @@
 ChangeLog
 ---------
 
+### 1.18.2
+
+#### Core
+
+- **Update:** Fixed bootstrap5 cannot work bug.
+- **Update:** Fixed checkbox display bug when using `formatter`.
+- **Update:** Fixed search highlight bug.
+- **Update:** Updated `ru-RU` and `de-DE` locales.
+
+#### Extensions
+
+- **New(filter-control):** Added support for flat JSON.
+- **Update(cookie):** Fixed not deleted cookie bug when the sort was reset.
+- **Update(export):** Not export the detail view icon column.
+- **Update(filter-control):** Fixed not working when using `filterControlContainer`.
+- **Update(multiple-sort):** Fixed multiple-sort cannot work bug.
+- **Update(resizable):** Fixed resizable cannot work in modal.
+
 ### 1.18.1
 
 #### Core

diff --git a/_config.yml b/_config.yml
@@ -27,7 +27,7 @@ algolia:
   index_name:     bootstrap-table
 
 # Custom variables
-current_version:  1.18.1
+current_version:  1.18.2
 title:            "Bootstrap Table"
 description:      "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
 authors:          "Zhixin Wen, and Bootstrap Table contributors"

diff --git a/bootstrap-table.jquery.json b/bootstrap-table.jquery.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-table",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "title": "Bootstrap Table",
   "description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
   "author": {