60e7824ff0
Merge branch 'master' into master
2 years ago
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
ac449ec1c2
Merge branch 'master' into master
2 years ago
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
2 years ago
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 <mnickson@sidingsmedia.com>
2 years ago
a9f3142cee
Merge branch 'master' into master
2 years ago
ef73af391f
added option for ntlm authorization
2 years ago
87f933df4f
added sqlserver monitor
2 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2 years ago
1e595eaa76
Update linters
2 years ago
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2 years ago
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2 years ago
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
2 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
2 years ago
361e44ad6a
Merge branch 'louislam:master' into master
2 years ago
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
2 years ago
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2 years ago
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
2 years ago
fee88b32e3
Set PRAGMA synchronous = FULL
2 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2 years ago
af44b0beab
Merge branch 'master' into master
2 years ago
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
2 years ago
28d72fcd08
Fix #1409 , slug cannot be empty
2 years ago
8d981c8f0b
[Status Page] Fix migration and unpin incident
2 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
2 years ago
18ec42b060
[Status Page] wip
2 years ago
7c7dbf68c1
[Status Page] wip, sidebar for editor
2 years ago
72ce28a541
Migrate status page table
2 years ago
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
2 years ago
4818bb67d6
Added trailing comma, fixed spelling & translation
2 years ago
b0259b5592
Added docker container monitor
2 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2 years ago
72a59ce7a4
add status page table
2 years ago
a13bdaac84
Merge branch 'master' into logging
2 years ago
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
3 years ago
e5913c5abc
separate log functions
3 years ago
bdcdf47e52
introduce consistent logging
3 years ago
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
665c263c03
Add db migrations for new basic auth fields
3 years ago
670754b697
added MQTT monitor type
3 years ago
44c1b336dc
send certificate notifications in 21, 14, 7 days
3 years ago
a9e319517a
add auto vacuum and shrink database button
3 years ago
d578300104
Merge pull request #743 from andreasbrett/patch-4
...
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
3 years ago
acc2995d86
invalidate used token
3 years ago
Moritz R
Louis Lam
Matthew Nickson
Christopher Pickering
Christopher Pickering
Adam Stachowicz
Uğur Erkan
c0derMo
Andreas Brett
Nelson Chan
Andreas Brett
Ivan Bratović
Tarun Singh