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
2023-12-11 02:13:47 +08:00
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
2023-12-10 20:40:40 +08:00
Nelson Chan
46b300808d
Chore: Fix console colors & add JSDoc ( #4170 )
2023-12-09 17:48:25 +08:00
Louis Lam
e9bf02fc2c
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package-lock.json
# package.json
# server/model/monitor.js
# server/monitor-types/tailscale-ping.js
# server/socket-handlers/general-socket-handler.js
# server/uptime-kuma-server.js
2023-11-25 03:25:03 +08:00
Louis Lam
afaa7bb2f0
Do not process debug log for production
2023-11-24 16:03:35 +08:00
Louis Lam
a362206fab
Fix: do not colorize non-string log message
2023-10-14 17:48:41 +08:00
Louis Lam
03e43ab364
Log color and simplify startup log for production ( #3889 )
2023-10-14 03:00:34 +08:00
Louis Lam
7212d884ef
Enable eslint for util.ts ( #3887 )
...
* Enable eslint for util.ts
* Drop babel (since eslint parser was replaced by typescript-parser and it doesn't seem to be used anywhere)
* Apply "plugin:@typescript-eslint/recommended"
* Minor
* Remove comment for generated file (Keep the first comment only)
2023-10-13 22:42:45 +08:00
Louis Lam
91b4ffc6dd
Minior
2023-10-07 20:52:19 +08:00
Matthew Nickson
dc8289df12
Added JSDoc for src/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:55:51 +00:00
Louis Lam
1b6c587cc9
Fix #2472
2022-12-26 14:46:29 +08:00
Louis Lam
3b87209e26
Add configurable dns cache
2022-12-12 17:19:22 +08:00
Louis Lam
4cd5b5563f
Fix #1145
2022-12-08 23:21:55 +08:00
Louis Lam
edacff123b
Add UTC in the serverTimezone dropdown
2022-10-12 22:13:07 +08:00
Louis Lam
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2022-10-11 14:52:47 +08:00
Louis Lam
a577fba848
Change DateTime Range using serverTimezone
2022-10-10 02:28:03 +08:00
Louis Lam
a36f24d827
Add configurable server timezone
2022-10-09 20:59:58 +08:00
Louis Lam
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2022-09-28 00:48:15 +08:00
Louis Lam
3f63cb246b
[WIP] Handle timezone offset for timeRange
2022-09-25 19:38:28 +08:00
Louis Lam
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2022-09-24 19:18:24 +08:00
Louis Lam
bb883e6fa0
Move maintenance under /maintenance
2022-09-17 22:00:11 +08:00
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
2022-09-17 16:12:57 +08:00
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>
2022-06-02 16:40:56 +01:00
Matthew Nickson
c94dcf1533
Added JSDoc for src/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-02 14:32:38 +01:00
Karel Krýda
2b14bdae62
Merge branch 'master' into master
2022-05-01 12:40:34 +02:00
Louis Lam
410805052e
Log this.chartPeriodHrs
2022-05-01 17:46:43 +08:00
Karel Krýda
7532acc95d
Resolve conflicts
2022-04-30 14:33:54 +02:00
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
2022-04-30 13:40:34 +02:00
Louis Lam
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
2022-04-16 14:50:48 +08:00
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
2022-04-13 23:33:37 +08:00
Louis Lam
9ec29c1bc4
Add back debug() for safe, but it is marked as deprecated
2022-04-12 16:37:05 +08:00
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
2022-01-23 15:22:00 +01:00
Andreas Brett
df36a4bb3c
console.info for level "info"
2021-11-15 18:02:14 +01:00
Andreas Brett
e5913c5abc
separate log functions
2021-11-15 17:52:28 +01:00
Andreas Brett
bdcdf47e52
introduce consistent logging
2021-11-11 12:31:28 +01:00
Andreas Brett
11a1f35cc5
independent csprng solution
2021-10-18 01:06:20 +02:00
Andreas Brett
86dcc9bc8f
import webcrypto lib
2021-10-13 17:34:56 +02:00
Andreas Brett
dc1de50a02
fix for max-inclusive
2021-10-11 01:18:33 +02:00
Andreas Brett
11bcd1e2ed
const
2021-10-10 22:55:32 +02:00
Andreas Brett
06310423f4
typo
2021-10-10 22:19:10 +02:00
Andreas Brett
e127e168b6
typed parameters
2021-10-10 22:15:42 +02:00
Andreas Brett
075535ba46
Update util.ts
2021-10-10 21:59:23 +02:00
Andreas Brett
13cf6891ac
cryptographically strong secret generation
...
generate TOTP secret using WebCrypto API (see https://github.com/louislam/uptime-kuma/issues/640 )
2021-10-10 21:58:23 +02:00
LouisLam
11abc1f1e0
[test] add test for i18n currentLocale
2021-10-08 13:35:04 +08:00
LouisLam
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
2021-10-07 17:39:58 +08:00
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
LouisLam
a71814c80b
add util.ts comments
2021-09-21 21:28:45 +08:00
LouisLam
17073fd786
Merge branch 'master' into public-dashboard
2021-09-21 21:25:16 +08:00
Adam Stachowicz
e8ef63e0a3
removeComments to false
2021-09-21 00:48:26 +02:00
