Commit Graph

276 Commits

Author SHA1 Message Date
AnnAngela-work 19b7e2ba5e Using grep to search `$t("foo")`-like pattern to fill up the missing part of en i18n file 2022-04-03 22:08:03 +08:00
Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js
2022-04-01 14:57:35 +08:00
OidaTiftla 91366ff565
Merge branch 'master' into introduce-resend-interval 2022-03-27 21:19:57 +02:00
Louis Lam 37be7df9b0 [Status Page] Delete status page 2022-03-18 15:19:52 +08:00
Louis Lam 50d6e888c2 [new status page] wip 2022-03-10 21:34:30 +08:00
Louis Lam ae14ad5a84 Add a word "Status Pages" 2022-03-09 22:14:07 +08:00
Uğur Erkan 78d76512ba Add http and https proxy feature
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.

Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
2022-03-06 19:34:49 +03:00
Louis Lam 8bbf55777e
Merge pull request #1205 from arjunkomath/master
Add notification provider - Push
2022-03-04 21:39:59 +08:00
Louis Lam c52c8a4206 Merge branch 'master' into alerta
# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
2022-03-04 14:10:37 +08:00
Louis Lam 9789d8cde8 Merge branch 'master' into alerta 2022-03-04 14:09:01 +08:00
Louis Lam ccb3d85a48
Merge pull request #1157 from zackelia/master
Implement gorush notifications
2022-03-03 22:03:09 +08:00
Alvin Pergens cefe43800f add alerta service 2022-01-27 20:54:04 +01:00
OidaTiftla 855b12f435 Add text for resend disabled 2022-01-24 22:20:38 +01:00
OidaTiftla 8c4ab9d652 Simplify 2022-01-24 09:18:22 +01:00
Karel Krýda 5fda1f0f59 minor fixes (missing commas, spaces, translations) 2022-01-23 20:33:39 +01:00
OidaTiftla 11e9eee09d Change seconds to minutes 2022-01-23 17:48:09 +01:00
Karel Krýda 0d3414c6d6 A complete maintenance planning system has been created 2022-01-23 15:22:00 +01:00
c0derMo 29df70949d Add ability to connect to daemon via http / tcp for windows compatibility 2022-01-22 01:57:37 +00:00
Arjun Komath 74c584f544 Add Push by Techulus 2022-01-21 07:42:03 +00:00
Hans Mayer c679613f7e
Updates some DE translations, fix typo in resolverserverDescription, removes some duplicates in languages 2022-01-14 19:06:21 +01:00
c0derMo 4818bb67d6 Added trailing comma, fixed spelling & translation 2022-01-14 09:09:37 +00:00
c0derMo c5cc42272f Fixing the editing of docker container & adding english translation 2022-01-13 18:28:45 +00:00
Louis Lam 076d6bdbb6 Merge branch 'master' into mqtt
# Conflicts:
#	package-lock.json
#	server/database.js
2022-01-13 11:09:16 +08:00
Zack Elia ea43422ccf Implement gorush notifications 2022-01-09 12:05:11 -05:00
Philipp Bischoff bcc3cec7d6 extract translation for notification type 2022-01-05 23:57:40 +01:00
Patrick Hafner 3d6c52fbea
Merge branch 'master' into customstatuspage 2021-12-25 04:12:05 +01:00
Patrick Hafner 2c2a824f97 Add: en & de-DE language 2021-12-21 03:31:09 +01:00
Nelson Chan 624cd862a5 Feat: Expose SMTP DKIM settings 2021-12-19 13:30:53 +08:00
Tarun Singh d3c90df8a8 fixed edit monitor fields empty issues 2021-12-18 16:35:18 -05:00
Jonas Liebert 67849a9e84 add support for stackfield notifications 2021-12-02 08:53:45 +01:00
Louis Lam a796f80018
Merge pull request #902 from ivanbratovic/improve-translatables
Fix untranslatable parts of the UI
2021-12-01 13:59:00 +08:00
Ivan Bratović 9c5466890e Revert "Replace body and header placeholder functions with translations"
This reverts commit 2c85491ee0.
2021-11-29 12:40:53 +01:00
Paweł Kuffel c1267e9b3b feat: add SerwerSMS notification provider 2021-11-25 18:24:36 +01:00
Ivan Bratović 2ca7a5b962
Merge branch 'master' into improve-translatables 2021-11-24 10:03:30 +01:00
Ioma Taani 97cb060cf5 another typo 2021-11-23 16:39:04 +01:00
Ioma Taani 5afb29f8f9 typo 2021-11-23 16:35:18 +01:00
Nelson Chan f9bb48de13 WIP: Convert Settings to components 2021-11-17 10:45:18 +08:00
Ivan 567ea346fe Add missing translations for placeholders in EditMonitor page 2021-11-12 15:30:31 +01:00
Ivan 453f6fbadf Add more missing translations 2021-11-12 15:19:33 +01:00
Ivan dd79042128 Add translation for "Info" in Settings 2021-11-12 15:14:28 +01:00
Ivan b1fca7c1a7 Add translation of toast success message 2021-11-12 12:00:10 +01:00
Ivan 19dd11d624 Add translation for incident error message 2021-11-12 10:14:23 +01:00
Ivan 42ce34b6c7 Add more Status page tranlations 2021-11-12 09:54:31 +01:00
Ivan 31fa67452e Delint English language file 2021-11-12 09:31:27 +01:00
Ivan 9ef3727c91 Backed out of commit `be1933614`
Running update-language-files will just confuse translators
2021-11-12 09:29:06 +01:00
Ivan 4cc433166e Add missing translation for SMTP security option 2021-11-11 11:14:21 +01:00
Ivan b0615d347b Add incident creation translations 2021-11-11 11:07:48 +01:00
Ivan be19336149 Run `update-language-files` for all languages 2021-11-11 10:57:33 +01:00
Ivan 94508cae2f Add some missing translations 2021-11-11 10:54:36 +01:00
Ivan 265cca9ed1 Replace "Default" notification badge with translation 2021-11-11 10:54:09 +01:00
Ivan 267654c987 Replace hard-coded names for groups in Status page with translations 2021-11-11 10:53:38 +01:00
Ivan 2c85491ee0 Replace body and header placeholder functions with translations 2021-11-11 10:52:22 +01:00
Tarun Singh 149015556b server url changes 2021-11-04 22:25:29 -04:00
Tarun Singh 6828e8ef6d Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma 2021-11-03 21:47:44 -04:00
Tarun Singh 670754b697 added MQTT monitor type 2021-11-03 21:46:43 -04:00
Adam Stachowicz 69aa60d1fb Add missing i18n key + translate 2 keys for polish 2021-10-29 17:01:29 +02:00
Louis Lam 5311bef3eb
Merge pull request #809 from Saibamen/pagination_no_text
Don't display "count" text for pagination
2021-10-29 16:05:59 +08:00
Adam Stachowicz 18a99c2016 Revert deleting `records` and `"One record"` keys 2021-10-28 14:20:56 +02:00
Louis Lam 71884cf42a
Merge pull request #772 from andreasbrett/patch-6
show logged in user on settings page
2021-10-27 10:24:45 +08:00
Adam Stachowicz 2e7ad1b7b2 Don't display "count" text for pagination 2021-10-26 18:03:49 +02:00
Louis Lam 77addfebc8 Merge branch 'tarun7singh_master'
# Conflicts:
#	src/languages/vi.js
2021-10-26 16:26:59 +08:00
Adam Stachowicz 1239f6d1a2 PL update + fixes 2021-10-24 21:50:02 +02:00
Tarun Singh bc68088350 Click send sms integration for notifications 2021-10-24 15:17:29 -04:00
Andreas Brett 4becb97a5d
Update en.js 2021-10-23 01:54:36 +02:00
Andreas Brett 85e2b36424
Update en.js 2021-10-23 01:54:07 +02:00
Andreas Brett abdf1ae90a
Update en.js 2021-10-23 01:53:31 +02:00
Andreas Brett 606c967985
Merge branch 'master' into patch-6 2021-10-23 01:52:54 +02:00
Andreas Brett 9ad8e5f56a show logged in user 2021-10-22 13:05:52 +02:00
NeuralMiner a35569481d Updates 2021-10-18 15:26:38 -06:00
NeuralMiner 572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
Louis Lam 20d59e5a13 fix and move the steam api key to settings page 2021-10-18 17:02:05 +08:00
Louis Lam ae31eb6ba9 Merge branch 'master' into Revyn112_master
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
2021-10-18 15:50:35 +08:00
Louis Lam 6944b35ea7
Merge pull request #667 from zsxeee/i18n
Missing i18n and zh-CN translation
2021-10-16 22:47:58 +08:00
Daniel Patrón Gómez 0a73b84ae6 Add records translations and fix pause translation 2021-10-16 12:45:41 +02:00
Louis Lam cb43ecb46e Merge branch 'master' into background-jobs
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
2021-10-16 15:06:59 +08:00
Louis Lam 4178983df3 Merge remote-tracking branch 'origin/master' 2021-10-15 19:01:04 +08:00
Louis Lam cd211a6be7 [http options] fine tune 2021-10-15 18:36:40 +08:00
Louis Lam 4e71ab7406 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-15 16:07:05 +08:00
Louis Lam 8338881927 [SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements 2021-10-14 16:07:25 +08:00
Louis Lam 674b387c95 Merge branch 'master' into smtp-subject 2021-10-14 14:59:54 +08:00
hrtkpf 84507268ad fix translations (de-DE and en) 2021-10-13 11:13:51 +02:00
zsxeee 33f773fcd0
Move param out of the translation file 2021-10-13 15:36:07 +08:00
zsxeee 3fe91c52cb
Fix i18n
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
2021-10-12 16:29:18 +08:00
wuwenjing 6d9b71c054 Add Feishu notification 2021-10-11 17:20:09 +08:00
LouisLam 272d4bde45 find promossms language key typo 2021-10-10 13:19:10 +08:00
Lukas 792f3c7c5c Add support for values of Name, Hostname and Status 2021-10-09 21:48:28 +02:00
Lukas 5e3ea3293c Very basic email subject customization 2021-10-09 20:32:45 +02:00
Nelson Chan 6cf2eb036d Fix: Improve settings layout and wording 2021-10-09 23:51:05 +08:00
Nelson Chan dca5a59dbc Feat: Implement data clearing logic & frontend 2021-10-09 23:33:47 +08:00
Bert Verhelst d71d27220b fix(edit-monitor): store headers as JSON 2021-10-09 12:42:32 +02:00
Bert Verhelst b8093e909b fix(edit-monitor): fix minification of translations containing { } 2021-10-09 11:38:12 +02:00
Bert Verhelst daab2a05f5 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-09 11:13:16 +02:00
Lukas 12b5489eb5 PromoSMS as Notification Provider
Add PromoSMS (Polish SMS Gateway) as new notification provider
2021-10-07 21:56:32 +02:00
LouisLam ddad2dcb4a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/languages/en.js
2021-10-08 01:40:34 +08:00
LouisLam e96121f69a fix merging mistake 2021-10-08 01:39:14 +08:00
LouisLam 2ce5c28ed4 Merge branch 'master' into feature/matrix-notifications
# Conflicts:
#	src/languages/en.js
2021-10-08 00:59:39 +08:00
Bert Verhelst 8be4bf0e16 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 08:56:29 +02:00
Bert Verhelst 162ef04c41 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-06 21:56:28 +02:00
zsxeee 54d2fbcc02
Fix i18n
Prevent use esm-bundler build vue-i18n
Escape keyword:  '@'
2021-10-06 18:21:31 +08:00
LouisLam c8706b9aa1 Merge branch 'master' into notification_form_i18n
# Conflicts:
#	src/components/notifications/SMTP.vue
#	src/languages/en.js
2021-10-06 16:48:14 +08:00
Gero Gerke 5decfb9fad Matrix Notifications 2021-10-05 20:03:56 +02:00
Bert Verhelst afeb424dc0 fix(edit-monitor): add translations to en.js 2021-10-05 09:20:24 +02:00
Adam Stachowicz 8ae64843fc run update-language-files 2021-10-04 23:32:16 +02:00
Adam Stachowicz 23e64b8efd Merge branch 'master' into fix_pl_i18n 2021-10-04 23:29:21 +02:00
zsxeee 0f2059cde0
Use named slot translation when has multi-slot 2021-09-30 19:48:24 +08:00
zsxeee 138ddf5608
Move attribute `tag` to start of tag 2021-09-30 19:22:17 +08:00
zsxeee dcd68213b1
Merge remote-tracking branch 'upstream/master' into notification_form_i18n
# Conflicts:
#	src/languages/en.js
2021-09-30 19:16:14 +08:00
Louis Lam 55cb497301
Merge pull request #427 from zsxeee/notification_component
chore(NotificationDialog): Convert notification form to separate component
2021-09-30 17:53:36 +08:00
MrEddX 0f66e5cfc5 Added Bulgarian Language 2021-09-28 23:21:59 +03:00
Adam Stachowicz 58aa83331e Fix Polish language, add missing `Status Page` i18n 2021-09-28 06:53:23 +02:00
Denis Freund b67b4d5afd add steam gameserver for monitoring 2021-09-27 11:17:57 +02:00
zsxeee f24abac7fc
Merge branch 'master' into notification_component 2021-09-24 20:33:29 +08:00
LouisLam 266b03fbf7 language key from "Status Page Nothing" to "statusPageNothing" 2021-09-24 14:42:54 +08:00
Cosmo Abdon a4cad3db65 add: BR Portuguese Language and new words 2021-09-23 09:42:33 -03:00
zsxeee 624f632a7a
Apprise status translation key 2021-09-22 22:15:50 +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
zsxeee 601204ae77
Default friendly name i18n and auto increase 2021-09-21 17:25:54 +08:00
zsxeee 8c941b1d56
Add i18n for notification form 2021-09-21 13:02:41 +08:00
zsxeee ad6fcc2f2e
Merge branch 'master' into notification_component 2021-09-20 13:16:24 +08:00
Adam Stachowicz 7dc1e84e44 Avg. Ping and Avg. Response translation keys 2021-09-19 15:15:12 +02:00
zsxeee e9735d239b
Convert notification form to separate component 2021-09-17 16:07:03 +08: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
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
Ponkhy c14b71a4a7 Added german translation for tags manager 2021-09-14 17:05:17 +02: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
LouisLam 7df9698e5d eslint: comma-dangle for language files 2021-09-13 00:58:45 +08:00
Ponkhy d313966d80
Merge branch 'master' into import-export 2021-09-12 18:46:11 +02: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
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
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
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
Ponkhy c3c576bd13 Added "Show URI" translation 2021-09-10 01:33:26 +02:00
Ponkhy c62732fa9c Minor translation fixes 2021-09-10 01:24:21 +02:00
Ponkhy 403202d4d4 Added simple TOTP Two Factor Authentication 2021-09-09 21:10:31 +02:00
LouisLam 94a6c1a344 update language files 2021-09-09 20:38:19 +08:00
Louis Lam 331ae5ec20
Merge pull request #306 from Ponkhy/import-export
Added import and export function
2021-09-09 16:15:48 +08:00
Ponkhy 69a7c4dab4 Improved importBackup handling 2021-09-07 23:14:44 +02:00
LouisLam 1a5ffd4755 add description for export/import 2021-09-08 00:46:48 +08:00