Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-20 21:24:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,909 Commits 31 Branches 117 Tags 103 MiB
391692a708
Commit Graph

3909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nelson Chan
391692a708 Chore: Add support for encrypted SSL-key 2023-03-09 00:00:07 +08:00
Louis Lam
94c3861608 Update Apprise to 1.3.0 2023-03-01 23:23:16 +08:00
Louis Lam
71c800b880 Merge remote-tracking branch 'origin/master' into notification-provider-pagertree 
# Conflicts:
#	src/lang/en.json
 2023-03-01 16:17:18 +08:00
Louis Lam
beafbf27ad
Merge pull request #2858 from louislam/1.20.X 
Merge 1.20.x to master
 2023-02-28 18:13:15 +08:00
Louis Lam
958354e4db Minor 2023-02-28 16:58:36 +08:00
Louis Lam
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key 
Added #1685: Add API keys for API authentication
 2023-02-28 16:55:50 +08:00
Matthew Nickson
7e178d93df
Moved location of disable expiry checkbox 
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-27 18:44:32 +00:00
Matthew Nickson
97e276bdb5
Fixed processing error with add API key 
Also added padding below add button

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-27 18:19:56 +00:00
Louis Lam
fc8a324f41 [exe] single instance only 2023-02-27 18:52:19 +08:00
Louis Lam
bba8c6fe4e [exe] Open menu item is clickable after the server is ready 2023-02-27 18:48:11 +08:00
Louis Lam
fee8fd9320 [exe] Use Environment.CurrentDirectory instead of overriding fs 2023-02-27 18:45:54 +08:00
Matthew Nickson
669f8700b2
Switched to nanoid for key generation 
To try and prevent any security issues, use an external package to
generate key instead of doing it ourselves. Note: we have to use nanoid
version 3 as nanoid version 4 requires ESM. Currently, nanoid v3 is
still supported.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-26 19:36:50 +00:00
Matthew Nickson
11fa690e09
Updated API Keys UI 
The UI has now been moved to the settings page.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-26 18:07:57 +00:00
Matthew Nickson
06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key 2023-02-26 16:47:45 +00:00
Matthew Nickson
42a69c16ca
Switched to crypto.randomBytes fpr key generation 
Keys are now 32 bytes long encoded in a URL safe base64 string

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-26 16:47:34 +00:00
Louis Lam
b91c526d2e [exe] Show server status 2023-02-26 17:56:01 +08:00
Louis Lam
5b0b743f81 Update to 1.20.2 2023-02-26 17:00:54 +08:00
Louis Lam
3c5f998191 Update mongodb to 4.14.0, possibly fix #2820 2023-02-26 03:23:02 +08:00
Louis Lam
a80f228136
Merge pull request #939 from jcvincenti/feature/482-add-description-to-monitor 
Add description to monitor
 2023-02-25 20:14:27 +08:00
Louis Lam
ea3b3abe36 Fine tune 2023-02-25 20:13:46 +08:00
Louis Lam
48c6f0578c Merge manually 2023-02-25 19:16:33 +08:00
Louis Lam
7f9332c753 Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	src/icon.js
#	src/languages/en.js
#	src/languages/es-ES.js
 2023-02-25 19:14:44 +08:00
Louis Lam
a7b49fcd98 Fix json body after xml body added 2023-02-25 17:28:32 +08:00
Louis Lam
487eae71c7
Merge pull request #2489 from mathiash98/mathiash98/clone-monitor 
Feature: Clone existing monitor
 2023-02-25 17:10:56 +08:00
Louis Lam
4fed0c152e Show Copy of in front of the cloned monitor name 2023-02-25 17:05:03 +08:00
Louis Lam
43c797a34e Do not active the old monitor in the clone page 2023-02-25 16:20:59 +08:00
Louis Lam
f9a6d7ec44 Add a missing icon 2023-02-25 16:19:48 +08:00
Louis Lam
4a5a424198 Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor 2023-02-25 15:43:07 +08:00
Louis Lam
f47f2d5c87 Better save button for edit/add monitor page 2023-02-25 15:40:24 +08:00
Louis Lam
54cd7a0402 Merge manually 2023-02-25 15:08:39 +08:00
Louis Lam
f0ae67f89a Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor 
# Conflicts:
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2023-02-25 14:56:51 +08:00
Louis Lam
98bb854832
Merge pull request #2764 from chakflying/feat/add-new-tag 
Feat: Add "Add New Tag" button in settings
 2023-02-25 02:27:32 +08:00
Louis Lam
46894793fc Update Learn More url 2023-02-25 00:44:12 +08:00
Louis Lam
ef64077980 Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key 
# Conflicts:
#	src/lang/en.json
 2023-02-25 00:06:25 +08:00
Louis Lam
e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification 
Adds name + status + message to Slack notification
 2023-02-24 23:54:31 +08:00
Louis Lam
c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty 
Fix: getGameList returns nothing on first run
 2023-02-24 23:34:47 +08:00
Nelson Chan
c65a920050 Chore: Fix code comment 2023-02-24 21:09:55 +08:00
Nelson Chan
7b8ed01f27 Fix: getGameList returns nothing on first run 2023-02-24 21:06:00 +08:00
Louis Lam
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors 
Add xml support to HTTP monitors
 2023-02-24 17:26:47 +08:00
Louis Lam
8e3dd4202f
Merge pull request #2595 from tminei/telegram_test 
Added a more telegram notifications options
 2023-02-24 17:22:43 +08:00
Louis Lam
af82ea742c Merge manually 2023-02-24 17:21:53 +08:00
Louis Lam
2fa233ae7f Fix prometheus null issues 2023-02-24 17:12:57 +08:00
Louis Lam
e9475ed3c0 Merge remote-tracking branch 'origin/master' into telegram_test 
# Conflicts:
#	server/notification-providers/telegram.js
#	src/languages/en.js
 2023-02-24 17:08:48 +08:00
Louis Lam
b923ba72ca
Merge pull request #2334 from nlutsenko/nlutsenko.telegram_silentnotification 
Add ability to send Telegram notifications silently, behind a setting.
 2023-02-24 17:04:51 +08:00
Louis Lam
06278dc51f Fix telegram silent issue 2023-02-24 17:03:40 +08:00
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