Commit Graph

1076 Commits

Author SHA1 Message Date
LouisLam 8230cfe13f use "next" tag to keep vue3 up-to-update 2021-09-16 20:07:26 +08:00
LouisLam 392f8275b3 Merge branch 'master' into public-dashboard
# Conflicts:
#	server/database.js
2021-09-16 16:53:54 +08:00
LouisLam 611d214a32 [status page] checkpoint 2021-09-16 14:37:57 +08:00
Louis Lam 72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
Added support for a retry interval to monitors
2021-09-16 00:21:53 +08:00
LouisLam 80322cbfe7 Merge branch 'import-export'
# Conflicts:
#	src/languages/it-IT.js
#	src/languages/nl-NL.js
2021-09-16 00:18:07 +08:00
LouisLam 7e0272077b cleanup demo mode code 2021-09-16 00:13:28 +08:00
LouisLam b2ff6b6098 update ignore files and delete demo db 2021-09-16 00:12:39 +08:00
LouisLam 512ff09cca set entry page 2021-09-15 20:40:26 +08:00
LouisLam e8f4fabcd0 [status page] crop and resize logo 2021-09-15 18:28:48 +08:00
Ponkhy f679c1cbaf Export button align left 2021-09-15 12:01:30 +02:00
LouisLam 2ab06f87b8 Merge branch 'master' into public-dashboard 2021-09-15 16:46:05 +08:00
Louis Lam 76db55b657
Merge pull request #395 from WillianRod/feat/add-microsoft-teams-notification
Add microsoft teams notification provider
2021-09-15 16:38:57 +08:00
LouisLam 1693873f4a [Teams] change handleTestNotification to GeneralNotification 2021-09-15 16:38:28 +08:00
Louis Lam 53bfdb7dad
Merge pull request #409 from iomataani/master
updated
2021-09-15 14:38:17 +08:00
LouisLam db05b506f3 [status page] checkpoint 2021-09-15 14:34:30 +08:00
Ioma Taani 0752f810f1 updated 2021-09-15 08:33:30 +02:00
Louis Lam 200d233607
Merge pull request #407 from SametKUM/master
Turkish Language added
2021-09-15 11:08:25 +08:00
samet.kum 7274913686 Turkish Language added 2021-09-15 02:55:04 +03:00
No0Vad 1300448bed Adjustments to the retry interval
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
2021-09-15 00:59:06 +02:00
Louis Lam 3f67326fce
Merge pull request #404 from Ponkhy/main
Added search key
2021-09-15 01:20:51 +08:00
Louis Lam 8b48f9bd22
Merge pull request #405 from zidingz/patch-1
Update SECURITY.md
2021-09-15 01:19:29 +08:00
Louis Lam 76348cae5d
Update SECURITY.md 2021-09-15 01:17:33 +08:00
Louis Lam 0b32adadb8
Update SECURITY.md 2021-09-15 01:12:59 +08:00
Ziding Zhang 3425a27a0e
Update SECURITY.md
I'd like to report a security issue and felt it most prudent not to disclose it publicly, as per your Security policy instructions.

If not a hassle, might you kindly add an email, or other private contact method? GitHub [recommends](https://docs.github.com/en/code-security/getting-started/adding-a-security-policy-to-your-repository) this best practice to ensure security issues are responsibly disclosed, and it would serve as a simple instruction for security researchers in the future.

Thank you for your consideration!
2021-09-14 17:54:51 +01:00
Ponkhy fff5fd8e9e Added search key 2021-09-14 17:48:29 +02:00
LouisLam 1d6670ed9a Merge branch 'master' into public-dashboard 2021-09-14 23:29:22 +08:00
LouisLam 795411a11c Merge remote-tracking branch 'origin/master' 2021-09-14 23:28:52 +08:00
LouisLam 3234aec5b3 NODE_ENV if not set, change to production 2021-09-14 23:28:38 +08:00
LouisLam afe91078c4 [status page] checkpoint 2021-09-14 23:27:11 +08:00
Louis Lam 2009f7097d
Merge pull request #403 from Ponkhy/main
Added german translation for tags manager
2021-09-14 23:21:40 +08:00
Ponkhy c14b71a4a7 Added german translation for tags manager 2021-09-14 17:05:17 +02:00
Louis Lam 379656335d
Merge pull request #402 from xoniq/lang-nl
Update new / updated translations to nl_NL
2021-09-14 15:49:26 +08:00
LouisLam fc9b4617ca link interval and retryInterval 2021-09-14 15:48:25 +08:00
Jelle Posthuma 40d301457a Update new / updated translations to nl_NL 2021-09-14 09:22:50 +02:00
LouisLam 9902c181bc Merge branch 'master' into public-dashboard
# Conflicts:
#	src/components/MonitorList.vue
#	src/icon.js
2021-09-14 15:05:04 +08:00
Louis Lam 069c811af8
Merge pull request #278 from chakflying/tags
Monitor: Tags with metadata
2021-09-14 14:57:53 +08:00
LouisLam f9311e4e7f [status page] 2021-09-14 14:55:45 +08:00
LouisLam 34abff4724 manual merge master 2021-09-14 14:19:23 +08:00
LouisLam d7a230ac15 Merge branch 'master' into public-dashboard
# Conflicts:
#	server/server.js
#	src/main.js
2021-09-14 14:16:24 +08:00
LouisLam 9da2a01a74 [status page] checkpoint 2021-09-14 14:12:27 +08:00
Nelson Chan 74da02da2c Fix: Prevent enter in modal from submitting form 2021-09-14 12:25:31 +08:00
LouisLam 97360dab26 add /.well-known/change-password 2021-09-14 12:10:25 +08:00
Louis Lam 56dad006b5
Merge pull request #401 from NeuralMiner/patch-1
Allow SMTP that doesnt require authentication.
2021-09-14 10:05:43 +08:00
NeuralMiner 47092258f8
Allow SMTP that doesnt require authentication. 2021-09-13 16:36:37 -06:00
Willian Rodrigues Barbosa a0838543b9 Merge branch 'feat/add-microsoft-teams-notification' of https://github.com/WillianRod/uptime-kuma into feat/add-microsoft-teams-notification 2021-09-13 14:03:14 -03:00
Willian Rodrigues Barbosa ccb8736b3d fix: send msg if heartbeat message is not set 2021-09-13 14:02:52 -03:00
LouisLam f351b423c5 link to the english version of microsoft link 2021-09-13 20:25:41 +08:00
LouisLam ab6b97d77a update dependencies, fix axios security problem 2021-09-13 20:14:50 +08:00
LouisLam 0e16e88fa8 Merge remote-tracking branch 'origin/master' 2021-09-13 20:06:24 +08:00
LouisLam c746923018 merge italian language file 2021-09-13 20:05:48 +08:00