Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-01 01:25:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,910 Commits 30 Branches 114 Tags 95 MiB
36aef2ae0d
Commit Graph

1949 Commits

Author SHA1 Message Date
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
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
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
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
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
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
af82ea742c Merge manually 2023-02-24 17:21:53 +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
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
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
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
Andreas Brett
372c6b9078
add markdown support for description 2023-02-20 16:09:17 +01: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
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
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
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
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
eltionb
e3573ced65 Translated using Weblate (Albanian) 
Currently translated at 3.2% (23 of 697 strings)

Added translation using Weblate (Albanian)

Co-authored-by: eltionb <eltion.it@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sq/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00
Ömer Faruk Genç
8afc55db4e Translated using Weblate (Turkish) 
Currently translated at 100.0% (697 of 697 strings)

Co-authored-by: Ömer Faruk Genç <omer@farukgenc.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/tr/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00
Luiz Felipe Arcos Campos
31fa074ffc Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 38.8% (271 of 697 strings)

Co-authored-by: Luiz Felipe Arcos Campos <dino.bsb@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_BR/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-14 19:08:52 +00:00