Commit Graph

632 Commits

Author SHA1 Message Date
Nelson Chan
95391be2ab
Revert Regex update 2021-09-22 22:36:27 +08:00
zsxeee
624f632a7a
Apprise status translation key 2021-09-22 22:15:50 +08:00
LouisLam
29920f6b60 [status page] use normal link to status-page, due to data reset problem 2021-09-22 18:05:40 +08:00
zsxeee
6e9d12638c
Avoid space ending in translation key 2021-09-22 16:20:59 +08:00
zsxeee
6e55c44773
Chore 2021-09-22 16:13:23 +08:00
LouisLam
ad1bb93730 [status page] fix logo url 2021-09-22 15:31:15 +08:00
LouisLam
fe0fc63843 [status page] send uptime 2021-09-22 15:10:08 +08:00
Nelson Chan
5b2e1f6086
Fix: Allow number ending TLD 2021-09-22 05:29:56 +08:00
LouisLam
8c7ee94769 add modified apicache library with disabling client cache 2021-09-22 00:58:22 +08:00
LouisLam
0834770509 [status page] also apply the title to <title> 2021-09-21 23:59:46 +08:00
LouisLam
a71814c80b add util.ts comments 2021-09-21 21:28:45 +08:00
LouisLam
17073fd786 Merge branch 'master' into public-dashboard 2021-09-21 21:25:16 +08:00
LouisLam
15c00d9158 upload logo and expose ./data/upload to url 2021-09-21 21:22:35 +08:00
Nelson Chan
d2b34f9285
Chore: make eslint happy 2021-09-21 18:53:45 +08:00
Nelson Chan
a96a515087
Fix: Fix hostname with dash 2021-09-21 18:44:32 +08:00
Nelson Chan
2eab919ae0
Fix: Fix typo 2021-09-21 18:41:19 +08:00
Nelson Chan
c09b67b94d
Fix: Fix TCP Ping hostname Regex 2021-09-21 18:27:40 +08:00
zsxeee
601204ae77
Default friendly name i18n and auto increase 2021-09-21 17:25:54 +08:00
LouisLam
61c737c53c fix alert text color in dark mode 2021-09-21 17:24:46 +08:00
Louis Lam
2820118eba
Merge pull request #446 from Saibamen/util
Add comments from `util.ts` to `util.js`
2021-09-21 17:23:12 +08:00
zsxeee
8c941b1d56
Add i18n for notification form 2021-09-21 13:02:41 +08:00
Adam Stachowicz
e8ef63e0a3 removeComments to false 2021-09-21 00:48:26 +02:00
LouisLam
a8e170f6a8 Merge branch 'master' into public-dashboard
# Conflicts:
#	server/server.js
2021-09-20 18:48:44 +08:00
LouisLam
6aaf984f29 fix retryInterval = 0 if it is an old monitor. (#380 https://github.com/louislam/uptime-kuma/pull/380#issuecomment-922618356) 2021-09-20 18:23:53 +08:00
LouisLam
0b572df3d0 [status page] store config 2021-09-20 16:22:18 +08:00
zsxeee
ad6fcc2f2e
Merge branch 'master' into notification_component 2021-09-20 13:16:24 +08:00
Adam Stachowicz
bcc02c1680 Add formatting and comments from util.ts to util.js 2021-09-19 23:09:52 +02:00
LouisLam
7ee98d989c [status page] implement rest api for heartbeat 2021-09-19 23:24:51 +08:00
Adam Stachowicz
7dc1e84e44 Avg. Ping and Avg. Response translation keys 2021-09-19 15:15:12 +02:00
LouisLam
6350c43cc3 fix newline? 2021-09-19 19:20:27 +08:00
LouisLam
fd95d41d9f [status page] many update and save group list 2021-09-19 19:04:51 +08:00
zsxeee
ffbc25722d
Move default setting to child component 2021-09-19 18:05:22 +08:00
Ioma Taani
09e38269c6
Merge branch 'louislam:master' into master 2021-09-19 09:45:42 +02:00
LouisLam
6681f49a58 Merge branch 'master' into public-dashboard
# Conflicts:
#	.dockerignore
2021-09-19 15:16:13 +08:00
Louis Lam
803029a9e4
Merge pull request #429 from Ponkhy/main
Added regex to hostname input
2021-09-19 00:38:40 +08:00
Louis Lam
c3f1cebeab
Merge pull request #435 from DX37/translation-ru
fresh translations to ru-RU.js and Settings.vue
2021-09-19 00:37:37 +08:00
Louis Lam
5d9814559c
Merge pull request #424 from Saibamen/fix_PL
Fix polish translation and translate new keys
2021-09-19 00:37:23 +08:00
DX37
9ef45a9c7e
fresh translations to ru-RU.js and Settings.vue 2021-09-18 22:25:06 +07:00
Ioma Taani
ca84044809
Merge branch 'louislam:master' into master 2021-09-17 23:05:56 +02:00
Marcos Sigueros Fernández
c3122a9807
Update es-ES.js (#430)
Simple but annoying language fix.
2021-09-17 22:20:45 +08:00
Ponkhy
f6498caa9a Merge branch 'main' of https://github.com/Ponkhy/uptime-kuma into main 2021-09-17 16:02:28 +02:00
Ponkhy
3a0bc80016 Added regex to hostname input 2021-09-17 16:02:20 +02:00
zsxeee
2fb3c40307
Variable name and key binding 2021-09-17 20:40:57 +08:00
zsxeee
66e40d9fcb
Edit comment and remove unused variable 2021-09-17 20:20:44 +08:00
Ioma Taani
cbbc503f8e
Merge branch 'louislam:master' into master 2021-09-17 11:31:21 +02:00
zsxeee
de8b61ef2b
Remove unused imports 2021-09-17 17:16:52 +08:00
zsxeee
534ac4b720
Move Apprise check to child component 2021-09-17 16:54:50 +08:00
zsxeee
e9735d239b
Convert notification form to separate component 2021-09-17 16:07:03 +08:00
Louis
a6fdd272a6 [status page] minor 2021-09-17 14:42:19 +08:00
Adam Stachowicz
250c2bdd6d Missing this 2021-09-16 20:17:25 +02:00
Adam Stachowicz
8e49d84050 Fix polish translation and translate new keys 2021-09-16 20:13:57 +02:00
LouisLam
579e07ded4 Merge branch 'master' into public-dashboard 2021-09-16 22:52:05 +08:00
kry008
a04878fa84
Finishing the translation of PL (#422) 2021-09-16 22:49:24 +08:00
LouisLam
2955abb5d9 [status page] create incident 2021-09-16 22:48:28 +08:00
LouisLam
392f8275b3 Merge branch 'master' into public-dashboard
# Conflicts:
#	server/database.js
2021-09-16 16:53:54 +08:00
Ioma Taani
783ec97004 updated translations 2021-09-16 09:10:13 +02:00
LouisLam
611d214a32 [status page] checkpoint 2021-09-16 14:37:57 +08:00
Adam Stachowicz
217637aa1f Add de-DE translation 2021-09-15 21:19:16 +02:00
Adam Stachowicz
ab22961538 More info about update-language-files command 2021-09-15 21:16:22 +02:00
Adam Stachowicz
8ba8de07ae Missing this 2021-09-15 20:59:29 +02:00
Adam Stachowicz
79920b5f2c Fix languages after 80322cbfe7
Fix ESLint deprecated warning. Update `README.md` for  languages. Update `update-language-files` script
2021-09-15 20:52:39 +02: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
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
db05b506f3 [status page] checkpoint 2021-09-15 14:34:30 +08:00
Ioma Taani
0752f810f1 updated 2021-09-15 08:33:30 +02: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
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
afe91078c4 [status page] checkpoint 2021-09-14 23:27:11 +08:00
Ponkhy
c14b71a4a7 Added german translation for tags manager 2021-09-14 17:05:17 +02: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
NeuralMiner
47092258f8
Allow SMTP that doesnt require authentication. 2021-09-13 16:36:37 -06:00
LouisLam
f351b423c5 link to the english version of microsoft link 2021-09-13 20:25:41 +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
LouisLam
df8754827d Merge branch 'italian-language-update'
# Conflicts:
#	src/languages/it-IT.js
2021-09-13 20:04:46 +08:00
Louis Lam
2c02dad1f9
Merge pull request #393 from Revyn112/master
add possibility to have a prefixMessage in discord notification before the embed
2021-09-13 20:02:55 +08:00
LouisLam
600ec6d171 Merge branch 'master' into i18n_router_own_files 2021-09-13 19:58:14 +08:00
LouisLam
59ff9fa293 update missing timezone console msg 2021-09-13 19:53:29 +08:00
LouisLam
a654e409df Merge branch 'master' into feature/timezones-package 2021-09-13 19:48:42 +08:00
LouisLam
76f1f34a0a fix #397, incorrect encode function for export file 2021-09-13 19:25:12 +08:00
LouisLam
35aca46b68 [status page] checkpoint 2021-09-13 19:21:39 +08:00
Paride Barison
6a925c7ed4 sistemato l'ordine 2021-09-13 09:19:07 +02:00
Paride Barison
8b9b86b478 updated 2021-09-13 09:10:42 +02:00
Nelson Chan
7c4b5f189b Fix: Fix hiding form when reusing draft tags 2021-09-13 14:12:17 +08:00
Nelson Chan
a6f9762c4d Feat: Split add tag to modal
Fix: Fix wrong css class

Fix: More misc. styling fixes
2021-09-13 14:12:17 +08:00
Nelson Chan
a0e4e96160 Fix: Fix tag removal, reuse and validation 2021-09-13 14:12:17 +08:00
Nelson Chan
fcbeed55bf Fix: Allow removing and re-adding the same tag
like, why would you even do this?
2021-09-13 14:12:17 +08:00
Nelson Chan
9b5abf9bb1 Fix: reset editMonitor after save 2021-09-13 14:12:17 +08:00
Nelson Chan
73f4b8e177 Fix: Improve various tags validation logic 2021-09-13 14:12:17 +08:00
Nelson Chan
e6669fbb9e Fix: Improve searchbar padding on mobile 2021-09-13 14:12:17 +08:00
Nelson Chan
e66a2d362d Feat: Add monitorList search box 2021-09-13 14:12:17 +08:00
Nelson Chan
c2148fc0f1 Fix: Slightly reduce tag opacity on light theme 2021-09-13 14:12:16 +08:00
Nelson Chan
6e3a904aaa WIP: Add tags functionality
WIP: add color column, show tags

WIP: Improve TagsManager styling & workflow

WIP: Improve styling & validation, use translation

WIP: Complete TagsManager functionality

WIP: Add tags display in monitorList & Details

Fix: update tags list after edit

Fix: slightly improve tags styling

Fix: Improve mobile UI

Fix: Fix tags not showing on create monitor

Fix: bring existingTags inside tagsManager

Fix: remove unused tags prop

Fix: Fix formatting, bump db version
2021-09-13 14:12:11 +08:00
No0Vad
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval 2021-09-13 00:19:51 +02:00
Ponkhy
4711aeb355
Merge branch 'master' into import-export 2021-09-12 23:21:33 +02:00
Adam Stachowicz
7199bb5ead Remove unused i18n key 2021-09-12 23:11:07 +02:00
Ponkhy
bb87972543 Hide 2FA section if disabled auth 2021-09-12 21:58:52 +02:00
Adam Stachowicz
ea723c7595 Separate import and export. Fix ESLint 2021-09-12 21:35:37 +02:00
LouisLam
e205adfd7b [status page] developing 2021-09-13 02:26:45 +08:00
Willian Rodrigues Barbosa
063d64eec8 feat: add microsoft teams notification provider 2021-09-12 14:46:59 -03:00
Adam Stachowicz
54ffef8b7a Own files for i18n and router + fix some of markdown warnings 2021-09-12 19:23:51 +02:00
Revyn112
44aa837a9d
Update NotificationDialog.vue 2021-09-12 19:17:09 +02:00
LouisLam
f47f7758f9 Merge branch 'master' into public-dashboard
# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js
2021-09-13 01:09:01 +08:00
Bert Verhelst
ddcd3c2a19 Merge remote-tracking branch 'origin/master' into feature/timezones-package 2021-09-12 19:03:05 +02:00
LouisLam
7df9698e5d eslint: comma-dangle for language files 2021-09-13 00:58:45 +08:00
Bert Verhelst
471333ad03 fix(util-frontend): revert typescript conversion 2021-09-12 18:56:39 +02:00
Ponkhy
d313966d80
Merge branch 'master' into import-export 2021-09-12 18:46:11 +02:00
LouisLam
8205f90f3d update language files 2021-09-13 00:45:43 +08:00
Denis Freund
8352d9abbe add posibility to have a prefixMessage before the embed 2021-09-12 17:54:12 +02:00
Louis Lam
2d7767c905
Merge pull request #392 from bertyhell/bugfix/button-margin-settings
fix(settings): add some button bottom margin for narrow screens
2021-09-12 23:49:21 +08:00
Louis Lam
c52b9b63d5
Merge pull request #389 from Ponkhy/default-notification
Wording correction for notification modal
2021-09-12 23:49:09 +08:00
Louis Lam
e55193270d
Merge pull request #377 from Lrss/master
Fix: Inconsistent white-space for the "Avg."-Ping/Response title.
2021-09-12 23:48:29 +08:00
Louis Lam
9d39071a91
Merge pull request #363 from Ponkhy/2fa
Added simple TOTP Two Factor Authentication
2021-09-12 23:47:42 +08:00
Bert Verhelst
a170694a83
fix(util-frontend): improve formatting timezoneList
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 15:21:40 +02:00
Bert Verhelst
5969e913b5
fix(util-frontend): improve formatting
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 15:19:27 +02:00
Louis Lam
0d280f5edb
Merge pull request #376 from chakflying/patch-7
Fix: Fix events table width on mobile
2021-09-12 21:12:56 +08:00
Bert Verhelst
660b969178 fix(settings): switch custom styles to bootstrap class for bottom margin 2021-09-12 14:52:47 +02:00
Bert Verhelst
c26622aa39 fix(settings): add some button bottom margin for narrow screens 2021-09-12 13:40:07 +02:00
Bert Verhelst
a7674755ba Move timezones to npm package and convert util-frontend.js to typescript 2021-09-12 13:27:41 +02:00
Ponkhy
db14768229 Wording correction for notification modal 2021-09-12 01:44:05 +02:00
No0Vad
3d27561e5a Update en.js
Fixed spelling error
2021-09-12 00:24:33 +02:00
jtagcat
b80c88d9a0 i10n: update Estonian 2021-09-12 00:51:03 +03:00
Ponkhy
862672731f Minor typo fix 2021-09-11 22:06:26 +02:00
Ponkhy
7fee4a7ea7 Added import options 2021-09-11 21:53:17 +02:00
No0Vad
f8f9f59464 Added support for a retry interval to monitors
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
2021-09-11 18:54:55 +02:00
LouisLam
934685637a [Status Page] WIP: Checkpoint 2021-09-11 23:43:07 +08:00
Ponkhy
8cd5bad44c
Merge branch 'master' into 2fa 2021-09-11 16:32:11 +02:00
Ponkhy
d003abcd60
Update src/languages/en.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:23 +02:00
Lars Sørensen
66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title. 2021-09-11 13:52:41 +02:00
LouisLam
3e25f0e9d9 [Status Page] WIP: Checkpoint 2021-09-11 19:40:03 +08:00
Lars Sørensen
39c7b5e748
Added new Strings to Danish translation 2021-09-11 13:37:53 +02:00
Lars Sørensen
b709857e19
Better wording for Danish language 2021-09-11 13:20:40 +02:00
Nelson Chan
9e10f7d35f
Fix: Fix events table width on mobile 2021-09-11 18:56:27 +08:00
Adam Stachowicz
c387fb264e Format JSON file before download 2021-09-11 10:50:56 +02:00
LouisLam
4b0a8087a2 do not connect to socket io for status page 2021-09-11 16:22:30 +08:00