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

Development v6 #3019

Merged
merged 842 commits into from
Sep 2, 2024
Merged

Development v6 #3019

merged 842 commits into from
Sep 2, 2024

Conversation

PromoFaux
Copy link
Member

@PromoFaux PromoFaux commented May 8, 2024

Step one of pre-release, merge development-v6 into development branch

DL6ER and others added 30 commits December 15, 2023 20:25
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.1.0...3.1.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v4.0.0...v4.0.1)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [moment](https://github.com/moment/moment) from 2.29.4 to 2.30.1.
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.4...2.30.1)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Christian König <[email protected]>
Bumps [jquery](https://github.com/jquery/jquery) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](jquery/jquery@3.7.0...3.7.1)

---
updated-dependencies:
- dependency-name: jquery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Christian König <[email protected]>
Signed-off-by: Christian König <[email protected]>
Signed-off-by: Christian König <[email protected]>
Co-authored-by: RD WebDesign <[email protected]>
Signed-off-by: Dominik <[email protected]>
Signed-off-by: DL6ER <[email protected]>
Bumps [bootstrap-select](https://github.com/snapappointments/bootstrap-select) from 1.13.17 to 1.13.18.
- [Release notes](https://github.com/snapappointments/bootstrap-select/releases)
- [Changelog](https://github.com/snapappointments/bootstrap-select/blob/main/CHANGELOG.md)
- [Commits](snapappointments/bootstrap-select@v1.13.17...v1.13.18)

---
updated-dependencies:
- dependency-name: bootstrap-select
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.32 to 8.4.33.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.32...8.4.33)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Christian König <[email protected]>
@PromoFaux
Copy link
Member Author

lol @yubiuser - still conflicts 😬

@yubiuser
Copy link
Member

Ahh, but why?

Copy link
Contributor

Conflicts have been resolved.

scripts/pi-hole/js/login.js Fixed Show fixed Hide fixed
scripts/pi-hole/js/login.js Fixed Show resolved Hide resolved
Comment on lines +588 to +594
"<i class='fa fa-fw " +
querystatus.icon +
" " +
querystatus.colorClass +
"' title='" +
rawtext +
"'></i>"

Check warning

Code scanning / CodeQL

DOM text reinterpreted as HTML Medium

DOM text
is reinterpreted as HTML without escaping meta-characters.
dependabot bot and others added 5 commits August 17, 2024 10:30
Bumps [xo](https://github.com/xojs/xo) from 0.58.0 to 0.59.3.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.58.0...v0.59.3)

---
updated-dependencies:
- dependency-name: xo
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 4.4.3 to 4.4.4.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](chartjs/Chart.js@v4.4.3...v4.4.4)

---
updated-dependencies:
- dependency-name: chart.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: yubiuser <[email protected]>
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

github-actions bot commented Sep 2, 2024

Conflicts have been resolved.

@PromoFaux
Copy link
Member Author

@DL6ER / @rdwebdesign do we want to do something about the CodeQL report or just dismiss it?

@DL6ER
Copy link
Member

DL6ER commented Sep 2, 2024

I will open a PRs to remove the redirection feature

@PromoFaux PromoFaux merged commit 465bb1c into devel Sep 2, 2024
11 checks passed
@PromoFaux PromoFaux deleted the development-v6 branch September 14, 2024 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
7 participants