Skip to content

Commit db86b8c

Browse files
committed
Merge branch 'develop'
2 parents 9a93bd8 + 8192b5f commit db86b8c

File tree

127 files changed

+3456
-3179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+3456
-3179
lines changed

.github/ISSUE_TEMPLATE/1_Bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
id: affected-versions
88
attributes:
99
label: Bootstraptable version(s) affected
10-
placeholder: 1.21.4
10+
placeholder: 1.22.0
1111
validations:
1212
required: true
1313
- type: textarea

.ncurc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"reject": "rollup-plugin-vue"
3+
}

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ tools
77
_config.yml
88
.browserslistrc
99
.eslintrc.js
10+
.ncurc.json
1011
.stylelintrc
1112
.travis.yml
1213
CONTRIBUTING.md
@@ -15,3 +16,4 @@ deploy.sh
1516
DONATORS.md
1617
Gemfile
1718
Gemfile.lock
19+
release.*

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
ChangeLog
22
---------
33

4+
### 1.22.0
5+
6+
#### Core
7+
8+
- **New:** Added `sortBy` method.
9+
- **New:** Added `switchableLabel` column option.
10+
- **New:** Added support for `class` attribute in toolbar buttons.
11+
- **Update:** Removed title from columns button.
12+
13+
#### Extensions
14+
15+
- **Update(addrbar):** Fixed clear search bug when clicking clearSearch button.
16+
- **Update(filter-control):** Fixed pagination server side not working bug.
17+
418
### 1.21.4
519

620
#### Core

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ algolia:
2727
index_name: bootstrap-table
2828

2929
# Custom variables
30-
current_version: 1.21.4
30+
current_version: 1.22.0
3131
title: "Bootstrap Table"
3232
description: "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
3333
authors: "Zhixin Wen, and Bootstrap Table contributors"

bootstrap-table.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-table",
3-
"version": "1.21.4",
3+
"version": "1.22.0",
44
"title": "Bootstrap Table",
55
"description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
66
"author": {

0 commit comments

Comments
 (0)