Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.0.0 #993

Closed
wants to merge 6 commits into from
Closed

Release 3.0.0 #993

wants to merge 6 commits into from

Conversation

liamkeily
Copy link
Collaborator

Created this branch from master and did the following

  • Merged in dev branch
  • Updated version in package.json
  • Run npm install
  • Run npm run build
  • Commit everything

dependabot bot and others added 6 commits July 12, 2023 09:44
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix Logo Path

* Remove Outdated Live Reload Script
* Bootstrap 5 - package.json

* Bootstrap 5 - Classes updated for Bootstrap 3-5 differences

* Bootstrap 5 - Popover library conversion

* Bootstrap 5 - Bootstrap Icons replace Glyphicons

* Bootstrap 5 - Comment out bootbox until npm issues can be resolved

Something to do with the way JS packages are installed.
I'm not sure if it's the right solution or not, but the error goes away
if I do this.

-  } else if (typeof exports === 'object') {
+  } else if (typeof module === 'object') {
     // Node, CommonJS-like
     module.exports = factory(require('jquery'));

* fix(plugins): bt-checkbox BS5 markup

* fix(example): remove bt-selectpicker plugin use

* Fix bt-checkbox

* Fix checked squares

* Latest icons version

* better icons

* Use local package instead of cdn for icons

* Fix offset for bootstrap 5

* dark mode

* tooltip

* default theme

* float-end logo

* new lock file

* Use btn-sm instead of css hack

* Re-enable bootbox

* Remove bi preifx

* use chosen-selectpicker instead of bt-selectpicker

* disable chosen picker for now

* Get rid of weird focus outline on checkboxes

* Update index.html

* Remove unnecessary bootswatch

* Remove inconsistent padding

* Remove form-inline

* yarn

* Replace `hide` with `d-none`

* `form-control` is now `form-select`

* If bt-selectpicker did work, this would need to be form-select

* Drop Support for Bootstrap Select as it doesn't retain selections properly when enabled

* Unused

---------

Co-authored-by: Stephen Morton <stephen.c.morton@gmail.com>
Co-authored-by: smorton <stephen.morton@nokia.com>
Co-authored-by: David Ethell <david@ethell.com>
@mistic100
Copy link
Owner

mistic100 commented Jan 30, 2024

Merging into master from a remote is not really wise. Why don't you do it here directly ?

Note : if you want a clean git tree like I had previously your last commit should amend the merge commit, and renamed to "Release 3.0.0"

@liamkeily
Copy link
Collaborator Author

@mistic100 ok thanks i'll have another look at recreating

@liamkeily liamkeily closed this Jan 30, 2024
@liamkeily liamkeily deleted the release-3.0.0 branch January 30, 2024 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants