Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Dec 22, 2024
2 parents b5b418c + b5a41a3 commit 4657cbe
Show file tree
Hide file tree
Showing 239 changed files with 5,103 additions and 4,775 deletions.
114 changes: 0 additions & 114 deletions .eslintrc.cjs

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1_Bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
id: affected-versions
attributes:
label: Bootstraptable version(s) affected
placeholder: 1.23.5
placeholder: 1.24.0
validations:
required: true
- type: textarea
Expand Down
3 changes: 0 additions & 3 deletions .ncurc.json

This file was deleted.

11 changes: 0 additions & 11 deletions .stylelintrc

This file was deleted.

32 changes: 26 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
ChangeLog
---------

### 1.24.0

#### Core

- **New:** Added `card-view-field` class to `card-view`.
- **Update:** Fixed `id` not working bug in `rowAttributes`.
- **Update:** Fixed `data` field attr not working bug.
- **Update:** Fixed column is `undefined` bug in `updateFieldGroup` when using `refreshOptions`.
- **Update:** Fixed `post-header` trigger bug after table destroy.
- **Update:** Fixed `strictSearch` not working bug.
- **Update:** Fixed `insertRow` bug after on the last row of the table.
- **Update:** Fixed display error of total rows using load more pagination.
- **Update:** Updated Sass and refined the SCSS file.
- **Update:** Update Eslint and fix some lint errors.

#### Extensions

- **Update(cookie):** Fixed cookie columns display error after adding a column.
- **Update(filter-control):** Fixed select not working bug after an Ajax loaded.

### 1.23.5

### Core
#### Core

- **New:** Added `getFooterData` method.
- **Update:** Fixed `refresh` invalid url bug when `url` is relative path.
Expand All @@ -12,22 +32,22 @@ ChangeLog

### 1.23.4

### Core
#### Core

- **New:** Added support for column options `formatter` and `footerFormatter` methods returning type `jQuery`, `HTMLElement`.
- **New:** Added `sortReset` method to reset the current sort state.
- **New:** Added a presentation role if no matching rows are found.
- **Update:** Fixed `refresh` method doesn't reuse parameters provided as query bug.
- **Update:** Fixed compatibility issues when `colspan` is set as a string.

### Extensions
#### Extensions

- **Update(fixed-columns):** Fixed undefined error in some cases.
- **Update(reorder-columns):** Fixed incorrect column values order with detail view.

### 1.23.2

### Core
#### Core

- **New:** Added `buttonsAttributeTitle` option to customize title attribute.
- **Update:** Updated sort icons using SVG instead of PNG.
Expand All @@ -38,12 +58,12 @@ ChangeLog

### 1.23.1

### Core
#### Core

- **Update:** Improved vue component init twice without `setTimeout`.
- **Update:** Updated `af-ZA`, `fr-BE`, `fr-CH`, `fr-FR`, `fr-LU`, and `id-ID` locales.

### Extensions
#### Extensions

- **Update(editable):** Fixed editable display bug of select type.
- **Update(sticky-header):** Fixed issue if sticky-header extension is loaded but not enabled.
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
source 'https://rubygems.org'

group :development, :test do
gem 'jekyll', '~> 3.8.5'
gem 'jekyll'
gem 'jekyll-redirect-from', '~> 0.14.0'
gem 'jekyll-sitemap', '~> 1.2.0'
gem 'jekyll-toc', '~> 0.9.1'
gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
gem "webrick"
gem "kramdown-parser-gfm"
end

group :jekyll_plugins do
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ algolia:
index_name: bootstrap-table

# Custom variables
current_version: 1.23.5
current_version: 1.24.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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-table",
"version": "1.23.5",
"version": "1.24.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
6 changes: 3 additions & 3 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default defineConfig({
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
setupNodeEvents (on, config) {
return plugins(on, config)
},
},
}
}
})
Loading

0 comments on commit 4657cbe

Please sign in to comment.