Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed May 15, 2024
2 parents fc4e37a + 242af6c commit a087388
Show file tree
Hide file tree
Showing 122 changed files with 1,718 additions and 1,735 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1_Bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
id: affected-versions
attributes:
label: Bootstraptable version(s) affected
placeholder: 1.22.5
placeholder: 1.22.6
validations:
required: true
- type: textarea
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ _gh_pages
cypress
site
tools
tests
_config.yml
.browserslistrc
.eslintrc.js
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
ChangeLog
---------

### 1.22.6

#### Extensions

- **Update(cookie):** Fixed cookie does not work bug with pagination ALL list.
- **Update(editable):** Fixed the `formatter` function does not include the `field` parameter bug.
- **Update(toolbar):** Fixed toolbar display bug when using an HTML title.
- **Update(toolbar):** Fixed toolbar does not update bug when column visible updated.
- **Update(toolbar):** Fixed toolbar does not update bug when the locale is changed.

### 1.22.5

#### Core
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ algolia:
index_name: bootstrap-table

# Custom variables
current_version: 1.22.5
current_version: 1.22.6
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"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-table.jquery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-table",
"version": "1.22.5",
"version": "1.22.6",
"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": {
Expand Down

0 comments on commit a087388

Please sign in to comment.