Commit graph

3871 commits

Author SHA1 Message Date
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 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
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
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