Karel Krýda
|
fa777c5bc0
|
Update server/server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Karel Krýda
|
6d0683b055
|
Update server/routers/api-router.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Karel Krýda
|
25262cfb91
|
Update server/model/monitor.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
Louis Lam
|
7a46b44d25
|
Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
# src/components/HeartbeatBar.vue
|
3 years ago |
|
Louis Lam
|
8ede6d888f
|
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
|
3 years ago |
|
Louis Lam
|
cec0521834
|
[Discord] Fix ping type should no port, update better naming
|
3 years ago |
|
Louis Lam
|
73b603dd10
|
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
Fixed incorrect uptime calculation for push monitors
|
3 years ago |
|
Louis Lam
|
66971deaf4
|
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
|
3 years ago |
|
Louis Lam
|
8077744c60
|
Merge pull request #1604 from c-w/fix-apprise-zulip
Fix apprise integration for Zulip Streams
|
3 years ago |
Jordan Bertasso
|
c5faf709b8
|
Merge branch 'master' into fix-1448-discord-service-url
|
3 years ago |
Karel Krýda
|
7da9f139c1
|
Bug fix
|
3 years ago |
|
Karel Krýda
|
42f931f6cf
|
Merge branch 'master' into master
|
3 years ago |
|
Karel Krýda
|
2fe5c090aa
|
small fixes
|
3 years ago |
Clemens Wolff
|
b680371746
|
Make apprise notification title configurable in UI
|
3 years ago |
|
Louis Lam
|
4e3258579d
|
Merge branch 'master' into uptime-badges
# Conflicts:
# server/util-server.js
|
3 years ago |
|
Karel Krýda
|
9a35386841
|
Merge branch 'master' into master
|
3 years ago |
|
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
3 years ago |
|
Clemens Wolff
|
4b9dc2890d
|
Convert let to const
|
3 years ago |
|
Clemens Wolff
|
f9004bcbed
|
Add optional title to apprise notification
|
3 years ago |
|
Clemens Wolff
|
bc174c3325
|
Extract child process args into variable
|
3 years ago |
|
Louis Lam
|
4c2753af46
|
Remove an unused variable
|
3 years ago |
|
Louis Lam
|
c6ba5b621c
|
Remove isPublished, checkPublished which had been removed in upstream.
|
3 years ago |
|
Karel Krýda
|
2b14bdae62
|
Merge branch 'master' into master
|
3 years ago |
|
Louis Lam
|
d962ab7a1c
|
Merge branch 'master' into uptime-badges
# Conflicts:
# package-lock.json
# server/routers/api-router.js
|
3 years ago |
|
Louis Lam
|
53b98ad3e4
|
Add more comment for aliyun-sms fix
|
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
|
b4ffcc5555
|
Added JSDoc
|
3 years ago |
|
Louis Lam
|
42ea3fb412
|
Update server/util-server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Louis Lam
|
9f8b3151d8
|
Update server/util-server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
GOGOsu
|
73e38a13d2
|
Update server/notification-providers/aliyun-sms.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
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 |
|
GOGOsu
|
369477b4b9
|
Update aliyun-sms.js
|
3 years ago |
|
GOGOsu
|
2347a01f7c
|
Update aliyun-sms.js
Add comments for the changed code.
|
3 years ago |
|
GOGOsu
|
ae2c49a729
|
Update aliyun-sms.js
|
3 years ago |
|
GOGOsu
|
b9e72b9645
|
Update aliyun-sms.js
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
|
3 years ago |
|
Louis Lam
|
60538036c6
|
[#1108] Change "true" to "up"
|
3 years ago |
|
Louis Lam
|
0ba5d031d0
|
Merge branch 'master' into push-status-param
# Conflicts:
# server/routers/api-router.js
|
3 years ago |
|
Louis Lam
|
023db1450d
|
Fix #1577
|
3 years ago |
|
Louis Lam
|
1687de163c
|
Merge pull request #1565 from Saibamen/eslint
Fix some of ESLint warnings
|
3 years ago |
Adam Stachowicz
|
1e595eaa76
|
Update linters
|
3 years ago |
|
Adam Stachowicz
|
5fbfacf5ce
|
Fix ESlint warnings
|
3 years ago |
Matthew Nickson
|
587faecf87
|
Made value nullable in apicache JSDoc
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Matthew Nickson
|
46da5e51be
|
Fix JSDoc grammar
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Matthew Nickson
|
1eecdec2d9
|
Update JSDoc for better clarity
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
Jens Neuber
|
64a33d7455
|
Update server/util-server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Matthew Nickson
|
09e61d9d63
|
Changed Array<T> to type[]
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Matthew Nickson
|
9996ba1636
|
Add JSDoc to server/modules/apicache/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Matthew Nickson
|
c2f6c5b42e
|
Added JSDoc docs for mqttAsync
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
