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

1.23.9 changes merge to master #4208

Merged
merged 12 commits into from
Dec 10, 2023
Merged

1.23.9 changes merge to master #4208

merged 12 commits into from
Dec 10, 2023

Conversation

louislam
Copy link
Owner

No description provided.

CommanderStorm and others added 11 commits December 4, 2023 01:15
…ult `type="submit"` (#4162)

* fixed the buttons having a default type="submit"

* fixed linting issue
* Fix ESLint warnings. Update workflows. 0 ESLint warnings for auto-test

* json-yaml-validate: Fix `unable to find version `v2``
* added the `Search monitored sites` label

* rebase
…rent icon.svg was reduced size by a contributor previously, but the border is detached after that, which cannot edit by any svg editor anymore.
* added a helptext for `ntfy`'s `priority` field

* linting fixes

* removed an unnecessary `Math.max` call
* WIP

* WIP

* Handle parsing error

* Fix matching origin issue
* WIP, still need to handle npm run reset-password

* Implement it for "npm run reset-password"

Bug fixes and change along with this commit
- Move `ssl`, `hostname`, `port` to ./server/config.js, so `reset-password` is able to read it
- Fix: FBSD is missing, no idea who dropped it.
- Fix: Frontend code should not require any backend code (./server/config.js), moved "badgeConstants" to the common util (./src/util.ts) and drop vite-common.js

* Minor
# Conflicts:
#	.github/workflows/auto-test.yml
#	extra/reset-password.js
#	package-lock.json
#	package.json
#	server/routers/status-page-router.js
#	server/server.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
#	src/components/ActionInput.vue
#	src/util.js
#	src/util.ts
@louislam louislam force-pushed the 1.23.X-merge-to-2.X.X branch 2 times, most recently from 0ce10e2 to 51be369 Compare December 10, 2023 18:28
@louislam louislam merged commit 65e57e5 into master Dec 10, 2023
17 checks passed
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.

4 participants