Commit graph

2161 commits

Author SHA1 Message Date
Faruk Genç
35bd129d66 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-01-28 15:47:42 +03:00
Louis Lam
ddce8f0cb0 Fix plugin installation 2023-01-28 19:00:13 +08:00
Louis Lam
1dc2546a39 Lint 2023-01-28 13:39:23 +08:00
Louis Lam
82f875beca
Update README.md 2023-01-27 23:45:10 +08:00
Louis Lam
50573e6c89
Merge pull request #2635 from Computroniks/bug/2628-uptime-over-100
Perform sanity check on uptime for status page
2023-01-27 18:33:37 +08:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support (#1787) 2023-01-27 18:25:57 +08:00
gitstart
54e63f3e25 Save button can't be found while edit and add in Mobile version 2023-01-26 12:47:33 +00:00
Faruk Genç
2673b509a5 Add "Body Encoding" to en.json 2023-01-25 20:22:50 +03:00
Faruk Genç
9329ec9234 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
# Conflicts:
#	server/database.js
#	server/model/monitor.js
2023-01-25 20:20:11 +03:00
Louis Lam
d99d37898e Fix 2023-01-26 00:59:38 +08:00
UptimeKumaBot
dcda520d59
Translations update from Uptime Kuma Weblate (#2670)
* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translated using Weblate (Estonian)

Currently translated at 29.9% (205 of 685 strings)

Translated using Weblate (Spanish)

Currently translated at 29.7% (204 of 685 strings)

Translated using Weblate (Greek)

Currently translated at 84.6% (580 of 685 strings)

Translated using Weblate (German)

Currently translated at 94.1% (645 of 685 strings)

Translated using Weblate (German)

Currently translated at 94.2% (645 of 684 strings)

Translated using Weblate (German)

Currently translated at 94.2% (645 of 684 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 92.2% (632 of 685 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 92.3% (632 of 684 strings)

Translated using Weblate (Danish)

Currently translated at 50.6% (347 of 685 strings)

Translated using Weblate (Danish)

Currently translated at 50.7% (347 of 684 strings)

Translated using Weblate (Czech)

Currently translated at 98.8% (677 of 685 strings)

Translated using Weblate (Arabic (ar_SY))

Currently translated at 96.3% (660 of 685 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (685 of 685 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (684 of 684 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (684 of 684 strings)

Translated using Weblate (Persian)

Currently translated at 29.7% (204 of 685 strings)

Translated using Weblate (Basque)

Currently translated at 77.9% (534 of 685 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 42.0% (288 of 685 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 42.1% (288 of 684 strings)

Translated using Weblate (Polish)

Currently translated at 99.8% (684 of 685 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (684 of 684 strings)

Translated using Weblate (Dutch)

Currently translated at 76.3% (523 of 685 strings)

Translated using Weblate (Dutch)

Currently translated at 76.4% (523 of 684 strings)

Translated using Weblate (Korean)

Currently translated at 76.4% (524 of 685 strings)

Translated using Weblate (Japanese)

Currently translated at 28.6% (196 of 685 strings)

Translated using Weblate (Italian)

Currently translated at 52.5% (360 of 685 strings)

Translated using Weblate (Italian)

Currently translated at 52.6% (360 of 684 strings)

Translated using Weblate (Indonesian)

Currently translated at 84.3% (578 of 685 strings)

Translated using Weblate (Hungarian)

Currently translated at 53.8% (369 of 685 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 98.8% (677 of 685 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 98.8% (677 of 685 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 40.8% (280 of 685 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 40.9% (280 of 684 strings)

Translated using Weblate (Croatian)

Currently translated at 83.5% (572 of 685 strings)

Translated using Weblate (Hebrew (Israel))

Currently translated at 96.7% (663 of 685 strings)

Translated using Weblate (Yue)

Currently translated at 57.9% (397 of 685 strings)

Translated using Weblate (Yue)

Currently translated at 57.9% (397 of 685 strings)

Translated using Weblate (Yue)

Currently translated at 9.4% (65 of 685 strings)

Translated using Weblate (Yue)

Currently translated at 9.4% (65 of 685 strings)

Translated using Weblate (Yue)

Currently translated at 2.0% (14 of 684 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 96.9% (664 of 685 strings)

Translated using Weblate (Chinese (Traditional, Hong Kong))

Currently translated at 57.9% (397 of 685 strings)

Translated using Weblate (Vietnamese)

Currently translated at 67.4% (462 of 685 strings)

Translated using Weblate (Vietnamese)

Currently translated at 67.5% (462 of 684 strings)

Translated using Weblate (Ukrainian)

Currently translated at 74.8% (513 of 685 strings)

Translated using Weblate (Turkish)

Currently translated at 98.6% (676 of 685 strings)

Translated using Weblate (Thai)

Currently translated at 83.5% (572 of 685 strings)

Translated using Weblate (Swedish)

Currently translated at 15.7% (108 of 685 strings)

Translated using Weblate (Serbian)

Currently translated at 29.0% (199 of 685 strings)

Translated using Weblate (Serbian (latin))

Currently translated at 29.0% (199 of 685 strings)

Translated using Weblate (Serbian (latin))

Currently translated at 29.0% (199 of 685 strings)

Translated using Weblate (Slovenian)

Currently translated at 51.0% (350 of 685 strings)

Translated using Weblate (Russian)

Currently translated at 85.1% (583 of 685 strings)

Translated using Weblate (Portuguese (Portugal))

Currently translated at 29.0% (199 of 685 strings)

Translated using Weblate (French)

Currently translated at 98.9% (678 of 685 strings)

Co-authored-by: 401Unauthorized <yehowahliu@4o1.to>
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Cyril59310 <contact@cyril59310.fr>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: MrEddX <mreddx@chatrix.one>
Co-authored-by: Victor Monteiro <victor@bbhost.com.br>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: cetteup <cetteup@dasemail.de>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ar_SY/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/bg/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/da/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de_CH/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/el/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/es/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/et/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/eu/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fa/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/he_IL/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/hr/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/hu/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/id/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/it/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ja/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ko/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/nb_NO/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/nl/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pl/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_BR/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_PT/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ru/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sl/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sr/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sr_Latn/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sv/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/th/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/tr/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/uk/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/vi/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/yue/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant_HK/
Translation: Uptime Kuma/Uptime Kuma

* Revert autofill mistake

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: 401Unauthorized <yehowahliu@4o1.to>
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Co-authored-by: Cyril59310 <contact@cyril59310.fr>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: MrEddX <mreddx@chatrix.one>
Co-authored-by: Victor Monteiro <victor@bbhost.com.br>
Co-authored-by: cetteup <cetteup@dasemail.de>
2023-01-26 00:55:59 +08:00
Louis Lam
e3828f09a3 Merge en.js to en.json 2023-01-25 16:13:09 +08:00
Louis Lam
5050ebc249 Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
# Conflicts:
#	server/util-server.js
#	src/languages/en.js
2023-01-25 16:12:33 +08:00
UptimeKumaBot
82f33f4445
Translations update from Uptime Kuma Weblate (#2663)
* Translated using Weblate (Chinese (Simplified))

Currently translated at 99.2% (677 of 682 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/

* Translated using Weblate (Chinese (Traditional, Hong Kong))

Currently translated at 56.4% (385 of 682 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant_HK/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (682 of 682 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (682 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/

* Translated using Weblate (Chinese (Traditional, Hong Kong))

Currently translated at 56.5% (386 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant_HK/

* Translated using Weblate (Czech)

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 98.2% (671 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant/

* Translated using Weblate (Chinese (Traditional, Hong Kong))

Currently translated at 56.8% (388 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant_HK/

* Translated using Weblate (Czech)

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/

* Translated using Weblate (French)

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/

* Translated using Weblate (Russian)

Currently translated at 86.2% (589 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ru/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/tr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (683 of 683 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/

* Added translation using Weblate (Aramaic)

* Added translation using Weblate (Yue)

* Translated using Weblate (Czech)

Currently translated at 100.0% (684 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/

* Translated using Weblate (French)

Currently translated at 100.0% (684 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (684 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/

* Translated using Weblate (Chinese (Traditional, Hong Kong))

Currently translated at 57.6% (394 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant_HK/

* Translated using Weblate (Yue)

Currently translated at 0.1% (1 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/yue/

* Translated using Weblate (Chinese (Traditional, Hong Kong))

Currently translated at 58.6% (401 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant_HK/

* Translated using Weblate (English)

Currently translated at 100.0% (684 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/en/

* Translated using Weblate (Yue)

Currently translated at 2.0% (14 of 684 strings)

Translation: Uptime Kuma/Uptime Kuma
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/yue/

Co-authored-by: 401Unauthorized <yehowahliu@4o1.to>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: test <tori@weblate2.louislam.net>
Co-authored-by: Buchtič <martin.buchta@gmail.com>
Co-authored-by: Michal <black23@gmail.com>
Co-authored-by: deluxghost <deluxghost@gmail.com>
Co-authored-by: Cyril59310 <archas.cyril@hotmail.fr>
Co-authored-by: sovushik <evgeniy@grachev.biz>
Co-authored-by: Ömer Faruk Genç <omer@farukgenc.com>
2023-01-25 02:00:56 +08:00
Louis Lam
a9b7bbcd9e Add 繁體中文 (廣東話 / 粵語) 2023-01-25 01:58:31 +08:00
Louis Lam
e3246a2705
Update README.md 2023-01-25 01:30:58 +08:00
Louis Lam
b0e1bb4057
Create README.md 2023-01-25 01:28:10 +08:00
Louis Lam
2a86b43d69 Move notification related language keys to the bottom. 2023-01-25 01:10:25 +08:00
Louis Lam
e637fa4e40 Add language key 2023-01-24 23:09:24 +08:00
Louis Lam
83e0401dd8 Show game list for GameDig monitor 2023-01-24 23:03:01 +08:00
Louis Lam
aab04f6644 Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master 2023-01-24 19:44:21 +08:00
Faruk Genç
7866d1ec12 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
# Conflicts:
#	src/languages/en.js
2023-01-24 12:49:12 +03:00
Louis Lam
434bff6714 Add Help language key 2023-01-24 16:52:36 +08:00
401Unauthorized
ea83af3404
clean up codes 2023-01-24 16:00:51 +08:00
401Unauthorized
9c4b03aee2
sync language changes from upstream 2023-01-24 15:18:30 +08:00
401Unauthorized
912686a299
Merge from upstream 2023-01-24 15:16:59 +08:00
Cyril59310
ae0ef79060
Update french translation (#2634) 2023-01-24 15:16:18 +08:00
Louis Lam
a2045b59bb
Merge pull request #2638 from amworx/master
Arabic language support is now in action ✌️
2023-01-24 14:25:55 +08:00
Louis Lam
8ade7120ff
Update src/i18n.js
Co-authored-by: 401Unauthorized <redme@live.cn>
2023-01-24 13:24:42 +08:00
Matthew Nickson
e9044ae956
Removed repetitiion of %
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-23 18:10:45 +00:00
401Unauthorized
5683896910
docs: prepare for weblate 2023-01-23 21:06:58 +08:00
Buchtič
b288d71535
Update cs-CZ.js 2023-01-23 10:20:22 +01:00
Abdulrahman Mustafa
1197f881a1 Checked with eslint, with no errors 2023-01-22 21:31:02 +00:00
Faruk Genç
86ba6f829e Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-01-20 12:27:28 +03:00
Abdulrahman Mustafa
316599210d Arabic language support is now in action ✌️ 2023-01-18 19:03:04 +00:00
Matthew Nickson
86bcb85e9b
Perform sanity check on uptime for status page
Fixes #2628
A sanity check is performed when calculating the uptime of a monitor on
status page. If it is greater than 100%, we just show 100%. This hasn't
been implemented on the dashboard at the request of @louislam due to
concerns it would make debugging more difficult in future if changes
were made to the uptime calculation.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-18 16:38:55 +00:00
Louis Lam
c47b6c5995 Merge remote-tracking branch 'origin/1.19.X'
# Conflicts:
#	package-lock.json
#	package.json
#	src/util-frontend.js
2023-01-17 21:17:04 +08:00
Louis Lam
a5ff27da7a Drop the property monitor.maintenance, use lastHeartBeat.status to check status instead 2023-01-17 17:34:47 +08:00
Louis Lam
7bb12a7e00 Fix #2608 2023-01-17 17:25:35 +08:00
Louis Lam
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
Fix: Allow long sms in PromoSMS
2023-01-16 13:21:56 +08:00
Louis Lam
b073ec2287 Add Help button which links to wiki 2023-01-16 12:39:24 +08:00
Louis Lam
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-15 20:14:11 +08:00
Louis Lam
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
Added missing JSDoc comments
2023-01-15 13:10:17 +08:00
401Unauthorized
8128c8081b
sync language file changes 2023-01-15 10:50:52 +08:00
401Unauthorized
e99652c5a2
sync language file changes 2023-01-15 10:46:29 +08:00
401Unauthorized
ceb7d48118
add convert script 2023-01-15 10:46:29 +08:00
401Unauthorized
bfa32f6b07
comment not allowed in json file 2023-01-15 10:46:29 +08:00
401Unauthorized
ae3a543b3b
convert language files to json format 2023-01-15 10:46:29 +08:00
Louis Lam
e48a987b9c Merge remote-tracking branch 'origin/master' into mongodb-ping
# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
#	src/pages/EditMonitor.vue
2023-01-15 01:13:11 +08:00
Faruk Genç
cf21aa3737 Fix lint 2023-01-14 16:51:07 +03:00
Faruk Genç
9890a0754b Fix lint 2023-01-14 16:48:26 +03:00
Faruk Genç
15c64d458b Fix lint 2023-01-14 16:48:12 +03:00
Faruk Genç
be850dd596 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	src/languages/en.js
2023-01-14 16:40:13 +03:00
Faruk Genç
3adc9e65d6 Add only xml support to http monitors 2023-01-14 16:33:21 +03:00
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
feat: support redis monitor
2023-01-14 20:16:53 +08:00
Louis Lam
973d5692d0
Merge pull request #2604 from black23/patch-1
Update cs-CZ.js
2023-01-14 13:04:41 +08:00
Louis Lam
f7d41a30fa
Update src/components/TagEditDialog.vue
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-13 23:15:41 +08:00
black23
0ef686ac2f
Update cs-CZ.js
new string
2023-01-13 14:52:03 +01:00
long2ice
db757123ba refactor: reuse databaseConnectionString 2023-01-13 16:32:49 +08:00
shyneko
e427c70fef Translate fixes 2023-01-12 16:00:02 +02:00
shyneko
27e0b1eea1 Remove required attribute for optional field 2023-01-12 15:52:50 +02:00
Nelson Chan
9c1ba97e7d Chore: Fix typo 2023-01-12 21:25:33 +08:00
Nelson Chan
e9564619f1 Feat: Implement tags manager in settings
Fix: Remove unused color options

Chore: Fix typo
2023-01-12 21:25:33 +08:00
shyneko
521356e38a LINT fixes 2023-01-12 15:21:56 +02:00
shyneko
b91fe9d96d Added a more telegram options
such as thread id, silent notifications and forward protect
2023-01-12 15:09:05 +02:00
Louis Lam
98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
Add Splunk Notification Provider
2023-01-12 14:15:36 +08:00
Łukasz Szczepański
ec30147a7f Add option for allowing long sms in PromoSMS 2023-01-11 14:32:57 +01:00
Luke
2172112144
Setting for allowing long sms 2023-01-11 12:13:47 +01:00
twiggotronix
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes 2023-01-11 10:34:24 +01:00
DimitriDR
890e3abf58 Updating French localization
Signed-off-by: DimitriDR <dimitridroeck@gmail.com>
2023-01-09 21:09:57 +01:00
Matthew Nickson
6e50784b6b
Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer 2023-01-09 20:03:11 +00:00
Joseph Irving
33355c51b7 Add Splunk Notifications 2023-01-09 13:33:10 +00:00
Louis Lam
439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
Fixed negative retention time values
2023-01-09 13:08:35 +08:00
Matthew Nickson
80f2d6e2a7
Added markdown support for maintenance
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:54:16 +00:00
Matthew Nickson
852a088529
Added mardown support for incident
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:46:18 +00:00
Matthew Nickson
6bc0bd84af
Allowed markdown in footer of status page
Markdown support has been added using the marked module. To secure
against XSS attacks, DOMPurify is used to sanitize the generated HTML
before it is loaded on the page.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:39:27 +00:00
Matthew Nickson
32f7a0084a
Fixed negative retention time values
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 19:09:06 +00:00
Adam Spurgeon
774d754b21 Add GameDig monitor 2023-01-08 21:43:30 +13:00
Louis Lam
d596f8f7eb
Merge pull request #2560 from DimitriDR/master
Adding translations for Kook & ZohoCliq
2023-01-08 14:03:35 +08:00
DimitriDR
e8e4361e09 Adding translations for Kook & ZohoCliq 2023-01-07 13:10:25 +01:00
Matthew Nickson
d6c91869af
Reverted changes to en.js
Some changes were carried over in the merge

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:15:16 +00:00
Matthew Nickson
7a13b959a3
Updated to match changes in #2223
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:09:40 +00:00
David Twigger
e490ec6d29 move hostname regex pattern function to frontend-utils 2023-01-06 11:00:20 +01:00
MrEddX
7ad4392529
Update bg-BG.js
Translation Updated
2023-01-06 09:00:45 +02:00
Louis Lam
f3d3e064f8
Merge pull request #2538 from deluxghost/master
Updated zh-CN.js
2023-01-06 10:46:37 +08:00
Matthew Nickson
dc8289df12
Added JSDoc for src/
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:55:51 +00:00
Matthew Nickson
fc5ec5f492
Fixed styling of clear data dropdown
Fixed #2419

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 19:24:29 +00:00
long2ice
40ebc2df79 feat: support redis monitor 2023-01-05 23:02:56 +08:00
David Twigger
abf5e435fe move to utility function 2023-01-05 14:48:12 +01:00
David Twigger
8a372201f1 clean up 2023-01-05 14:23:05 +01:00
David Twigger
5362aab0e5 specify scheme for mqtt monitor type only 2023-01-05 14:06:13 +01:00
David Twigger
fc1914bccd Fix lint 2023-01-05 11:42:19 +01:00
David Twigger
c196c34840 Add mqtt, mqtts, ws and wss protocols to the mqtt monitor 2023-01-05 08:57:48 +01:00
DX
554402b484 Updated zh-CN.js 2023-01-05 15:38:51 +08:00
Furkan İpek
610b6248aa Update tr-TR.js 2023-01-04 16:41:00 +03:00
Furkan İpek
e591647b60 Update tr-TR.js 2023-01-04 16:35:48 +03:00
Nelson Chan
edd8fe2e22 Fix: Fix incorrect tag form validation 2023-01-03 22:18:45 +08:00
Mathias Haugsbø
239910a27c
Change clone icon from plus to clone
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2023-01-02 13:17:38 +01:00
lionep
cd7e362b81
Improve french translation
Set "Not available, please setup" translation more accurate, because it's in use in notifications and proxies page.
2023-01-02 08:46:42 +01:00
Louis Lam
cd7a6e4019
Merge pull request #2478 from YehowahLiu/master
Add Kook notification provider
2023-01-01 02:53:03 +08:00
Louis Lam
5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider)
Zoho Cliq Notification Provider
2022-12-29 19:00:50 +08:00
5idereal
7f394d0630
update zh-TW.js 2022-12-28 17:29:46 +08:00
Louis Lam
9fe9e235ca
Merge pull request #2236 from mishankov/fix/stats-30-days
Simple fix for Uptime component
2022-12-28 15:37:46 +08:00
Mathias Haugsbø
4d0bdae6bf Add jsdoc for Tag type
Does not work properly but is still useful
2022-12-27 23:27:23 +01:00
Mathias Haugsbø
608e3f5582 Feature: Clone existing monitor
Closes #565
Closes #2319

Adds the feature of cloning existing monitor, I have briefly tested it with ping and https and ensured that all properties was cloned including notifications.
2022-12-27 23:26:05 +01:00
401Unauthorized
50b84f5f45
fix code style: add missing semicolon 2022-12-27 14:12:22 +08:00
401Unauthorized
c60b741406
Add kook notification provider 2022-12-27 14:12:22 +08:00
thefourCraft
f6ea1fe9a5
he-IL (#2460) 2022-12-27 14:04:53 +08:00
DimitriDR
625fd7c2aa Huge improvement for French localization. 2022-12-27 01:02:43 +01:00
Louis Lam
06852bbf0d Fix the UI broken after removed a monitor 2022-12-27 00:22:09 +08:00
Louis Lam
1b6c587cc9 Fix #2472 2022-12-26 14:46:29 +08:00
Augustin
9e9c5cd1d2
(fr) Fix typo 2022-12-24 19:41:55 +01:00
MrEddX
a89be0e6d4
Update bg-BG.js
Translation Update
2022-12-19 13:37:42 +02:00
Louis Lam
b58b83541b
Merge pull request #2428 from rbunpat/master
Update th-TH.js
2022-12-18 15:40:40 +08:00
Cyril59310
df4f91c20d
Update EN language (#2429)
* Update EN language
2022-12-18 15:39:54 +08:00
Rachatat Bunpat
fc6b040a4e
Update th-TH.js 2022-12-17 17:34:03 +07:00
Louis Lam
9838f36b50
Merge pull request #2418 from Johno95CZ/patch-1
Update cs-CZ.js
2022-12-17 17:44:55 +08:00
Louis Lam
a60072adbc
Merge pull request #2423 from rbunpat/master
Update th-TH.js
2022-12-17 17:43:51 +08:00
Rachatat Bunpat
06e570c52d
Update th-TH.js 2022-12-16 19:15:14 +07:00
Justman10000
890b8f8333 Updated German 2022-12-16 10:42:41 +00:00
JohnoCZ
20c37a70f7
Update cs-CZ.js 2022-12-15 14:35:59 +01:00
Louis Lam
b75db27658 Fix lint 2022-12-15 13:57:28 +08:00
Louis Lam
765d8e1297 Fix #2318 2022-12-15 13:39:48 +08:00
Louis Lam
6154776b34
Merge pull request #2409 from Justman10000/master
Update
2022-12-14 22:39:00 +08:00
Justman10000
da4bdab4f6 Updated german 2022-12-14 13:16:32 +00:00
MrEddX
86ab97ef56
Update bg-BG.js
Translation Update
2022-12-14 09:56:28 +02:00
MrEddX
345b0c1829
Update bg-BG.js
Fixed Style
2022-12-14 09:49:31 +02:00
MrEddX
2ac87fcea7
Update bg-BG.js
Fixed Typos
2022-12-14 09:26:43 +02:00
Cyril59310
4862bec965
Update Fr language + added variable for missing translation (#2395)
* Update FR language
2022-12-13 22:00:54 +08:00
Louis Lam
aa784fb3b2 Fix #2394 2022-12-13 16:48:23 +08:00
Louis Lam
39987ba9ac Init server timezone 2022-12-12 22:57:57 +08:00
Louis Lam
3b87209e26 Add configurable dns cache 2022-12-12 17:19:22 +08:00
Louis Lam
e6dc0a0293 Slightly improve maintenance page's css on mobile 2022-12-12 16:06:17 +08:00
Louis Lam
5c5a339a36 Add links for status pages and maintenance for mobile (Fix #2257) 2022-12-12 15:54:46 +08:00
Louis Lam
ab5f6dc82c Fix css 2022-12-11 18:52:24 +08:00
Louis Lam
54aa7d5dca Merge remote-tracking branch 'origin/master' 2022-12-08 23:22:09 +08:00
Louis Lam
4cd5b5563f Fix #1145 2022-12-08 23:21:55 +08:00
panos
73bfdb9ef9 zoho cliq notification provider 2022-12-08 13:32:10 +02:00
Silvio Wangler
aa27d976c2
Fixed some typos in the German translations 🇩🇪🇨🇭 2022-12-07 09:10:05 +01:00
Silvio Wangler
92caec95fe
Added new language German (Switzerland) 2022-12-06 13:43:37 +01:00
Louis Lam
8aa97635ec Improve the clear filter button 2022-12-05 18:21:16 +08:00
Louis Lam
5196abfd36 Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919 2022-12-05 17:52:02 +08:00
Nikita Lutsenko
da16796ec4 Add ability to send Telegram notifications silently. 2022-12-03 23:10:56 -08:00
MrEddX
14a062804e
Update bg-BG.js
- Translation fixes
2022-11-25 22:00:52 +02:00
MrEddX
cf3e03ab40
Update bg-BG.js
- Added new  fields
- Translated new fields
- Fixed some typos
2022-11-25 21:56:00 +02:00
Louis Lam
191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296
Add socks5h support
2022-11-25 16:24:21 +08:00
Joshua Brunner
cd270bd8b5 Add socks5h support
Add socks5h support as an extra option to not break previous socks5 implementation.
Allows to toggle between socks5 and socks5h explicit.

Fixes #2296
2022-11-22 11:18:16 +01:00
Matthew Nickson
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 19:04:14 +00:00
Matthew Nickson
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 18:46:58 +00:00
rmarops
b059a36e66 added MongoDB ping monitor 2022-11-16 20:50:34 -05:00
Jan Hartje
258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919 2022-11-14 20:17:36 +01:00
Ealrang
204015f1f5
Update zh-CN.js
Correct typos
2022-11-12 22:15:04 +08:00
Louis Lam
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
Feat/add gRPC protocol
2022-11-11 12:34:35 +08:00
Louis Lam
fd15e7c2dc Merge remote-tracking branch 'origin/master' into ntfy-icon
# Conflicts:
#	server/notification-providers/ntfy.js
#	src/components/notifications/Ntfy.vue
#	src/languages/en.js
2022-10-31 17:10:20 +08:00
Louis Lam
5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
Added support for SMSEagle device API notifications
2022-10-31 17:03:34 +08:00
Louis Lam
54efde8185 Update socket.io and remove an useless event listener 2022-10-29 23:29:33 +08:00
5idereal
1cb6940590
update zh-tw translation 2022-10-28 15:50:00 +08:00
Louis Lam
0f8ad288f3
Merge pull request #2255 from b-reich/update-german-translation
Add german translations
2022-10-27 16:47:11 +08:00
Adam Stachowicz
434174d350
I18n PL update (#2264)
* [PL] Only formatting by ESLint for now

* Translate new i18n keys to polish + small grammar/typo fixes

* ESLint again after npm install...
2022-10-27 16:46:32 +08:00
minhhn3
b459408b10 fix: resolve conflict 2022-10-26 20:41:21 +07:00
Benjamin Reich
f04fe4d230 add new german translations 2022-10-25 10:50:58 +02:00
Louis Lam
e579610426
Merge pull request #2265 from Saibamen/patch-1
Add info about `npm install` to translators
2022-10-25 14:32:43 +08:00
Adam Stachowicz
134b3b8ac1 Fix 'dayjs' is never used warning 2022-10-25 01:27:25 +02:00
Adam Stachowicz
e7e7751e7b
Correct order 2022-10-24 23:38:38 +02:00
Adam Stachowicz
5cd58e6fa3
Add info about npm install to translators
Without this, you can have wrong indentation from ESLint
2022-10-24 23:36:21 +02:00
Marcin Kiszka
08763b700a Added support for SMSEagle device API notifications 2022-10-24 12:45:56 +02:00
Matthew Nickson
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size 2022-10-22 16:22:28 +01:00
Denis Mishankov
7313aa6563 fix spaces 2022-10-17 20:36:52 +03:00
Denis Mishankov
c7871427c3 compute title value 2022-10-17 20:20:51 +03:00
Dave
c0e67b6de9
Update id-ID.js 2022-10-17 20:09:25 +07:00
Louis Lam
a17084f75d
Merge pull request #2229 from falentio/fix-id-lang
fix typos in id lang
2022-10-16 16:25:35 +08:00
falentio
5761bc9b90 fix typos in id lang 2022-10-16 13:49:25 +07:00
MrEddX
92ea019fd4
Update bg-BG.js
- Added new  fields
- Translated new fields
2022-10-16 07:21:23 +03:00
Cyril59310
a774b37369
Update FR language + fixed daytime error (#2226)
* Update FR language

* fix a daytime error + add for translation

* Update language file FR + fixed daytime error
2022-10-16 01:42:28 +08:00
Louis Lam
64f84eb118 Update Details.vue's button styles 2022-10-15 21:01:48 +08:00
Louis Lam
6f4424de28 Remove unused language keys 2022-10-15 20:44:02 +08:00
Louis Lam
d8a676abb6 Implement recurring day of month and day of week 2022-10-15 18:49:09 +08:00
Louis Lam
268cbdbf8d Merge remote-tracking branch 'origin/master' into maintenance
# Conflicts:
#	server/server.js
#	src/components/settings/General.vue
2022-10-15 15:57:39 +08:00
Louis Lam
c662d259b0
Firefox Better Support #2206 2022-10-13 19:28:02 +08:00
Matthew Nickson
f459ea845c
Added #2182 Add support for custom radius ports (#2197)
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-13 00:32:05 +08:00
MagicFun1241
cb5f90aa89
Update Russian locale (#2218)
* Update ru-RU.js

* Remove duplicates

* Remove duplicates x2

* Revert to previous version for one translation

* Removed conflicting lines

* Remove conflicting 'Reverse Proxy' key
2022-10-13 00:27:50 +08:00
Louis Lam
edacff123b Add UTC in the serverTimezone dropdown 2022-10-12 22:13:07 +08:00
Louis Lam
2faf866e9e Implement generateTimeslot() for recurring interval type 2022-10-12 17:02:16 +08:00
Louis Lam
8cc3e4b7c1 Revert 2022-10-11 22:28:00 +08:00
Louis Lam
dfb75c8afb Update status page's maintenance message 2022-10-11 20:56:48 +08:00
Louis Lam
e07aa982c3 WIP 2022-10-11 18:23:17 +08:00
Christian Meis
1e8a16504b Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined. 2022-10-11 11:15:33 +02:00
Alexander Borzov
180d881ac1
Update ru-RU.js (#2217) 2022-10-11 15:35:08 +08:00
Louis Lam
2271ac4a5a Add info.serverTimezoneOffset and improve some styles 2022-10-11 14:52:47 +08:00
Louis Lam
d5c02fc627 Update Maintenance list order by status 2022-10-11 01:59:47 +08:00
Louis Lam
c84de4d259 WIP: Add maintenance status 2022-10-11 01:45:30 +08:00
Louis Lam
c1ccaa7a9f WIP 2022-10-10 20:48:11 +08:00
Louis Lam
539683f8e9 Merge remote-tracking branch 'origin/master' into maintenance 2022-10-10 16:50:25 +08:00
Louis Lam
bd42450e55 Update vue-i18n from 9.1.9 to 9.2.2, force to use production version of vue-i18n in order to improve the performance 2022-10-10 16:23:32 +08:00
Louis Lam
a577fba848 Change DateTime Range using serverTimezone 2022-10-10 02:28:03 +08:00
Louis Lam
a36f24d827 Add configurable server timezone 2022-10-09 20:59:58 +08:00
Louis Lam
b007681e67 Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
#	server/model/monitor.js
#	server/model/status_page.js
#	src/languages/en.js
2022-10-09 19:26:00 +08:00
Louis Lam
0d2e02f569
Merge pull request #2190 from VasilisThePikachu/master
Adding Greek Language
2022-10-09 02:48:32 +08:00
Kevin Falentio
230e5110b1
Fix typo in id-ID language file (#2202) 2022-10-08 20:59:22 +08:00
Matthew Nickson
f67d7cdf3f
Make update-language-files command more useful (#2198)
* [empty commit] pull request for Fix language update script

* Avoid mass changes with update-language-files

This commit updates the update-language-files script to prevent mass
changes as seen on a number of recent PRs where the contributer has
ran the script and comitted the results.
The script has been updated to now require the --language argument to
specify which language file to update. This ensures that only that file
is updated instead of all files. If the provided language code does not
already exist, a new file with that code is created. This should make
it easier to add new languages as you only need to pass the language
code to the script.
The base lang code is now also passed as an optional argument to negate
the need for a seperate script entry in package.json.
The script has been restructures into a couple of functions to make it
easier to understand.
ESlint now only checks the changed file instead of
them all in order to improve performance.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Updated translation docs for new command

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* [update-language-files] Add cross-env-shell

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-08 15:01:47 +08:00
wellart
df2f536845
[id-ID.js] Fix some type and word (#2149)
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-08 02:15:03 +08:00
Vasilis The Pikachu
59e7aa74a3 Remove some double dots & fix backuprecommended 2022-10-07 17:51:45 +00:00
AnnAngela
43c1ec640c
feat: 🌐 Update zh-cn and en translation (#2167)
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-08 01:45:00 +08:00
Louis Lam
4f6dec41c6 Fix ntfy username should not be required 2022-10-07 20:46:43 +08:00
Vasilis The Pikachu
e29527e22f
Update Greek 2022-10-07 11:33:29 +02:00
Vasilis The Pikachu
91f9e10c94
Merge branch 'louislam:master' into master 2022-10-07 10:55:42 +02:00
Vasilis The Pikachu
7d3cc002ea Added greek language 2022-10-07 08:55:12 +00:00
janhartje
b879428a03
feat(notification): add additional Header to webhook 2022-10-05 17:48:07 +02:00
janhartje
3c5de1c889 Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919 2022-10-05 16:44:13 +02:00
CL0Pinette
528a615fb2
Add free.fr SMS notification provider (#2159) 2022-10-05 17:30:49 +08:00
Cyril59310
64ba2dce24
Update FR language (#2173) 2022-10-05 13:57:38 +08:00
Louis Lam
afbc283423
Move Cypress directory and convert it to JavaScript (#2170) 2022-10-04 22:23:57 +08:00
Louis Lam
c538983b87
Merge pull request #2169 from louislam/fix-docker-monitor
Fix Docker container monitor not working in 1.18.1
2022-10-04 17:47:56 +08:00
Louis Lam
0686757160 [Docker Monitor] Change tcp:// to http:// 2022-10-04 16:19:56 +08:00
Louis Lam
25ea99a436
Merge pull request #2161 from 5idereal/patch-1
Update zh-tw translation
2022-10-03 20:53:13 +08:00
5idereal
c2c3f981bc
update zh-tw translation 2022-10-03 18:03:15 +08:00
Louis Lam
3e85893bdd Merge remote-tracking branch 'origin/master' into squadcast-notification-support
# Conflicts:
#	src/languages/en.js
2022-10-03 16:16:50 +08:00
Louis Lam
7672057319 [ntfy] Do not autofill 2022-10-03 15:51:29 +08:00
Louis Lam
0f99d49a27 Merge remote-tracking branch 'origin/master' into ntfy-auth-support 2022-10-03 15:30:00 +08:00
Louis Lam
894aeaea0a
Merge pull request #2158 from SametKUM/master
fix some translations
2022-10-03 15:16:15 +08:00
5idereal
d39a4770e0
sync 2022-10-03 13:11:39 +08:00
SametKUM
f6ac09b751 fix some translations 2022-10-02 21:14:00 +03:00
An | Anton Röhm
8595824b5d
Improve German translation 2022-10-02 13:49:40 +02:00
MrEddX
ed7bc0e6d1
Update bg-BG.js
Added New Fields
2022-10-02 09:55:58 +03:00
Matthew Nickson
f9be918246
Add support for MySQL/MariaDB databases #1817
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-02 01:52:53 +01:00
Matthew Nickson
314ae38f91
Changed name of SQL Server to avoid confusion
It appears that SQL Server causes some confusion among users as they
believe that it means any SQL database, not the Microsoft product SQL
Server. To avoid this issue, the display value has been changed to
Microsoft SQL Server. No backend changes have been made and it is still
stored as sqlserver in the database. This is only a frontent change.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 21:35:33 +01:00
FarisDaffa
929d238106
Update id-ID.js 2022-10-01 12:17:17 +07:00
Christian Meis
c03d911657
Update src/languages/en.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-09-28 11:39:13 +02:00
Christian Meis
6f86236b63 Add support for icon to ntfy notification provider (requires minimum ntfy server version 1.28.0 and Android app 1.14.0, no iOS support as of today) 2022-09-28 10:13:18 +02:00
Louis Lam
204339fbed Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss 2022-09-28 00:48:15 +08:00
Louis Lam
b1465c0282 - Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2022-09-28 00:20:17 +08:00
Louis Lam
4002b9f577 [WIP] Checking maintenance time using maintenance_timeslot table 2022-09-27 20:44:44 +08:00
Justin Tisdale
f6919aef1d remove TODO 2022-09-26 17:10:56 -04:00
Patrick
4157c7d546 Add support for Squadcast incoming webhook 2022-09-26 22:16:34 +13:00
Justin Tisdale
0814d643c1 Merge branch 'master' into feature/expand-http-payload-support 2022-09-25 10:45:32 -04:00
Louis Lam
3f63cb246b [WIP] Handle timezone offset for timeRange 2022-09-25 19:38:28 +08:00
Louis Lam
c3eef28443
Merge pull request #2122 from mjysci/test
feat: Add ServerChan Notification support
2022-09-25 15:01:58 +08:00
Louis Lam
f11dfc8f43 [WIP] Add/Edit Maintenance with new UI and recurring 2022-09-24 19:18:24 +08:00
Louis Lam
9d99c39f30 Update Maintenance UI for recurring 2022-09-24 02:33:29 +08:00
MA Junyi
b03624b7e3 feat: Add ServerChan Notification support 2022-09-23 23:27:22 +08:00
Buchtič
c6cf600722
Update cs-CZ.js
localization improvements
2022-09-22 19:30:43 +02:00
Louis Lam
617ba49e6c Fix race condition of selectedStatusPagesOptions 2022-09-18 22:40:53 +08:00
Louis Lam
7853c2cc38 Update Maintenance UI 2022-09-18 22:34:05 +08:00
Louis Lam
f61c1c47aa Update Maintenance UI 2022-09-18 02:13:29 +08:00
Louis Lam
9fe07742ea Linting 2022-09-18 02:07:32 +08:00
Louis Lam
a29eae3213 Update Maintenance UI 2022-09-18 02:02:18 +08:00
Louis Lam
80698a58b8 Tidy up 2022-09-17 22:09:09 +08:00
Louis Lam
bb883e6fa0 Move maintenance under /maintenance 2022-09-17 22:00:11 +08:00
Louis Lam
90761cf831 Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	src/components/HeartbeatBar.vue
#	src/components/MonitorList.vue
#	src/icon.js
#	src/layouts/Layout.vue
#	src/mixins/datetime.js
#	src/mixins/socket.js
#	src/router.js
#	src/util.js
2022-09-17 16:12:57 +08:00
Louis Lam
d23085cddc Fix #2100, the monitor name cannot display if too long 2022-09-17 01:18:49 +08:00
Louis Lam
f96bad1629
Merge pull request #2089 from jakubenglicky/smsmanager
feat: Add support notification via SMSManager
2022-09-16 14:29:50 +08:00
burakurer
bec3b0d2dc
Update tr-TR.js 2022-09-16 00:16:08 +03:00
jakubenglicky
1c3da995e3 Add support notification via SMSManager 2022-09-15 09:11:05 +02:00
Gilas Amalanda
b673cfbe94 chore: update typo for Tag with this name already exist at language id-ID 2022-09-13 21:38:58 +07:00
Gilas Amalanda
0ae8010156 chore: update typo for promosmsTypeFull at language id-ID 2022-09-13 21:37:58 +07:00
Gilas Amalanda
527e479f2d chore: update existing and add new text for language id-ID 2022-09-13 21:30:15 +07:00
Louis Lam
08fdbeaa75
Merge pull request #1866 from ThomasChr/logintitle
change page title to " - Login" when on Login Form
2022-09-12 18:48:05 +08:00
Louis Lam
0dd858d516 Warn about the backup feature 2022-09-12 18:45:18 +08:00
Louis Lam
839183aa85
Merge pull request #2071 from d3vyce/master
Add phishing security to link in status page
2022-09-12 14:39:20 +08:00
Matthew Nickson
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size 2022-09-10 21:20:03 +01:00
d3vyce
7577477ae8 Add rel="noopener noreferrer" to html link 2022-09-10 21:35:22 +02:00
Mambo
3ea57600ba chore: fix typo
Modifying Korean Spelling
2022-09-10 23:16:05 +09:00
Louis Lam
197d44981f Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
# Conflicts:
#	package.json
2022-09-09 16:32:23 +08:00
Louis Lam
42969d11ee
Merge pull request #2044 from burakurer/patch-4
Update tr-TR.js
2022-09-09 15:50:51 +08:00
Louis Lam
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
Adding GoAlert Notification
2022-09-09 03:34:37 +08:00
Michael Telgkamp
995276badc
fix typo and formatting in en language string 2022-09-08 14:30:41 +02:00
Michael Telgkamp
9e62a6ec7d
add some new translated strings 2022-09-08 14:29:45 +02:00
Justin Tisdale
fa1fc0fb05 Merge branch 'master' into feature/expand-http-payload-support 2022-09-07 11:34:58 -04:00
burakurer
75deab2cc5
Update tr-TR.js 2022-09-06 23:04:24 +03:00
Louis Lam
50f7b39672
Merge pull request #2040 from cyril59310/master
Update Fr language
2022-09-07 02:24:17 +08:00
cyril59310
6a802bf68c fix by eslint 2022-09-06 18:38:55 +02:00
Ivan Bratović
d1aa9cfbcc Change small details in hr-HR translation 2022-09-06 14:51:27 +02:00
Ivan Bratović
808efb267f Update Croatian (hr-HR) translation file 2022-09-06 11:32:58 +02:00
cyril59310
252d6ea9c9 Remove unused translations 2022-09-05 20:58:00 +02:00
cyril59310
7d12cd0d42 Update Fr language 2022-09-05 20:21:46 +02:00
Louis Lam
c0fe2d54f9
Merge pull request #2034 from Max-le/fr_translate
French translation contribution
2022-09-05 17:41:58 +08:00
Buchtič
ee14ab6751
Update cs-CZ.js 2022-09-04 09:43:07 +02:00
max
87e45b21fa [empty commit] pull request for French translation contribution 2022-09-02 10:56:54 +02:00
Filippo Romani
c2472bf750
Italian language fixes
A few grammar fixes made from an italian.
Some phrases were not really correct.
2022-08-30 19:11:54 +02:00
Muhammed Hussein karimi
064fe50e38
Update src/components/notifications/index.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-26 17:06:13 +04:30
Yoswaris Lawpaiboon
31150642cd forgot to save lol 2022-08-26 01:08:21 +07:00
Yoswaris Lawpaiboon
3c5c49c16d Update th-TH.js 2022-08-26 00:57:44 +07:00
Muhammed Hussein Karimi
055948d1b9 [Linter] typo fixes 2022-08-23 23:58:46 +04:30
Muhammed Hussein Karimi
4ac80cfc02 goAlertInfo language fix 2022-08-23 23:54:26 +04:30
Muhammed Hussein Karimi
af89c4d8ae GoAlert Notification added done
needs test
2022-08-23 23:49:28 +04:30
Justin Tisdale
6ec6410808 Merge branch 'master' into feature/expand-http-payload-support 2022-08-20 10:24:18 -04:00
Louis Lam
5c25354682
Merge pull request #1998 from MrEddX/bulgarian
Bulgarian
2022-08-17 16:55:58 +08:00
MrEddX
fac2f1cbc6
Update bg-BG.js
Translated new fields for the upcoming 1.18.0 release.
2022-08-14 08:52:53 +03:00
MrEddX
8bc3651a7d
Merge branch 'louislam:master' into bulgarian 2022-08-14 07:20:37 +03:00
Matthew Nickson
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size 2022-08-13 21:15:16 +02:00
AnnAngela
684d0a7eb8 feat: Update zh-CN languages file
Due to no Radius server and Home Assistant device or server in my hands, the translation may be incorrect.\nRef:\n- Radius secret → Radius 共享机密: https://docs.microsoft.com/zh-cn/azure/active-directory/authentication/howto-mfaserver-dir-radius#:~:text=%E5%8F%AF%E9%80%89%EF%BC%89%E5%92%8C-,%E5%85%B1%E4%BA%AB%E6%9C%BA%E5%AF%86,-%E3%80%82\n- Called Station Id → NAS 网络访问服务器号码: https://docs.microsoft.com/zh-cn/windows-server/networking/technologies/nps/nps-plan-proxy#:~:text=Called%2DStation%2DID%E3%80%82-,NAS%20%E7%BD%91%E7%BB%9C%E8%AE%BF%E9%97%AE%E6%9C%8D%E5%8A%A1%E5%99%A8%20(%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81),-%E3%80%82%20%E6%AD%A4%E5%B1%9E%E6%80%A7%E7%9A%84\n- Calling Station Id → 呼叫方号码: https://docs.microsoft.com/zh-cn/windows-server/networking/technologies/nps/nps-plan-proxy#:~:text=Calling%2DStation%2DID%E3%80%82-,%E5%91%BC%E5%8F%AB%E6%96%B9%E4%BD%BF%E7%94%A8%E7%9A%84%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81,-%E3%80%82%20%E6%AD%A4%E5%B1%9E%E6%80%A7%E7%9A%84
2022-08-13 16:23:51 +08:00
AnnAngela
b3712ee1cc fix: Update en language file to match up newest development 2022-08-13 16:19:51 +08:00
minhhn3
6bb79597e8 fix: resolve merge conflict 2022-08-13 13:26:05 +07:00
Louis Lam
de6e1e7ddd Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
#	server/database.js
2022-08-13 13:24:00 +08:00
Justin Tisdale
31cc328839 fix lint 2022-08-11 21:08:13 -04:00
Justin Tisdale
0d58526f25 Merge branch 'master' into feature/expand-http-payload-support 2022-08-11 21:04:11 -04:00
Justin Tisdale
2b9bf095a6 Add non-json support for http body 2022-08-11 20:57:03 -04:00
Louis Lam
3b3763351b Merge remote-tracking branch 'origin/master' into radius-check
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
#	src/pages/EditMonitor.vue
2022-08-11 21:08:06 +08:00
Justin Tisdale
3a18801722 Add Body Encoding field 2022-08-10 21:46:43 -04:00
Louis Lam
9a488d6968
Merge pull request #1752 from SuperManito/master
Add Bark Notification Parameters
2022-08-08 17:04:08 +08:00
Louis Lam
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
feat: added Home Assistant notification integration
2022-08-06 18:08:06 +08:00
Louis Lam
d0d1e0de28 Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
#	src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
minhhn3
2232236a7a [empty commit] pull request for add gRPC protocol 2022-08-03 13:39:31 +07:00
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol (#1)
* feat: added monitor with gRPC

Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2022-08-03 12:00:39 +07:00
Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
Adding option to monitor other docker containers
2022-08-02 19:08:46 +08:00
MrEddX
19d8761305
Update bg-BG.js
Just a typo
2022-08-02 07:48:54 +03:00
Louis Lam
bea8679788
Merge branch 'master' into issue-1861 2022-07-31 20:06:45 +08:00
rmt/src
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification 2022-07-31 12:41:18 +01:00
Louis Lam
a0843745f9 Remove unused language key 2022-07-31 18:12:41 +08:00
Louis Lam
16d6885a88 Fix radio button and add description 2022-07-31 18:11:40 +08:00
Louis Lam
4d975a5bd5
Merge pull request #1955 from dtorner/patch-1
Updated ES translation
2022-07-31 17:24:15 +08:00
MrEddX
96ec46765b Update en.js
Just a typo.
2022-07-31 17:23:23 +08:00
MrEddX
96971f6776 Update bg-BG.js
- Translation Update
- Fixed Some Accidentally Deleted Fields
2022-07-31 17:23:23 +08:00
MrEddX
ffb1a948fe Update bg-BG.js
Translation Update
2022-07-31 17:23:23 +08:00
dtorner
4e4156285a
Updated ES tramaslation
Just some changes here and there, mainly caps and some words.
TY to the developers for this good piece of code :-)
2022-07-31 11:13:36 +02:00
Louis Lam
1223b56205 Add example 2022-07-30 19:57:51 +08:00
Louis Lam
8ced61697a Fix save docker host issue 2022-07-30 19:48:12 +08:00
Louis Lam
b76ca59dfe
Merge pull request #1786 from treboryx/master
fix: hide mobile header when not logged in
2022-07-29 15:25:43 +08:00
Louis Lam
554b0d2bc3
Merge pull request #1931 from mariogarridopt/add-language-pt-pt
Add pt-PT language file
2022-07-29 15:19:51 +08:00
0x01code
4575f31094
Add support for line notify providers (#1781)
* add line notify support

* add way to get line notify

* Fix duplicate key 'HTTP Basic Auth'

* Revert language files changes

* Revert language files changes

* Fix general message

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-07-29 15:13:50 +08:00
Mario Garrido
d8253405b4
fix: add language to the language list 2022-07-26 02:07:38 +01:00
Mário Garrido
56c6c0c6f1
Merge branch 'louislam:master' into add-language-pt-pt 2022-07-26 02:04:50 +01:00
__filename
b16cb6a337
fix(locale): Edit non-space place
Co-authored-by: Kyungyoon Kim <ruddbs5302@gmail.com>
2022-07-25 20:11:51 +08:00
__filename
694b4cadb3
fix(locale): Edit typo
Co-authored-by: Kyungyoon Kim <ruddbs5302@gmail.com>
2022-07-25 16:41:29 +08:00
__filename
75f6ff8b58
fix(locale): Edit multiple space
Co-authored-by: Kyungyoon Kim <ruddbs5302@gmail.com>
2022-07-25 16:39:00 +08:00
c0derMo
1062e629c5 Fix linting issues 2022-07-24 12:50:43 +00:00
__filename
13f7db655b
chore(locale): change some typo ko-KR 2022-07-24 20:44:43 +08:00
Moritz R
60e7824ff0
Merge branch 'master' into master 2022-07-24 14:37:22 +02:00
c0derMo
fb3b407577 Added a settings page & localization 2022-07-24 12:34:43 +00:00
Louis Lam
88afd662db Merge remote-tracking branch 'origin/master' into postgres
# Conflicts:
#	package-lock.json
#	package.json
2022-07-24 14:07:30 +08:00
c0derMo
e356d5f623 Fixing linting & adding documentation 2022-07-22 15:57:40 +00:00
c0derMo
0d098b0958 Docker Hosts are now a table & have their own dialog 2022-07-22 15:47:04 +00:00
Mario Garrido
2ccf1fe41b
fix: small changes in semantics 2022-07-22 15:42:38 +01:00
Mario Garrido
77340cf0d2
feat: adicionar pt-PT 2022-07-22 15:16:23 +01:00
Mario Garrido
c412c66aeb
Add pt-PT language file 2022-07-22 06:29:41 +01:00
Rolf Bachmann
c4a2ce4e78 Add authentication support for ntfy 2022-07-19 12:17:15 +02:00
tamasmagyar
31c388a6e3 added cypress framework and tests for setup page 2022-07-18 20:51:13 +02:00
Jan Hartje
95dba6dcaf feat(notification): add Authorization Header option to frontend 2022-07-18 16:04:18 +00:00
Denis Stepanov
525607f49e
Update ukrainian language 2022-07-18 09:00:44 +03:00
SiderealArt
d44d984a46
update zh-TW 2022-07-14 22:25:39 +08:00
Matthew Nickson
a54e58b4d6
Added Ping packet size #1891
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-14 08:32:51 +01:00
Louis Lam
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
Feat: New Notification Type for AlertNow
2022-07-14 15:04:35 +08:00
Chongyi Zheng
6ce012c9a1
Add trust proxy checkbox in Settings page 2022-07-12 22:45:54 -04:00
Matthew Nickson
1b120f8a6f
Made link icon only show for http and keyword
The option to enable links to the monitors is now only available for
http and keyword monitor types. The link will also no longer be shown
on the edit page to prevent issues with the url not being present if
the monitor was not already enabled for sendUrl

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-04 13:31:05 +01:00
Louis Lam
6f57c4195a Slightly improve css 2022-07-04 18:33:38 +08:00
Louis Lam
baa592bce3 Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page 2022-07-04 18:21:56 +08:00
Thomas Christlieb
42e30de209 change page title to " - Login" when on Login Form 2022-07-04 10:16:33 +02:00
Louis Lam
6418f99f1a
Merge pull request #1852 from thehijacker/patch-1
Update sl-SI.js
2022-06-30 16:40:03 +08:00
Louis Lam
f65bef686c
Merge pull request #1857 from MarcHagen/lang/nl
[i18n] Update NL (Dutch)
2022-06-30 16:19:26 +08:00
Marc Hagen
2f26864892 [i18n] Update NL (Dutch) 2022-06-29 23:26:41 +02:00
thehijacker
303738b7c2
Update sl-SI.js 2022-06-29 13:58:52 +02:00
Louis Lam
e36b65c2df Add frontend version 2022-06-28 21:55:05 +08:00
rmt/src
5dd197374d
fix: only add en translation 2022-06-26 10:56:46 +01:00
rmt/src
f84ae82983
feat: added Home Assistant notification integration 2022-06-25 21:27:30 +01:00
Unai Tolosa
b5cbc6f5f6 fix: lint 2022-06-23 23:30:01 +02:00
Unai Tolosa
5dd3d32d77 add: basque translations 2022-06-23 16:20:24 +02:00
Unai Tolosa
ff8bba6863 add: basque translation file 2022-06-23 13:29:37 +02:00
Louis Lam
c36d9a4b8b Fix port data type #1802 2022-06-21 22:33:09 +08:00
Louis Lam
a7063b8aca Fix logo height in the status page list 2022-06-21 15:46:22 +08:00
Louis Lam
ea400ac35f
Merge pull request #1795 from MrEddX/bulgarian
Update bg-BG.js
2022-06-20 21:50:00 +08:00
MrEddX
89717495dc
Update bg-BG.js
Added and translated new fields
2022-06-20 11:52:12 +03:00
Adam Stachowicz
7b710af12c
Update README for i18n
Related: https://github.com/louislam/uptime-kuma/pull/1777
2022-06-19 21:17:03 +02:00
Louis Lam
5b278ca500 Add a description that certification expiry have to be assigned to a monitor 2022-06-19 20:57:52 +08:00
Matthew Nickson
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page 2022-06-18 23:53:35 +01:00
Louis Lam
b97019eea8 Fix cloudflared cannot be stopped in No Auth mode due to password checking 2022-06-18 19:06:03 +08:00
Louis Lam
d65abe5b8c
Merge pull request #1777 from MarcHagen/change/move_translations_to_i18n
[change] Move i18n from Security to locale files
2022-06-18 17:17:06 +08:00
Robert
c4e2d67d17
fix: hide mobile header when not logged in 2022-06-17 10:11:53 +03:00
Louis Lam
7533041696
Merge pull request #1784 from AnnAngela/master
Update i18n for en & zh-CN
2022-06-17 13:30:47 +08:00
MrEddX
b4a4171178
Update bg-BG.js
Translation fixes.
2022-06-16 21:08:17 +03:00
AnnAngela-work
012be23509 Update i18n 2022-06-16 21:20:12 +08:00
sur.la.route
4b2a465c94
Fix order of type and placeholder
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-15 20:14:06 -05:00
Marc Hagen
f7afe121e3 [change] Move i18n to locale files 2022-06-15 19:41:21 +02:00
Christopher Pickering
945288f0c0
Added postgres monitor 2022-06-15 12:12:47 -05:00
OidaTiftla
ac27e6e2af Rename feature to: Resend Notification if Down X times consequently
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-06-15 17:50:35 +02:00
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval 2022-06-15 16:19:47 +02:00
Christopher Pickering
42848bcd2e
updated translations 2022-06-15 09:00:47 -05:00
Louis Lam
a3b94aa532
Merge pull request #1550 from Computroniks/jsdoc-for-src
JSDoc for src/*/*
2022-06-15 19:29:51 +08:00
Moritz R
ac449ec1c2
Merge branch 'master' into master 2022-06-15 11:33:00 +02:00
Louis Lam
da91317760
Merge pull request #1772 from chakflying/fix/mobile-monitor-list
Fix: Fix monitor list layout on mobile
2022-06-15 15:50:04 +08:00
Louis Lam
7d63b700e1
Merge pull request #1767 from christopherpickering/patch-2
[beta] workstation field should be text, not password
2022-06-15 15:31:24 +08:00
Louis Lam
0223f86a2a Merge remote-tracking branch 'origin/master' 2022-06-15 15:18:29 +08:00
Louis Lam
c170b1edd0 Better optgroup text color 2022-06-15 15:18:14 +08:00
Nelson Chan
62acd2edb1 Fix: misc. layout fix on mobile 2022-06-14 22:43:44 +08:00
Christopher Pickering
483cbfb636
added default value for sql server connection string 2022-06-14 09:00:23 -05:00
sur.la.route
6995a29980
workstation field should be text, not password 2022-06-14 07:45:04 -05:00
Nelson Chan
f723930d11 Fix: Unify design with Security page 2022-06-14 15:04:46 +08:00
Nelson Chan
e425e408a2 Fix: Fix missing default settings 2022-06-14 15:04:14 +08:00
Louis Lam
af7c905b44
Merge pull request #1759 from MrEddX/bulgarian
Bulgarian
2022-06-14 10:57:14 +08:00
Louis Lam
d16be6fb7d Fix and use null as authMethod None instead of empty string 2022-06-14 10:49:30 +08:00
Louis Lam
6682839ec8 Merge remote-tracking branch 'origin/master' into ntml-auth
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
2022-06-14 10:36:29 +08:00
Louis Lam
817f6db4fd Remove SQL Server code (which in another pr already) 2022-06-14 10:32:38 +08:00
MrEddX
7a27d3752a
Merge branch 'louislam:master' into bulgarian 2022-06-13 22:36:00 +03:00
MrEddX
f0e8f34aeb
Update bg-BG.js
Added new fields
2022-06-13 22:32:55 +03:00
Louis Lam
6e43ef1dd3 Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
2022-06-13 20:56:14 +08:00
Louis Lam
f4f2b8ddb8 Try to fix #1658 2022-06-13 19:24:05 +08:00
Louis Lam
d4485fe62f Make the monitor type list a bit clear 2022-06-13 18:14:47 +08:00
Super Manito
774fe58ddc Update 2022-06-13 01:30:27 +08:00
Super Manito
5f347b10ba Update 2022-06-13 01:15:38 +08:00
Super Manito
f442507cab Update 2022-06-13 00:16:34 +08:00
Super Manito
a23ab9d1de Update 2022-06-12 23:18:32 +08:00