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
Nelson Chan
46b300808d
Chore: Fix console colors & add JSDoc ( #4170 )
12 months ago
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
1 year ago
Louis Lam
afaa7bb2f0
Do not process debug log for production
1 year ago
Louis Lam
a362206fab
Fix: do not colorize non-string log message
1 year ago
Louis Lam
03e43ab364
Log color and simplify startup log for production ( #3889 )
1 year ago
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)
1 year ago
Louis Lam
91b4ffc6dd
Minior
1 year ago
Matthew Nickson
dc8289df12
Added JSDoc for src/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
1b6c587cc9
Fix #2472
2 years ago
Louis Lam
3b87209e26
Add configurable dns cache
2 years ago
Louis Lam
4cd5b5563f
Fix #1145
2 years ago
Louis Lam
edacff123b
Add UTC in the serverTimezone dropdown
2 years ago
Louis Lam
e07aa982c3
WIP
2 years ago
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2 years ago
Louis Lam
a577fba848
Change DateTime Range using serverTimezone
2 years ago
Louis Lam
a36f24d827
Add configurable server timezone
2 years ago
Louis Lam
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2 years ago
Louis Lam
3f63cb246b
[WIP] Handle timezone offset for timeRange
2 years ago
Louis Lam
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2 years ago
Louis Lam
bb883e6fa0
Move maintenance under `/maintenance`
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
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
c94dcf1533
Added JSDoc for src/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Karel Krýda
2b14bdae62
Merge branch 'master' into master
3 years ago
Louis Lam
410805052e
Log this.chartPeriodHrs
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
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
3 years ago
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
Louis Lam
9ec29c1bc4
Add back debug() for safe, but it is marked as deprecated
3 years ago
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
Andreas Brett
df36a4bb3c
console.info for level "info"
3 years ago
Andreas Brett
e5913c5abc
separate log functions
3 years ago
Andreas Brett
bdcdf47e52
introduce consistent logging
3 years ago
Andreas Brett
11a1f35cc5
independent csprng solution
3 years ago
Andreas Brett
86dcc9bc8f
import webcrypto lib
3 years ago
Andreas Brett
dc1de50a02
fix for max-inclusive
3 years ago
Andreas Brett
11bcd1e2ed
const
3 years ago
Andreas Brett
06310423f4
typo
3 years ago
Andreas Brett
e127e168b6
typed parameters
3 years ago
Andreas Brett
075535ba46
Update util.ts
3 years ago
Andreas Brett
13cf6891ac
cryptographically strong secret generation
...
generate TOTP secret using WebCrypto API (see https://github.com/louislam/uptime-kuma/issues/640 )
3 years ago
LouisLam
11abc1f1e0
[test] add test for i18n currentLocale
3 years ago
LouisLam
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
3 years ago
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
LouisLam
a71814c80b
add util.ts comments
3 years ago
LouisLam
17073fd786
Merge branch 'master' into public-dashboard
3 years ago
Adam Stachowicz
e8ef63e0a3
`removeComments` to false
3 years ago