Skip to content

Commit 16ff3bc

Browse files
committed
Release 1.2.0
1 parent 69e6fe0 commit 16ff3bc

File tree

227 files changed

+3226
-1445
lines changed

Some content is hidden

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

227 files changed

+3226
-1445
lines changed

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

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+
注:由于支付宝和微信使用匿名的方式,导致无法查询捐助者,麻烦发送邮件告知捐助信息,谢谢。

_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": {

dist/bootstrap-table-locale-all.js

Lines changed: 144 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,19 +219,22 @@
219219
return 'Lade, bitte warten...';
220220
},
221221
formatRecordsPerPage: function (pageNumber) {
222-
return pageNumber + ' Einträge pro Seite.';
222+
return pageNumber + ' Zeilen pro Seite.';
223223
},
224224
formatShowingRows: function (pageFrom, pageTo, totalRows) {
225-
return 'Zeige Zeile ' + pageFrom + ' bis ' + pageTo + ' von ' + totalRows + ' Zeile' + ((totalRows > 1) ? "n" : "")+".";
225+
return 'Zeige Zeile ' + pageFrom + ' bis ' + pageTo + ' von ' + totalRows + ' Zeilen' + ((totalRows > 1) ? "n" : "")+".";
226226
},
227227
formatDetailPagination: function (totalRows) {
228228
return 'Zeige ' + totalRows + ' Zeile' + ((totalRows > 1) ? "n" : "")+".";
229229
},
230230
formatSearch: function () {
231-
return 'Suchen ...';
231+
return 'Suchen';
232232
},
233233
formatNoMatches: function () {
234-
return 'Keine passenden Ergebnisse gefunden.';
234+
return 'Keine passenden Ergebnisse gefunden';
235+
},
236+
formatPaginationSwitch: function () {
237+
return 'Verstecke/Zeige Nummerierung';
235238
},
236239
formatRefresh: function () {
237240
return 'Neu laden';
@@ -244,7 +247,13 @@
244247
},
245248
formatAllRows: function () {
246249
return 'Alle';
247-
}
250+
},
251+
formatExport: function () {
252+
return 'Datenexport';
253+
},
254+
formatClearFilters: function () {
255+
return 'Lösche Filter';
256+
}
248257
};
249258

250259
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['de-DE']);
@@ -495,6 +504,7 @@
495504
* Bootstrap Table Spanish (México) translation (Obtenido de traducción de Argentina)
496505
* Author: Felix Vera (felix.vera@gmail.com)
497506
* Copiado: Mauricio Vera (mauricioa.vera@gmail.com)
507+
* Revisión: J Manuel Corona (jmcg92@gmail.com) (13/Feb/2018).
498508
*/
499509
(function ($) {
500510
'use strict';
@@ -509,11 +519,29 @@
509519
formatShowingRows: function (pageFrom, pageTo, totalRows) {
510520
return 'Mostrando ' + pageFrom + ' a ' + pageTo + ' de ' + totalRows + ' filas';
511521
},
522+
formatDetailPagination: function (totalRows) {
523+
return 'Mostrando ' + totalRows + ' filas';
524+
},
512525
formatSearch: function () {
513526
return 'Buscar';
514527
},
515528
formatNoMatches: function () {
516-
return 'No se encontraron registros';
529+
return 'No se encontraron registros que coincidan';
530+
},
531+
formatPaginationSwitch: function () {
532+
return 'Mostrar/ocultar paginación';
533+
},
534+
formatRefresh: function () {
535+
return 'Actualizar';
536+
},
537+
formatToggle: function () {
538+
return 'Cambiar vista';
539+
},
540+
formatFullscreen: function () {
541+
return 'Pantalla completa';
542+
},
543+
formatColumns: function () {
544+
return 'Columnas';
517545
},
518546
formatAllRows: function () {
519547
return 'Todo';
@@ -648,6 +676,50 @@
648676
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['et-EE']);
649677

650678
})(jQuery);
679+
/**
680+
* Bootstrap Table Basque (Basque Country) translation
681+
* Author: Iker Ibarguren Berasaluze<ikerib@gmail.com>
682+
*/
683+
(function ($) {
684+
'use strict';
685+
686+
$.fn.bootstrapTable.locales['eu-EU'] = {
687+
formatLoadingMessage: function () {
688+
return 'Itxaron mesedez...';
689+
},
690+
formatRecordsPerPage: function (pageNumber) {
691+
return pageNumber + ' emaitza orriko.';
692+
},
693+
formatShowingRows: function (pageFrom, pageTo, totalRows) {
694+
return totalRows + ' erregistroetatik ' + pageFrom + 'etik ' + pageTo +'erakoak erakusten.';
695+
},
696+
formatSearch: function () {
697+
return 'Bilatu';
698+
},
699+
formatNoMatches: function () {
700+
return 'Ez da emaitzarik aurkitu';
701+
},
702+
formatPaginationSwitch: function () {
703+
return 'Ezkutatu/Erakutsi orrikatzea';
704+
},
705+
formatRefresh: function () {
706+
return 'Eguneratu';
707+
},
708+
formatToggle: function () {
709+
return 'Ezkutatu/Erakutsi';
710+
},
711+
formatColumns: function () {
712+
return 'Zutabeak';
713+
},
714+
formatAllRows: function () {
715+
return 'Guztiak';
716+
}
717+
};
718+
719+
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['eu-EU']);
720+
721+
})(jQuery);
722+
651723
/**
652724
* Bootstrap Table Persian translation
653725
* Author: MJ Vakili <mjv.1989@Gmail.com>
@@ -744,6 +816,9 @@
744816
formatNoMatches: function () {
745817
return 'Aucun résultat trouvé';
746818
},
819+
formatPaginationSwitch: function () {
820+
return 'Montrer/Masquer pagination';
821+
},
747822
formatRefresh: function () {
748823
return 'Rafraîchir';
749824
},
@@ -755,6 +830,57 @@
755830
},
756831
formatAllRows: function () {
757832
return 'Tous';
833+
},
834+
formatExport: function () {
835+
return 'Exporter les données';
836+
},
837+
formatClearFilters: function () {
838+
return 'Vider les filtres';
839+
},
840+
formatMultipleSort: function() {
841+
return 'Tri avancé';
842+
},
843+
formatAddLevel: function() {
844+
return 'Ajouter un niveau';
845+
},
846+
formatDeleteLevel: function() {
847+
return 'Supprimer un niveau';
848+
},
849+
formatColumn: function() {
850+
return 'Colonne';
851+
},
852+
formatOrder: function() {
853+
return 'Ordre';
854+
},
855+
formatSortBy: function() {
856+
return 'Trier par';
857+
},
858+
formatThenBy: function() {
859+
return 'Puis par';
860+
},
861+
formatSort: function() {
862+
return 'Trier';
863+
},
864+
formatCancel: function() {
865+
return 'Annuler';
866+
},
867+
formatDuplicateAlertTitle: function() {
868+
return 'Doublon(s) détecté(s)!';
869+
},
870+
formatDuplicateAlertDescription: function() {
871+
return 'Supprimez ou changez les colonnes dupliquées.';
872+
},
873+
formatSortOrders: function() {
874+
return {
875+
asc: 'Croissant',
876+
desc: 'Décroissant'
877+
};
878+
},
879+
formatAdvancedSearch: function() {
880+
return 'Recherche avancée';
881+
},
882+
formatAdvancedCloseButton: function() {
883+
return "Fermer";
758884
}
759885
};
760886

@@ -1516,6 +1642,9 @@
15161642
formatNoMatches: function () {
15171643
return 'Nenájdená žiadna vyhovujúca položka';
15181644
},
1645+
formatPaginationSwitch: function () {
1646+
return 'Skry/Zobraz stránkovanie';
1647+
},
15191648
formatRefresh: function () {
15201649
return 'Obnoviť';
15211650
},
@@ -1524,6 +1653,15 @@
15241653
},
15251654
formatColumns: function () {
15261655
return 'Stĺpce';
1656+
},
1657+
formatAllRows: function () {
1658+
return 'Všetky';
1659+
},
1660+
formatExport: function () {
1661+
return 'Exportuj dáta';
1662+
},
1663+
formatClearFilters: function () {
1664+
return 'Odstráň filtre';
15271665
}
15281666
};
15291667

0 commit comments

Comments
 (0)