Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Jun 30, 2024
2 parents a087388 + 75fe4f0 commit 588ccd1
Show file tree
Hide file tree
Showing 230 changed files with 19,657 additions and 157,811 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.6
placeholder: 1.23.0
validations:
required: true
- type: textarea
Expand Down
7 changes: 0 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,3 @@ updates:
interval: daily
time: "21:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: rollup-plugin-vue
versions:
- ">= 6.a, < 7"
- dependency-name: clean-css-cli
versions:
- 5.0.0
2 changes: 1 addition & 1 deletion .ncurc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"reject": "rollup-plugin-vue"
"reject": "eslint"
}
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
ChangeLog
---------

### 1.23.0

#### Core

- **New:** Add support for vue3 instead of vue2.
- **Update:** Fixed `getData` with `formatted` data bug when a column is missing.
- **Update:** Fixed `toggleColumn` exception when the field does not exist.
- **Update:** Fixed vue component init twice when options and columns both changed.

#### Extensions

- **New(addrbar):** Added `addrCustomParams` option for custom parameters.
- **New(filter-control):** Added `filterControlSearchClear` option to stop clearing the filters when using `showSearchButton` option.
- **Update(filter-control):** Fixed error with clear filters button when not enabled cookie extension.
- **Update(filter-control):** Fixed bug with enabled cookie extension using `localStorage`.
- **Update(multiple-sort):** Fixed not trigger event bug when using server-side pagination.

### 1.22.6

#### Extensions
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.6
current_version: 1.23.0
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.6",
"version": "1.23.0",
"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
Loading

0 comments on commit 588ccd1

Please sign in to comment.