Skip to content

Commit 8decbed

Browse files
committed
Update version to 1.6.0
1 parent 9a3b034 commit 8decbed

File tree

5 files changed

+64
-50
lines changed

5 files changed

+64
-50
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
- [bug] Fix bug of ellipsis string.
1414
- [bug] Fix pageList smartDisplay.
1515
- [bug] Fix #188: Export Button is not shown only use `showExport=true`.
16+
- [bug] Fix page-change event params bug.
1617
- [enh] Add limit and offset params only if pagination is activated.
1718
- [enh] Add `ajaxOptions` option to custom $.ajax options.
1819
- [enh] Add a toggle pagination toolbar button.
1920
- [enh] Add `iconSize` option.
2021
- [enh] Add `buttonsAlign` option and update `toolbarAlign` option.
2122
- [enh] Add `prepend`, `insertRow` and `toggleView` methods.
2223
- [enh] Add `editable-save.bs.table` event to editatble extension.
24+
- [enh] #431: load method support pagination.
2325

2426
### 1.5.0
2527

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ languages: ["en", "zh-cn", "es", "fr"]
2323
languages_string: ["English", "简体中文", "Español", "French"]
2424

2525
# Custom vars
26-
current_version: 1.5.0
26+
current_version: 1.6.0
2727
repo: https://github.com/wenzhixin/bootstrap-table
2828
website: http://wenzhixin.net.cn
2929
repos: http://repos.wenzhixin.net.cn

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.5.0",
3+
"version": "1.6.0",
44
"title": "Bootstrap Table",
55
"description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
66
"author": {

bower.json

Lines changed: 59 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,61 @@
11
{
2-
"name": "bootstrap-table",
3-
"version": "1.5.0",
4-
"homepage": "https://github.com/wenzhixin/bootstrap-table",
5-
"authors": [
6-
"zhixin <wenzhixin2010@gmail.com>"
7-
],
8-
"description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
9-
"main": [
10-
"src/bootstrap-table.css",
11-
"src/bootstrap-table.js",
12-
"src/locale/bootstrap-table-cs-CZ.js",
13-
"src/locale/bootstrap-table-da-DK.js",
14-
"src/locale/bootstrap-table-el-GR.js",
15-
"src/locale/bootstrap-table-en-US.js",
16-
"src/locale/bootstrap-table-es-AR.js",
17-
"src/locale/bootstrap-table-es-CR.js",
18-
"src/locale/bootstrap-table-es-NI.js",
19-
"src/locale/bootstrap-table-fr-BE.js",
20-
"src/locale/bootstrap-table-fr-FR.js",
21-
"src/locale/bootstrap-table-it-IT.js",
22-
"src/locale/bootstrap-table-ko-KR.js",
23-
"src/locale/bootstrap-table-nl-NL.js",
24-
"src/locale/bootstrap-table-pl-PL.js",
25-
"src/locale/bootstrap-table-pt-BR.js",
26-
"src/locale/bootstrap-table-ru-RU.js",
27-
"src/locale/bootstrap-table-th-TH.js",
28-
"src/locale/bootstrap-table-tr-TR.js",
29-
"src/locale/bootstrap-table-ur-PK.js",
30-
"src/locale/bootstrap-table-vi-VN.js",
31-
"src/locale/bootstrap-table-zh-CN.js",
32-
"src/locale/bootstrap-table-zh-TW.js"
33-
],
34-
"keywords": [
35-
"bootstrap",
36-
"table",
37-
"bootstrap table"
38-
],
39-
"license": "MIT",
40-
"ignore": [
41-
"**/.*",
42-
"node_modules",
43-
"bower_components",
44-
"test",
45-
"tests",
46-
"docs",
47-
"assets"
48-
]
2+
"name": "bootstrap-table",
3+
"version": "1.6.0",
4+
"homepage": "https://github.com/wenzhixin/bootstrap-table",
5+
"authors": [
6+
"zhixin <wenzhixin2010@gmail.com>"
7+
],
8+
"description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
9+
"main": [
10+
"src/bootstrap-table.js",
11+
"src/bootstrap-table.css",
12+
"src/extensions/filter/bootstrap-table-filter.js",
13+
"src/extensions/editable/bootstrap-table-editable.js",
14+
"src/extensions/export/bootstrap-table-export.js",
15+
"src/extensions/flatJSON/bootstrap-table-flatJSON.js",
16+
"src/locale/bootstrap-table-zh-CN.js",
17+
"src/locale/bootstrap-table-da-DK.js",
18+
"src/locale/bootstrap-table-el-GR.js",
19+
"src/locale/bootstrap-table-hu-HU.js",
20+
"src/locale/bootstrap-table-en-US.js",
21+
"src/locale/bootstrap-table-pt-PT.js",
22+
"src/locale/bootstrap-table-zh-TW.js",
23+
"src/locale/bootstrap-table-pl-PL.js",
24+
"src/locale/bootstrap-table-ja-JP.js",
25+
"src/locale/bootstrap-table-sv-SE.js",
26+
"src/locale/bootstrap-table-ko-KR.js",
27+
"src/locale/bootstrap-table-nl-NL.js",
28+
"src/locale/bootstrap-table-es-CR.js",
29+
"src/locale/bootstrap-table-sk-SK.js",
30+
"src/locale/bootstrap-table-ru-RU.js",
31+
"src/locale/bootstrap-table-es-AR.js",
32+
"src/locale/bootstrap-table-ur-PK.js",
33+
"src/locale/bootstrap-table-it-IT.js",
34+
"src/locale/bootstrap-table-pt-BR.js",
35+
"src/locale/bootstrap-table-es-NI.js",
36+
"src/locale/bootstrap-table-tr-TR.js",
37+
"src/locale/bootstrap-table-uk-UA.js",
38+
"src/locale/bootstrap-table-ms-MY.js",
39+
"src/locale/bootstrap-table-fr-FR.js",
40+
"src/locale/bootstrap-table-vi-VN.js",
41+
"src/locale/bootstrap-table-th-TH.js",
42+
"src/locale/bootstrap-table-cs-CZ.js",
43+
"src/locale/bootstrap-table-de-DE.js",
44+
"src/locale/bootstrap-table-fr-BE.js"
45+
],
46+
"keywords": [
47+
"bootstrap",
48+
"table",
49+
"bootstrap table"
50+
],
51+
"license": "MIT",
52+
"ignore": [
53+
"**/.*",
54+
"node_modules",
55+
"bower_components",
56+
"test",
57+
"tests",
58+
"docs",
59+
"assets"
60+
]
4961
}

src/bootstrap-table.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @author zhixin wen <wenzhixin2010@gmail.com>
3-
* version: 1.5.0
3+
* version: 1.6.0
44
* https://github.com/wenzhixin/bootstrap-table/
55
*/
66

0 commit comments

Comments
 (0)