Merge branch 'develop'

.cspell.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
+  "version": "0.2",
+  "dictionaries": [
+    "allowed-words"
+  ],
+  "dictionaryDefinitions": [
+    {
+      "name": "allowed-words",
+      "path": "./.cspell-words.txt",
+      "addWords": true
+    }
+  ],
+  "ignorePaths": [
+    "src/locale/**",
+    "node_modules/**",
+    "test/**"
+  ]
+}

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/ISSUE_TEMPLATE/1_Bug_report.yaml

@@ -7,7 +7,7 @@ body:
     id: affected-versions
     attributes:
       label: Bootstraptable version(s) affected
-      placeholder: 1.22.4
+      placeholder: 1.22.5
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/2_Feature_request.yaml

@@ -14,4 +14,4 @@ body:
     attributes:
       value: |
         Love bootstrap-table? Please consider supporting our collective:
-        👉  https://opencollective.com/bootstrap-table/donate
+        👉  https://opencollective.com/bootstrap-table/donate

.github/ISSUE_TEMPLATE/3_Support_question.yaml

@@ -24,4 +24,4 @@ body:
     attributes:
       value: |
         Love bootstrap-table? Please consider supporting our collective:
-        👉  https://opencollective.com/bootstrap-table/donate
+        👉  https://opencollective.com/bootstrap-table/donate

.github/ISSUE_TEMPLATE/4_Documentation.yaml

@@ -14,4 +14,4 @@ body:
     attributes:
       value: |
         Love bootstrap-table? Please consider supporting our collective:
-        👉  https://opencollective.com/bootstrap-table/donate
+        👉  https://opencollective.com/bootstrap-table/donate

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: 📖 Example Issue
     url: https://github.com/wenzhixin/bootstrap-table-examples
-    about: Please refer to our examples repository for example issues
+    about: Please refer to our examples repository for example issues

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,7 +18,7 @@
 
 **💡Example(s)?**
 <!-- Please use our online Editor (https://live.bootstrap-table.com/) to create example(s) (Before and after your changes).
-     On our Wiki (https://github.com/wenzhixin/bootstrap-table/wiki/Online-Editor-Explanation) you can read how to use the editor.-->
+On our Wiki (https://github.com/wenzhixin/bootstrap-table/wiki/Online-Editor-Explanation) you can read how to use the editor.-->
 
 **☑️Self Check before Merge**
 

CHANGELOG.md

@@ -1,6 +1,21 @@
 ChangeLog
 ---------
 
+### 1.22.5
+
+#### Core
+
+- **New:** Added `sl-SI` locales.
+- **New:** Added support for HTML to the `updateColumnTitle` method.
+- **Update:** Fixed the `getRowByUniqueId` bug when `uniqueId` is of mixed data formats.
+- **Update:** Fixed not triggering `sort` event bug using server-side pagination.
+- **Update:** Fixed custom `iconPrefix` and `icons` bugs.
+- **Update:** Fixed virtual scroll cannot work bug in modal.
+
+#### Extensions
+
+- **Update(multiple-sort):** Fixed the duplicated ID bug in the multiple-sort extension.
+
 ### 1.22.4
 
 #### Core

CONTRIBUTING.md

@@ -49,18 +49,13 @@ Good bug reports are extremely helpful, so thanks!
 
 Guidelines for bug reports:
 
-0. **Validate and lint your code** — [validate your HTML](http://html5.validator.nu)
-   and [lint your HTML](https://github.com/twbs/bootlint) to ensure your
-   problem isn't caused by a simple error in your own code.
+0. **Validate and lint your code** — [validate your HTML](http://html5.validator.nu) and [lint your HTML](https://github.com/twbs/bootlint) to ensure your problem isn't caused by a simple error in your own code.
 
-1. **Use the GitHub issue search** — check if the issue has already been
-   reported.
+1. **Use the GitHub issue search** — check if the issue has already been reported.
 
-2. **Check if the issue has been fixed** — try to reproduce it using the
-   latest `master` or development branch in the repository.
+2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or development branch in the repository.
 
-3. **Isolate the problem** — ideally create a live example.
-    Our [Online Editor](https://live.bootstrap-table.com) tool is a very helpful for this.
+3. **Isolate the problem** — ideally create a live example. Our [Online Editor](https://live.bootstrap-table.com) tool is a very helpful for this.
 
 
 A good bug report shouldn't leave others needing to chase you up for more
@@ -122,52 +117,45 @@ documentation source files in
 Adhering to the following process is the best way to get your work
 included in the project:
 
-1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork,
-   and configure the remotes:
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork, and configure the remotes:
 
-   ```bash
-   # Clone your fork of the repo into the current directory
-   git clone https://github.com/<your-username>/bootstrap-table.git
-   # Navigate to the newly cloned directory
-   cd bootstrap-table
-   # Assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/wenzhixin/bootstrap-table.git
-   ```
+```bash
+# Clone your fork of the repo into the current directory
+git clone https://github.com/<your-username>/bootstrap-table.git
+# Navigate to the newly cloned directory
+cd bootstrap-table
+# Assign the original repo to a remote called "upstream"
+git remote add upstream https://github.com/wenzhixin/bootstrap-table.git
+```
 
 2. If you cloned a while ago, get the latest changes from upstream:
 
-   ```bash
-   git checkout develop
-   git pull upstream develop
-   ```
+```bash
+git checkout develop
+git pull upstream develop
+```
 
-3. Create a new topic branch (off the main project development branch) to
-   contain your feature, change, or fix:
+3. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix:
 
-   ```bash
-   git checkout -b <topic-branch-name>
-   ```
+```bash
+git checkout -b <topic-branch-name>
+```
 
-4. Commit your changes in logical chunks. Please adhere to these [git commit
-   message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-   or your code is unlikely be merged into the main project. Use Git's
-   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
-   feature to tidy up your commits before making them public.
+4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) or your code is unlikely be merged into the main project. Use Git's [interactive rebase](https://help.github.com/articles/about-git-rebase/) feature to tidy up your commits before making them public.
 
 5. Locally merge (or rebase) the upstream development branch into your topic branch:
 
-   ```bash
-   git pull [--rebase] upstream develop
-   ```
+```bash
+git pull [--rebase] upstream develop
+```
 
 6. Push your topic branch up to your fork:
 
-   ```bash
-   git push origin <topic-branch-name>
-   ```
+```bash
+git push origin <topic-branch-name>
+```
 
-7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
-    with a clear title and description against the `develop` branch.
+7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description against the `develop` branch.
 
 **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
 license your work under the terms of the [MIT License](LICENSE) (if it

_config.yml

@@ -27,7 +27,7 @@ algolia:
   index_name:     bootstrap-table
 
 # Custom variables
-current_version:  1.22.4
+current_version:  1.22.5
 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"

bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-table",
-  "version": "1.22.4",
+  "version": "1.22.5",
   "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": {

cypress/e2e/extensions/filter-control/options/bootstrap3.cy.js

@@ -1 +1 @@
-require('../../../../extensions/filter-control/options')('bootstrap3')
+require('../../../../extensions/filter-control/options')('bootstrap3')

cypress/e2e/extensions/filter-control/options/bulma.cy.js

@@ -1 +1 @@
-require('../../../../extensions/filter-control/options')('bulma')
+require('../../../../extensions/filter-control/options')('bulma')

cypress/e2e/extensions/filter-control/options/foundation.cy.js

@@ -1 +1 @@
-require('../../../../extensions/filter-control/options')('foundation')
+require('../../../../extensions/filter-control/options')('foundation')

cypress/e2e/extensions/filter-control/options/materialize.cy.js

@@ -1 +1 @@
-require('../../../../extensions/filter-control/options')('materialize')
+require('../../../../extensions/filter-control/options')('materialize')

cypress/e2e/extensions/filter-control/options/semantic.cy.js

@@ -1 +1 @@
-require('../../../../extensions/filter-control/options')('semantic')
+require('../../../../extensions/filter-control/options')('semantic')

cypress/extensions/filter-control/options.js

@@ -1,6 +1,6 @@
 module.exports = (theme = '') => {
     const baseUrl = require('../../common/utils')(theme, 'for-tests/extensions/filter-control')
-  
+
     describe('Test basic filter control', () => {
       it('Test basic filter control', () => {
         cy.visit(`${baseUrl}filter-control.html`)
@@ -41,4 +41,3 @@ module.exports = (theme = '') => {
       })
     })
   }
-

cypress/fixtures/example.json

@@ -2,4 +2,4 @@
   "name": "Using fixtures to represent data",
   "email": "hello@cypress.io",
   "body": "Fixtures are a great way to mock data for responses to routes"
-}
+}