Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-11 16:54:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,914 Commits 30 Branches 115 Tags 100 MiB
d1808fe9a3
Commit Graph

3914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Lam
10228874fa Merge manually 2023-02-24 16:54:58 +08:00
Louis Lam
c5034c8f38 Merge remote-tracking branch 'origin/master' into nlutsenko.telegram_silentnotification 
# Conflicts:
#	server/notification-providers/telegram.js
#	src/components/notifications/Telegram.vue
#	src/languages/en.js
 2023-02-24 16:42:57 +08:00
Louis Lam
7e3734af53 Better handling 2023-02-23 20:59:24 +08:00
Louis Lam
5789112f55 Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction 2023-02-23 20:47:28 +08:00
Louis Lam
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance 
remember prometheus instance and expose it
 2023-02-23 20:43:05 +08:00
Louis Lam
6235ce6b29
Merge pull request #2823 from chakflying/fix/footer-null 
Fix: Add null check for injected HTML
 2023-02-23 18:03:33 +08:00
Louis Lam
81a829bda7
Merge pull request #2812 from louislam/remove-translate-keys 
Remove untranslatable keys and notification list optimization
 2023-02-23 18:03:04 +08:00
Louis Lam
fa7f75a930 Organize notification list 2023-02-23 18:01:42 +08:00
Nelson Chan
7c8cff7708 Fix: Add null check for injected HTML 2023-02-23 17:02:16 +08:00
Austin Miller
5e1489a6ed PagerTree Notification - Send msg when heartbeatJSON null 2023-02-22 14:32:02 -07:00
Louis Lam
df5da0054e Remove more keys 2023-02-22 04:40:03 +08:00
Louis Lam
7da48b27a5 Fix getUniqueDefaultName 2023-02-22 04:29:43 +08:00
Louis Lam
de7df46aa8 Sort the notification list by name and remove translation keys of brand names or product names 2023-02-22 04:27:12 +08:00
Louis Lam
9ccaa4d120
Merge pull request #2786 from luckman212/luckman212-tagsort-1 
sorted tags on dashboard
 2023-02-22 01:11:03 +08:00
Louis Lam
42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code 
Feat: Use error message to detect and set status code
 2023-02-22 01:01:53 +08:00
Louis Lam
aad1a7e0fa
Merge pull request #2806 from andreasbrett/markdown_description 
add markdown support for description
 2023-02-21 16:19:14 +08:00
Louis Lam
2c62d197a0 [exe] Update dependencies 2023-02-21 16:03:41 +08:00
Louis Lam
dad21065cf Update release procedures 2023-02-21 15:45:18 +08:00
Louis Lam
02ddb58686 Fix cwd issues 2023-02-21 15:16:54 +08:00
Louis Lam
c061455475
Merge pull request #2191 from louislam/exe 
Windows Executable File - uptime-kuma.exe
 2023-02-21 03:23:07 +08:00
Louis Lam
0e38391454 Fix dpi issue using app.manifest 2023-02-21 03:11:29 +08:00
Louis Lam
22902139d2 Implement update 2023-02-21 02:50:25 +08:00
Louis Lam
4642f9be0a Fix download-dist.js do not exit sometimes 2023-02-20 23:15:49 +08:00
Andreas Brett
372c6b9078
add markdown support for description 2023-02-20 16:09:17 +01:00
Louis Lam
cf32b8bc64 Read latest version from website and add Run when system starts 2023-02-20 20:26:53 +08:00
Louis Lam
6a98ffe2f6 Merge remote-tracking branch 'origin/master' into exe 
# Conflicts:
#	.dockerignore
#	.gitignore
 2023-02-20 18:28:35 +08:00
Faruk Genç
72106ba4c4 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-18 22:38:40 +03:00
Faruk Genç
3ab0faee91 Add update query for old monitors and save new data correctly 2023-02-18 22:18:48 +03:00
Faruk Genç
9e3a77f419 Customize body placeholder for body encoding 2023-02-18 17:02:56 +03:00
Louis Lam
d1c43f432a
Merge pull request #2747 from OidaTiftla/rename-consequently-to-consecutively 
Rename "consequently" to "consecutively" as suggested by @skylarv
 2023-02-18 16:53:45 +08:00
Louis Lam
ba3c7210ab Merge remote-tracking branch 'origin/master' into rename-consequently-to-consecutively 
# Conflicts:
#	src/lang/cs-CZ.json
#	src/lang/de-DE.json
#	src/lang/en.json
#	src/lang/es-ES.json
#	src/lang/fr-FR.json
#	src/lang/id-ID.json
#	src/lang/pl.json
#	src/lang/pt-BR.json
#	src/lang/tr-TR.json
#	src/lang/zh-HK.json
 2023-02-18 16:52:47 +08:00
Faruk Genç
c9b4a7f53e Change column type 2023-02-17 17:59:43 +03:00
Matthew Nickson
b8720b46c3
Switched to using Authorization header 
Prometheus doesn't support using custom headers for exporters, however
it does support using the Authorisation header with basic auth. As
such, we switched from using X-API-Key to Authorization with the basic
scheme and an empty username field.

Also added a rate limit for API endpoints of 60 requests in a minute

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 21:53:49 +00:00
Matthew Nickson
1d4af39820
Fixed JSDoc for one method 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 19:31:22 +00:00
Luke Hamburg
dd1d71530f
sorted tags on dashboard 
see https://github.com/louislam/uptime-kuma/issues/2785
 2023-02-15 14:06:29 -05:00
Matthew Nickson
01c71a0242
Fixed logic errors, removed dev leftovers 
Fixed a logic error where a comma was used instead of an or, also
removed leftover console.logs from testing.

Date picker is now dissabled when don't expire is checked.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 11:15:15 +00:00
Matthew Nickson
d553c4c4f7
Added missing translation keys 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 00:53:42 +00:00
Matthew Nickson
e7feca1cd6
Added API key authentication handler 
API key authentication is now possible by making use of the X-API-Key
header. API authentication will only be enabled when a user adds their
first API key, up until this point, they can still use their username
and password to authenticate with API endpoints. After the user adds
their first API key, they may only use API keys in future to
authenticate with the API.

In this commit, the prometheus /metrics endpoint has been changed over
to the new authentication system.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 00:39:29 +00:00
Matthew Nickson
cd796898d0
Added expiry check for frontend 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-14 22:41:06 +00:00
Matthew Nickson
05443f9bb7
Added language keys 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-14 22:16:41 +00:00
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key 2023-02-14 19:53:33 +00:00
Matthew Nickson
ee2eb5109b
Added basic web interface for API keys 
Web interfaces for manging API keys have been added however translation
keys are still required.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-14 19:49:04 +00:00
Louis Lam
fdc3b2d57a Update to 1.20.1 2023-02-15 03:23:59 +08:00
Louis Lam
e04a8203dc Fix npm issue for deploy script 2023-02-15 03:20:40 +08:00
Louis Lam
2620ec3fae
Merge pull request #2767 from UptimeKumaBot/weblate-uptime-kuma-uptime-kuma 
Translations update from Uptime Kuma Weblate
 2023-02-15 03:13:12 +08:00
Louis Lam
1877b90b3a Translated using Weblate (Finnish) 
Currently translated at 100.0% (697 of 697 strings)

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fi/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00
Michal
609a61e600 Translated using Weblate (Czech) 
Currently translated at 100.0% (697 of 697 strings)

Co-authored-by: Michal <black23@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00
MrEddX
32ddff4e64 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (697 of 697 strings)

Co-authored-by: MrEddX <mreddx@chatrix.one>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/bg/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00
AmadeusGraves
11b45dd274 Translated using Weblate (Spanish) 
Currently translated at 97.7% (681 of 697 strings)

Co-authored-by: AmadeusGraves <angelfx19@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/es/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00
Jonne Saloranta
fb2f7179e9 Translated using Weblate (Finnish) 
Currently translated at 100.0% (697 of 697 strings)

Co-authored-by: Jonne Saloranta <saloranta.jonne@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fi/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00