mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-28 06:59:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2990 commits 31 branches 117 tags 70 MiB
Commit graph

117 commits

Author SHA1 Message Date
Moritz R 60e7824ff0
Merge branch 'master' into master 2022-07-24 14:37:22 +02:00
Louis Lam baa592bce3 Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page 2022-07-04 18:21:56 +08:00
Louis Lam 1af6d33fcd Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395 2022-06-28 22:11:59 +08:00
Matthew Nickson f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page 2022-06-18 23:53:35 +01:00
Moritz R ac449ec1c2
Merge branch 'master' into master 2022-06-15 11:33:00 +02:00
Louis Lam 6682839ec8 Merge remote-tracking branch 'origin/master' into ntml-auth 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
 2022-06-14 10:36:29 +08:00
Matthew Nickson fbfa5a33ed
Added Clickable hostname on status page. #1221 
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.

Signed-off-by: Matthew Nickson <[email protected]>
 2022-06-11 17:23:12 +01:00
Moritz R a9f3142cee
Merge branch 'master' into master 2022-05-19 14:24:02 +02:00
Christopher Pickering ef73af391f
added option for ntlm authorization 2022-05-13 12:58:23 -05:00
Christopher Pickering 87f933df4f
added sqlserver monitor 2022-05-12 12:48:03 -05:00
Louis Lam 1687de163c
Merge pull request #1565 from Saibamen/eslint 
Fix some of ESLint warnings
 2022-04-27 15:00:49 +08:00
Adam Stachowicz 1e595eaa76 Update linters 2022-04-26 01:26:57 +02:00
Matthew Nickson 4ddbf71920
Fixed trailing spaces in database.js 
Signed-off-by: Matthew Nickson <[email protected]>
 2022-04-21 17:15:39 +01:00
Matthew Nickson 6d22ebedca
Merge branch 'master' into add-JSDoc-comments 2022-04-21 13:01:22 +01:00
Matthew Nickson 03b2d8d521
Add JSDoc to server/* 
Signed-off-by: Matthew Nickson <[email protected]>
 2022-04-20 19:56:40 +01:00
Louis Lam 5fa62a888c Merge branch 'master' into mqtt2 
# Conflicts:
#	server/database.js
#	server/util-server.js
 2022-04-17 19:46:33 +08:00
Louis Lam 8eb83394f7 Refine UI/UX for custom css / footer text. Add switch for show/hide powered by 2022-04-17 14:53:13 +08:00
Louis Lam b1c7915bc1 Merge branch 'master' into mqtt2 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	src/pages/EditMonitor.vue
 2022-04-16 13:28:39 +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
Moritz R 361e44ad6a
Merge branch 'louislam:master' into master 2022-04-13 15:58:17 +02: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 0afa0be5c2 Merge branch 'master' into status-page-domain 
# Conflicts:
#	server/database.js
 2022-04-09 16:07:09 +08:00
Louis Lam 7bbaeffd3e Fix reset-password (issue caused by 5027fcd320) 2022-04-08 00:56:56 +08:00
Louis Lam fee88b32e3 Set PRAGMA synchronous = FULL 2022-04-06 20:48:13 +08:00
Louis Lam 70311f7a5a Add an option to enable/disable the domain name expiry notification #1364 2022-04-05 21:27:50 +08:00
Moritz R af44b0beab
Merge branch 'master' into master 2022-04-03 17:19:29 +02:00
Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js
 2022-04-01 14:57:35 +08:00
Louis Lam 28d72fcd08 Fix #1409, slug cannot be empty 2022-03-24 23:43:07 +08:00
Louis Lam 8d981c8f0b [Status Page] Fix migration and unpin incident 2022-03-18 14:14:22 +08:00
Louis Lam 1033ca5cf4 [Status Page] wip, combine api, add status_page_id into group and incident tables 2022-03-16 15:38:10 +08:00
Louis Lam 18ec42b060 [Status Page] wip 2022-03-16 14:14:47 +08:00
Louis Lam 7c7dbf68c1 [Status Page] wip, sidebar for editor 2022-03-15 12:00:29 +08:00
Louis Lam 72ce28a541 Migrate status page table 2022-03-08 14:33:35 +08:00
Uğur Erkan 78d76512ba Add http and https proxy feature 
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.

Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
 2022-03-06 19:34:49 +03:00
c0derMo 4818bb67d6 Added trailing comma, fixed spelling & translation 2022-01-14 09:09:37 +00:00
c0derMo b0259b5592 Added docker container monitor 2022-01-13 16:17:07 +00:00
Louis Lam 076d6bdbb6 Merge branch 'master' into mqtt 
# Conflicts:
#	package-lock.json
#	server/database.js
 2022-01-13 11:09:16 +08:00
Louis Lam 72a59ce7a4 add status page table 2021-12-27 18:54:48 +08:00
Andreas Brett a13bdaac84
Merge branch 'master' into logging 2021-11-29 20:32:42 +01:00
Louis Lam 92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth 
Implement explicit HTTP "basic" authentication support
 2021-11-23 22:48:54 +08:00
Nelson Chan 07742799ed Test: Fix tests 
Test: Add clear stats test

Test: Attempt to fix tests

Test: Add test for disable auth

Update README
 2021-11-17 10:45:19 +08: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
Ivan Bratović 179ca232bc Minor refactor - change variable names and add commas to object definitions 2021-11-04 10:14:17 +01:00
Ivan Bratović 665c263c03 Add db migrations for new basic auth fields 2021-11-04 09:50:10 +01:00
Tarun Singh 670754b697 added MQTT monitor type 2021-11-03 21:46:43 -04:00
Louis Lam 44c1b336dc send certificate notifications in 21, 14, 7 days 2021-10-27 15:33:15 +08:00
Louis Lam a9e319517a add auto vacuum and shrink database button 2021-10-26 23:02:32 +08:00
Louis Lam d578300104
Merge pull request #743 from andreasbrett/patch-4 
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
 2021-10-23 17:00:46 +08:00
Andreas Brett acc2995d86 invalidate used token 2021-10-19 00:42:33 +02:00