ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-31 03:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2819 commits 31 branches 115 tags 54 MiB
Commit graph

2819 commits

This branch
This branch
All branches
Author SHA1 Message Date
Louis Lam
4053b9db1f Merge remote-tracking branch 'origin/master' 2022-04-12 17:46:24 +08:00
Louis Lam
772d009f43 Merge branch 'master' into fluencydoc_master 
# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
 2022-04-12 17:44:04 +08:00
MrEddX
ae54d9c011
Merge branch 'louislam:master' into bulgarian 2022-04-12 12:37:52 +03:00
Louis Lam
5ca606fe99
Merge pull request #1141 from marcules/issue/1138 
Issue/1138
 2022-04-12 17:32:52 +08:00
Louis Lam
6179f6c982 Merge branch 'master' into issue/1138 
# Conflicts:
#	server/server.js
 2022-04-12 17:15:33 +08:00
Louis Lam
94770cf865 Resolve log message null reference 2022-04-12 16:57:22 +08:00
Louis Lam
9ec29c1bc4 Add back debug() for safe, but it is marked as deprecated 2022-04-12 16:37:05 +08:00
Louis Lam
279e2eb3f6 Merge branch 'master' into logging 
# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
 2022-04-12 16:32:14 +08:00
Louis Lam
1ba92d803e Update to 1.14.0 2022-04-12 14:17:13 +08:00
Louis Lam
45ca3085b2
Update CONTRIBUTING.md 2022-04-12 13:53:52 +08:00
jordanbertasso
0765f05090 Update Discord tests 2022-04-12 09:52:16 +10:00
jordanbertasso
2638d68c97 Cover dns and steam types in Discord notifs 2022-04-12 09:52:07 +10:00
Matthew Nickson
e38742a2d0
[empty commit] pull request for #1059 2022-04-11 19:58:31 +01:00
Louis Lam
a0d1ae2cce Better alignment of monitor list item 2022-04-11 18:02:18 +08:00
jordanbertasso
1b1e0f6dd9 Add Discord tests 2022-04-10 22:02:30 +10:00
jordanbertasso
0961c6d9b3 Check for ping and port type in discord notifs 2022-04-10 21:45:07 +10:00
jordanbertasso
ce7d8c38c5 [empty commit] pull request for issue #1448 2022-04-10 21:43:52 +10:00
Louis Lam
f030487f7d Fix theme color that do not apply to status page with a custom domain 2022-04-10 13:46:00 +08:00
Louis Lam
316e65d35a Update to 1.14.0-beta.2 2022-04-10 00:46:34 +08:00
Louis Lam
df5ba02f3f
Merge pull request #1415 from louislam/status-page-domain 
[Status Page] Map domain names to status pages
 2022-04-10 00:42:31 +08:00
Louis Lam
c9fa183712 Manage domain names 2022-04-10 00:25:27 +08:00
Louis Lam
0b9b5102ec Minor 2022-04-09 17:23:22 +08:00
Louis Lam
c399984b7f Improve status page sidebar 2022-04-09 17:03:10 +08:00
Louis Lam
0afa0be5c2 Merge branch 'master' into status-page-domain 
# Conflicts:
#	server/database.js
 2022-04-09 16:07:09 +08:00
Louis Lam
6a30dbd71a Fix Mattermost when channel is empty #1468 2022-04-09 15:44:50 +08:00
Louis Lam
a2d9474e85 Copy some keys from zh-TW to zh-HK 2022-04-09 14:51:26 +08:00
Louis Lam
8479e772cd
Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation 
Update zh-TW translation
 2022-04-09 14:44:44 +08:00
Louis Lam
2e50ef0e8f
Merge pull request #1450 from AnnAngela/1.14.0-zh_cn 
1.14.0 translation improvement
 2022-04-09 14:40:38 +08:00
Louis Lam
4fb2c69dd1
Merge pull request #1461 from louislam/proxy-improvement 
Proxy Improvements
 2022-04-09 13:54:28 +08:00
Louis Lam
c08910a65c
Update README.md 2022-04-08 19:45:39 +08:00
Louis Lam
943c904256
Update docker-compose.yml 2022-04-08 19:43:51 +08:00
JohnnyChiang
25b5edea7f Update zh-TW translation 2022-04-08 01:47:01 +08:00
Louis Lam
7bbaeffd3e Fix reset-password (issue caused by 5027fcd320) 2022-04-08 00:56:56 +08:00
Louis Lam
008dc27f52 Reload proxy settings for monitors in the monitorList 2022-04-07 23:03:45 +08:00
Louis Lam
5027fcd320 Export server using an object class 2022-04-07 23:02:57 +08:00
Louis Lam
d5e68f8453 Export monitor list 2022-04-07 22:53:32 +08:00
Louis Lam
fcb577097b [Proxy] Change to radio button 2022-04-07 15:26:00 +08:00
Louis Lam
082c2dd32d Remove restartMonitors() and move proxy socket events to a socket handler file 2022-04-07 14:45:37 +08:00
Louis Lam
e89356b283 Show proxy option for http monitor only 2022-04-07 14:37:33 +08:00
Louis Lam
6014b9534f Merge remote-tracking branch 'origin/master' 2022-04-06 23:20:40 +08:00
Louis Lam
8b45a95cc3 Merge branch '1.13.X' 
# Conflicts:
#	package.json
 2022-04-06 23:20:22 +08:00
Louis Lam
02becfd113 Update to 1.13.2 2022-04-06 22:54:03 +08:00
Louis Lam
8ad992eac8 Fix setup issue when using npm 8.6.0 2022-04-06 22:50:21 +08:00
Louis Lam
c4e74c9943 Render <StatusPage> if domain matched 2022-04-06 22:43:22 +08:00
Louis Lam
fee88b32e3 Set PRAGMA synchronous = FULL 2022-04-06 20:48:13 +08:00
Louis Lam
ffc5bca51d
Update required tools' links 2022-04-06 13:18:12 +08:00
AnnAngela
511b9dd425
Update fs-rmSync.js 2022-04-06 10:31:01 +08:00
AnnAngela
e9dd64b6f0
Update comments of fs-rmSync.js 2022-04-06 10:20:57 +08:00
Louis Lam
355aec46dc Merge branch 'master' into status-page-domain 2022-04-05 22:59:39 +08:00
Louis Lam
c9deea9fdf
Merge pull request #1456 from Arubinu/alerta 
Fix "API key parameter 'undefined' is invalid"
 2022-04-05 22:51:33 +08:00