Skip to content

Commit 0e74413

Browse files
wenzhixinwenzhixin
authored
Merge pull request wenzhixin#3652 from wenzhixin/develop
Release 1.2.0
2 parents 6350315 + fee0774 commit 0e74413

File tree

292 files changed

+5191
-2176
lines changed

Some content is hidden

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

292 files changed

+5191
-2176
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ Further steps, etc.
1212
[jsfiddle]() - a link to the reduced test case([fiddle template](https://github.com/wenzhixin/bootstrap-table/issues/1765)).
1313

1414
Any other information you want to share that is relevant to the issue being reported. This might include the lines of code that you have identified as causing the bug, and potential solutions (and your opinions on their merits).
15+
16+
<!-- Love bootstrap-table? Please consider supporting our collective:
17+
👉 https://opencollective.com/bootstrap-table/donate -->

‎.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@ language: node_js
22

33
node_js:
44
- "0.10"
5-
6-
before_install:
7-
- npm install grunt-cli -g

‎CHANGELOG.md

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

4+
### 1.12.0
5+
6+
- fix(js): fix zoom header width bug
7+
- fix(js): fix #3452, reset the table data when url loaded error
8+
- fix(js): fix #3380, check-all was wrong with the sub-table
9+
- fix(js): fix #2963, singleSelect, maintainSelected and pagination bug
10+
- fix(js): fix #3342, remove limit when it is 0
11+
- fix(js): fix #3472, group header style bug
12+
- fix(js): fix #3310, searchText causes two requests
13+
- fix(js): fix #3029, IE8 does not support getOwnPropertyNames
14+
- fix(js): fix #3204, sortName cannot work in server side pagination
15+
- fix(js): fix #3163, `showToolbar` bug when using extensions
16+
- fix(js): fix #3087, only send pagination parameters when `sidePagination` is `server`
17+
- fix(export extension): fix #3477, server pagination mode cannot export all data
18+
- fix(filter-control extension): fix #3271, duplicate select option with fixed header and client pagination
19+
- feat(js): add `detailFilter` option
20+
- feat(js): add `rememberOrder` option
21+
- feat(js): improve pageList `All` option locale independent
22+
- feat(js): add `Bootstrap v4.0` support
23+
- feat(js): add `row` data to sorter function
24+
- feat(js): add `ignoreClickToSelectOn` option
25+
- feat(js): add `onScrollBody` / `scroll-body.bs.table` event
26+
- feat(js): add `showFullscreen` option
27+
- feat(js): add `showSelectTitle` column option
28+
- feat(js): add `$el` to collapse-row
29+
- feat(locale): add `eu-EU` locale
30+
- feat(export extension): add `exportFooter` option
31+
- feat(multiple-sort extension): add `showMultiSortButton` option
32+
- feat(filter-control extension): add `searchOnEnterKey` option
33+
- feat(page-jumpto extension): add `page-jumpto` extension
34+
- feat(resizable extension): add `resizeMode` option
35+
- feat(sticky-header extension): add `Bootstrap v4.0` support
36+
- feat(treegrid extension): add `treegrid` extension
37+
- feat(print extension): add support to print complex table
38+
- feat(extension): add cookie in combination with filter-control and strict search
39+
40+
#### Breaking changes in 1.12.0
41+
42+
- feat(js): add `toggleOn` and `toggleOff` icons instead `toggle` icon
43+
44+
445
### 1.11.1
546

647
- fix(js): fix #2439, `filterBy` cannot filter array keys
@@ -36,6 +77,7 @@ ChangeLog
3677
- feat(tree-column extension): add tree column extension
3778

3879
#### Breaking changes in 1.11.1
80+
3981
- **Filter-Control extension**: deleted the inline-style and now this extension is using a separated css file.
4082

4183

‎CONTRIBUTING.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,3 +211,41 @@ includes code changes) and under the terms of the
211211

212212
By contributing your code, you agree to license your contribution under the [MIT License](LICENSE).
213213
By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](docs/LICENSE).
214+
215+
216+
## Financial contributions
217+
218+
We also welcome financial contributions in full transparency on our [open collective](https://opencollective.com/bootstrap-table).
219+
Anyone can file an expense. If the expense makes sense for the development of the community, it will be "merged" in the ledger of our open collective by the core contributors and the person who filed the expense will be reimbursed.
220+
221+
222+
## Credits
223+
224+
225+
### Contributors
226+
227+
Thank you to all the people who have already contributed to bootstrap-table!
228+
<a href="graphs/contributors"><img src="https://opencollective.com/bootstrap-table/contributors.svg?width=890" /></a>
229+
230+
231+
### Backers
232+
233+
Thank you to all our backers! [[Become a backer](https://opencollective.com/bootstrap-table#backer)]
234+
235+
<a href="https://opencollective.com/bootstrap-table#backers" target="_blank"><img src="https://opencollective.com/bootstrap-table/backers.svg?width=890"></a>
236+
237+
238+
### Sponsors
239+
240+
Thank you to all our sponsors! (please ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/bootstrap-table#sponsor))
241+
242+
<a href="https://opencollective.com/bootstrap-table/sponsor/0/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/0/avatar.svg"></a>
243+
<a href="https://opencollective.com/bootstrap-table/sponsor/1/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/1/avatar.svg"></a>
244+
<a href="https://opencollective.com/bootstrap-table/sponsor/2/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/2/avatar.svg"></a>
245+
<a href="https://opencollective.com/bootstrap-table/sponsor/3/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/3/avatar.svg"></a>
246+
<a href="https://opencollective.com/bootstrap-table/sponsor/4/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/4/avatar.svg"></a>
247+
<a href="https://opencollective.com/bootstrap-table/sponsor/5/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/5/avatar.svg"></a>
248+
<a href="https://opencollective.com/bootstrap-table/sponsor/6/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/6/avatar.svg"></a>
249+
<a href="https://opencollective.com/bootstrap-table/sponsor/7/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/7/avatar.svg"></a>
250+
<a href="https://opencollective.com/bootstrap-table/sponsor/8/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/8/avatar.svg"></a>
251+
<a href="https://opencollective.com/bootstrap-table/sponsor/9/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/9/avatar.svg"></a>

‎DONATORS.md

Lines changed: 51 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,53 @@
22

33
* Richard C Jordan - $35
44
* Janet Moery - $5
5-
* Rene Halskov - $10
6-
* Angel Arambula Garcia - $5
7-
* David Graham - $5
8-
* Paul Abbott - $20
9-
* Philip Tepfer - $10
10-
* Marcus Eddy - $5
11-
* Keith Rockhold - $50
12-
* Ramon Sosa Diaz - $10
13-
* Goncalo Cordeiro - $25
14-
* Marzena Wspanialy - $10
15-
* Nicolas Pascual - $10
16-
* Hassan Ejaz - $10
17-
* Frank Hines - $100
18-
* Luis Triana Vega - $10
19-
* PROMOTUX DI FRANCESCO MELONI E C. S.N.C. - $15
20-
* Emmanuel Kielichowski - $15
21-
* 우공이산 우공이산 - $50
22-
* Empirica srl - $15
23-
* Hassan Gareballa - $10
24-
* 지황 이 - $10
25-
* Onur Kose - $15
26-
* Александр Вейсов - $30
27-
* Anton Blinov - $30
28-
* THARAKESH PULIKONDA - $10
29-
* Linear Design Group, LLC - $20
30-
* Alon Feldman - $100
31-
* Fabian de Rosa - $5
32-
* Zhe Wang - $35
5+
* Halskov Rene - $10.00
6+
* Arambula Garcia Angel - $5.00
7+
* Graham David - $5.00
8+
* Abbott Paul - $20.00
9+
* Philip Tepfer - $10.00
10+
* Eddy Marcus - $5.00
11+
* Rockhold Keith - $50.00
12+
* Sosa Diaz Ramon - $10.00
13+
* Cordeiro Goncalo - $25.00
14+
* Wspanialy Marzena - $10.00
15+
* Pascual Nicolas - $10.00
16+
* Ejaz Hassan - $10.00
17+
* Hines Frank - $100.00
18+
* Triana Vega Luis - $10.00
19+
* PROMOTUX DI FRANCESCO MELONI E C. S.N.C. - $15.00
20+
* Emmanuel Kielichowski - $15.00
21+
* 우공이산​우공이산 - $50.00
22+
* Empirica srl - $15.00
23+
* Gareballa Hassan - $10.00
24+
* Yi Jihwang - $10.00
25+
* Kose Onur - $15.00
26+
* Вейсов​Александр - $30.00
27+
* Blinov Anton - $30.00
28+
* Pulikonda Tharakesh - $10.00
29+
* Linear Design Group, LLC - $20.00
30+
* Feldman Alon - $100.00
31+
* De Rosa Fabian - $5.00
32+
* Wang Zhe - $35.00
33+
* Schaefer Daniel - $10.00
34+
* Burch Martin - $25.00
35+
* Макогон​Виталий - $10.00
36+
* avappstore - $2.50
37+
* Burch Martin - $10.00
38+
* Mazdrashki Kamen - $20.00
39+
* Hilker Daniel - $3.00
40+
* Grokability, Inc. - $100.00
41+
* Zweimüller Boris - $10.00
42+
* Chen Qiurong - $5.00
43+
* Mirkarimov Dmitriy - $10.00
44+
* Cruz Ambrocio Jose - $5.00
45+
* Brinkmeier Dirk - $20.00
46+
* Kennelly James - $100.00
47+
* Barreiro Lionel - $25.00
48+
* Toh Alvin - $10.00
49+
* ERIKAUSKAS - $100.00
50+
* Miqueles Pino Jonatan - $100.00
51+
* Wacker Jonathan - $1.00
3352

3453
## 支付宝
3554

@@ -44,6 +63,8 @@
4463
* IO芒果：7元
4564
* 醉、千秋：18.88元
4665
* 路人甲：5.27元
66+
* 小阿吉：20元
67+
* FastAdmin - F4NNIU：88.88元
4768

4869
## 微信
4970

@@ -58,3 +79,5 @@
5879
* 无心向你：9.9元
5980
* 指间沙：9.9元
6081
* 董琛：9.9元
82+
83+
注：由于支付宝和微信使用匿名的方式，导致无法查询捐助者，麻烦发送邮件告知捐助信息，谢谢。

‎README.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
# [Bootstrap Table](http://bootstrap-table.wenzhixin.net.cn)
22

3-
[![Build Status](https://travis-ci.org/wenzhixin/bootstrap-table.svg)](https://travis-ci.org/wenzhixin/bootstrap-table)
3+
[![Build Status](https://travis-ci.org/wenzhixin/bootstrap-table.svg)](https://travis-ci.org/wenzhixin/bootstrap-table)
44
[![GitHub version](https://badge.fury.io/gh/wenzhixin%2Fbootstrap-table.svg)](http://badge.fury.io/gh/wenzhixin%2Fbootstrap-table)
55
[![Bower version](https://badge.fury.io/bo/bootstrap-table.svg)](http://badge.fury.io/bo/bootstrap-table)
6+
[![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/bootstrap-table/badge?style=rounded)](https://www.jsdelivr.com/package/npm/bootstrap-table)
67
[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZDHP676FQDUT6)
8+
[![Backers on Open Collective](https://opencollective.com/bootstrap-table/backers/badge.svg)](#backers)
9+
[![Sponsors on Open Collective](https://opencollective.com/bootstrap-table/sponsors/badge.svg)](#sponsors)
10+
11+
[![](https://graphs.waffle.io/wenzhixin/bootstrap-table/throughput.svg)](https://graphs.waffle.io/wenzhixin/bootstrap-table/throughput.svg)
712

813
An extended Bootstrap table with radio, checkbox, sort, pagination, extensions and other added features.
914

@@ -87,6 +92,8 @@ Your feedback is very appreciated!
8792
## Acknowledgements
8893

8994
Thanks to everyone who have given feedback and submitted pull requests. A list of all the contributors can be found [here](https://github.com/wenzhixin/bootstrap-table/graphs/contributors).
95+
This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
96+
<a href="graphs/contributors"><img src="https://opencollective.com/bootstrap-table/contributors.svg?width=890" /></a>
9097

9198
## Release History
9299

@@ -97,7 +104,23 @@ Look at the [Change Log](https://github.com/wenzhixin/bootstrap-table/blob/maste
97104
To build bootstrap-table locally please run:
98105

99106
```
100-
grunt build
107+
npm run grunt
101108
```
102109

103110
Result will appear in `dist` directory.
111+
112+
## Backers
113+
114+
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bootstrap-table#backer)]
115+
116+
<a href="https://opencollective.com/bootstrap-table#backers" target="_blank"><img src="https://opencollective.com/bootstrap-table/backers.svg?width=890"></a>
117+
118+
## Sponsors
119+
120+
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/bootstrap-table#sponsor)]
121+
122+
<a href="https://opencollective.com/bootstrap-table/sponsor/0/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/0/avatar.svg"></a>
123+
<a href="https://opencollective.com/bootstrap-table/sponsor/1/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/1/avatar.svg"></a>
124+
<a href="https://opencollective.com/bootstrap-table/sponsor/2/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/2/avatar.svg"></a>
125+
<a href="https://opencollective.com/bootstrap-table/sponsor/3/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/3/avatar.svg"></a>
126+
<a href="https://opencollective.com/bootstrap-table/sponsor/4/website" target="_blank"><img src="https://opencollective.com/bootstrap-table/sponsor/4/avatar.svg"></a>

‎_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"]
2323
languages_string: ["English", "简体中文", "Español"]
2424

2525
# Custom vars
26-
current_version: 1.11.1
26+
current_version: 1.12.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.11.1",
3+
"version": "1.12.0",
44
"title": "Bootstrap Table",
55
"description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
66
"author": {

0 commit comments

Comments
 (0)