Louis Lam
1a47563eb8
Merge branch '1.23.X' into version-merge
...
# Conflicts:
# package-lock.json
# package.json
# server/server.js
# server/uptime-kuma-server.js
12 months ago
Louis Lam
f861a48dfc
Smoothing the update for origin check ( #4216 )
12 months ago
Louis Lam
869ee8ec50
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# 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
12 months ago
Louis Lam
482049c72b
Merge pull request from GHSA-88j4-pcx8-q4q3
...
* 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
12 months ago
Adam Hancock
62780001f7
Feature: remote browser support ( #3904 )
...
* [empty commit] pull request for remote browser support
* Remote browser: Added UI screens and DB tables.
* Remote browser working
* Fixing tests
* Fix tests
* Fix tests
* fix tests
* Test browser
* revert init_db.js
* Changed drop down to ActionSelect
* Fix translations
* added remote browsers toggle
* revert changes package-lock
* Fix bad english
* Set default remote browser
* Remote browsers Requested changes
* fixed description.
1 year ago
Louis Lam
8e441dd8f7
Follow up #3263 ( #3847 )
1 year ago
Nelson Chan
7c49f7e5a6
Feat: Full server-side pagination for important events ( #3515 )
...
* Feat: Serverside pagination for importantBeats
* Chore: Remove unused state
* Apply suggestions from code review
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Fix: Add watch for monitor
* Fix: Fix compatibility with dynamic page length
* Chore: Fix lint
* Merge conflict
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Nelson Chan
bfc7b498be
Feat: Toast notification timeout settings ( #3441 )
...
* Add toast timeout to the settings
Changing gui, adding timeout with a fix value
memo
rc
rollback readme
cleanup code
cleanup code
Review fixes
review fix 2
* Feat: Add clearAll button below toastContainer
* Feat: Load & Apply defaults, improve wording
Chore: Remove unused
* Feat: Change setting to affect monitor notif. only
* Apply suggestions from code review
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Chore: Fix JSDoc
---------
Co-authored-by: Berczi Sandor <sandor.berczi@urss.hu>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
Nelson Chan
52946c3e08
Feat: Translate toast messages by adding msgi18n to callbacks ( #3263 )
...
* WIP: Add msgTranslated to callbacks
* Chore: Unify Saved period
* Feat: add support for interpolation
1 year ago
Matthew Nickson
8a92054c2b
Added JSDoc to ESLint ( #3529 )
...
* Added JSDoc to eslint rules
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Fixed JSDoc eslint errors
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Update the check-linters workflow to Node.js 20
---------
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Louis Lam
3e0f5f4231
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
# server/database.js
# server/util-server.js
1 year ago
Nelson Chan
ced576feba
Feat: Show elapsed time in HeartbeatBar ( #3219 )
...
* Feat: Show elapsed time in HeartbeatBar
* Chore: Fix lint
* Feat: Fix calculation & improve efficiency
* Fix: Fix getting tolerance in statusPage
* Chore: Improve comments & apply suggestions
* Optional elapsed time
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Nelson Chan
cda77c1a32
Fix: Prevent race condition in toast ( #3443 )
1 year ago
Nelson Chan
09c6798a30
Fix: Add debounce to favicon update ( #3442 )
1 year ago
Louis Lam
a0bd4b248b
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# package.json
# server/database.js
# src/router.js
1 year ago
Louis Lam
084cf01fcd
Add support for Codespaces ( #3432 )
...
* Create devcontainer.json
* WIP
* WIP
* WIP
* Create README.md
* Try to fix cypress issue
* Add extensions
* WIP
* Minor
1 year ago
Louis Lam
80927332cb
Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering
1 year ago
Louis Lam
16a1a66e09
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/debian-base.dockerfile
# docker/dockerfile
# package.json
# server/database.js
# server/jobs/util-worker.js
# server/model/maintenance.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/uptime-kuma-server.js
1 year ago
Nelson Chan
79b38e0e7b
Feat: Improve monitorList filtering
1 year ago
crystal
d3ecdb8456
Fix auto theme for status pages on custom domains
1 year ago
Frank Elsinga
ac8ca36895
Enabled adding missing keys to the translation database
1 year ago
Nelson Chan
150607cc93
Feat: Support auto theme in status pages
2 years ago
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
Matthew Nickson
ee2eb5109b
Added basic web interface for API keys
...
Web interfaces for manging API keys have been added however translation
keys are still required.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2 years ago
401Unauthorized
912686a299
Merge from upstream
2 years ago
Louis Lam
a5ff27da7a
Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead
2 years ago
Louis Lam
7bb12a7e00
Fix #2608
2 years ago
401Unauthorized
ae3a543b3b
convert language files to json format
2 years ago
Matthew Nickson
dc8289df12
Added JSDoc for src/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
06852bbf0d
Fix the UI broken after removed a monitor
2 years ago
Louis Lam
39987ba9ac
Init server timezone
2 years ago
Louis Lam
54efde8185
Update socket.io and remove an useless event listener
2 years ago
Louis Lam
c84de4d259
WIP: Add maintenance status
2 years ago
Louis Lam
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2 years ago
Louis Lam
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2 years ago
Louis Lam
9d99c39f30
Update Maintenance UI for recurring
2 years ago
Louis Lam
90761cf831
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
2 years ago
Moritz R
60e7824ff0
Merge branch 'master' into master
2 years ago
c0derMo
e356d5f623
Fixing linting & adding documentation
2 years ago
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
Louis Lam
e36b65c2df
Add frontend version
2 years ago
Matthew Nickson
a927f5cd15
Fixed typos + improved clarity and detail of some JSDoc
...
Apply suggestions from code review
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
3 years ago
Matthew Nickson
0e28707307
Minor formatting for JSDoc comments
...
Added a number of minor formatting changes to JSDoc comments in /src
3 years ago
Matthew Nickson
213aca4fc3
Added JSDoc for src/mixins/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Karel Krýda
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
Karel Krýda
f78d01d770
Resolve lint errors
3 years ago
Karel Krýda
7532acc95d
Resolve conflicts
3 years ago
Karel Krýda
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
3 years ago
Louis Lam
07c0801ad5
Make logout button reactive, improve dropdown menu css
3 years ago