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 16, 2023
2 parents 9a93bd8 + 8192b5f commit db86b8c
Show file tree
Hide file tree
Showing 127 changed files with 3,456 additions and 3,179 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1_Bug_report.yaml
Expand Up @@ -7,7 +7,7 @@ body:
id: affected-versions
attributes:
label: Bootstraptable version(s) affected
placeholder: 1.21.4
placeholder: 1.22.0
validations:
required: true
- type: textarea
Expand Down
3 changes: 3 additions & 0 deletions .ncurc.json
@@ -0,0 +1,3 @@
{
"reject": "rollup-plugin-vue"
}
2 changes: 2 additions & 0 deletions .npmignore
Expand Up @@ -7,6 +7,7 @@ tools
_config.yml
.browserslistrc
.eslintrc.js
.ncurc.json
.stylelintrc
.travis.yml
CONTRIBUTING.md
Expand All @@ -15,3 +16,4 @@ deploy.sh
DONATORS.md
Gemfile
Gemfile.lock
release.*
14 changes: 14 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,20 @@
ChangeLog
---------

### 1.22.0

#### Core

- **New:** Added `sortBy` method.
- **New:** Added `switchableLabel` column option.
- **New:** Added support for `class` attribute in toolbar buttons.
- **Update:** Removed title from columns button.

#### Extensions

- **Update(addrbar):** Fixed clear search bug when clicking clearSearch button.
- **Update(filter-control):** Fixed pagination server side not working bug.

### 1.21.4

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

# Custom variables
current_version: 1.21.4
current_version: 1.22.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
@@ -1,6 +1,6 @@
{
"name": "bootstrap-table",
"version": "1.21.4",
"version": "1.22.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

0 comments on commit db86b8c

Please sign in to comment.