Commit graph

3909 commits

Author SHA1 Message Date
Louis Lam a9b7bbcd9e Add 繁體中文 (廣東話 / 粵語) 2023-01-25 01:58:31 +08:00
Louis Lam edd5592dca
Update CONTRIBUTING.md 2023-01-25 01:37:19 +08:00
Louis Lam e3246a2705
Update README.md 2023-01-25 01:30:58 +08:00
Louis Lam e1e6227245
Update README.md 2023-01-25 01:29:29 +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 1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
Fix: Fix incorrect log call format in docker monitor
2023-01-25 00:22:51 +08:00
Louis Lam 9cc3bd0de4 Avoid the multiple queries for Gamedig monitor 2023-01-25 00:19:54 +08:00
Nelson Chan c4c720027c Fix: Use correct log call format 2023-01-24 23:47:33 +08:00
Louis Lam 3eab6e8238
Merge pull request #2566 from WhyKickAmooCow/master
Add GameDig monitor
2023-01-24 23:15:29 +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
Louis Lam 2408b1bffa
Update README.md 2023-01-24 19:20:35 +08:00
Thomas Spalinger f155ec9ba8 remember prometheus instance and expose it
in preperation for #2491,#680 and #898
2023-01-24 10:32:49 +00:00
Louis Lam 417efd9711
Update README.md 2023-01-24 18:13:31 +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 bf5ac3fc19
Update CONTRIBUTING.md 2023-01-24 16:55:16 +08:00
Louis Lam 434bff6714 Add Help language key 2023-01-24 16:52:36 +08:00
Louis Lam 1d64b0c11b
Merge pull request #2662 from YehowahLiu/weblate
Follow-up work of migrating to weblate
2023-01-24 16:36:15 +08:00
401Unauthorized f125534829
remove WIP 2023-01-24 16:02:43 +08:00
401Unauthorized ea83af3404
clean up codes 2023-01-24 16:00:51 +08:00
Louis Lam b05c620ec2
Merge pull request #2611 from YehowahLiu/weblate
Prepare for using Weblate
2023-01-24 15:25:46 +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
Louis Lam 0c86a4d4e7
Merge pull request #2659 from Buchtic/master
Update cs-CZ.js
2023-01-24 00:13:17 +08: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 861ddc6117 Merge branch 'master' of https://github.com/amworx/uptime-kuma 2023-01-22 21:31:22 +00:00
Abdulrahman Mustafa 1197f881a1 Checked with eslint, with no errors 2023-01-22 21:31:02 +00:00
Abdulrahman Mustafa 211cbd4687
Merge branch 'louislam:master' into master 2023-01-22 23:28:24 +03:00
Faruk Genç cd017fce98 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-01-22 02:22:59 +03:00
Louis Lam dd6a76c4cc
Merge pull request #2652 from Metatropics/main
Removed superflous 'Message' prefix from Pushover
2023-01-21 22:16:17 +08:00
alejandrohernandezrosales fa23e7ad19 Removed superflous Message prefix 2023-01-20 23:59:11 -06:00
Faruk Genç aef85078eb reorder fix 2023-01-20 12:29:56 +03: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
Louis Lam 6ccf741bc4
Merge pull request #2632 from chakflying/fix/docker-timeout
Fix: Use default timeout & CachebleDnsHttpsAgent for docker monitor
2023-01-19 19:26:40 +08:00
Louis Lam 0a58069742
Merge pull request #2641 from louislam/1.19.X
Merge 1.19.6 to 1.20.X
2023-01-19 14:27:45 +08:00
Abdulrahman Mustafa 316599210d Arabic language support is now in action ✌️ 2023-01-18 19:03:04 +00:00
Louis Lam 2b57b3e863 Update to 1.19.6 2023-01-19 02:17:17 +08:00
Louis Lam 6cd6a2edf0 Fix ping issue on Windows #2636 2023-01-19 02:16:07 +08: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
Nelson Chan 6961b1bdd2 Fix: Use default timeout & CachebleDnsHttpsAgent 2023-01-18 09:53:04 +08:00
Louis Lam 54d4c4d3f7 Merge package-lock.json 2023-01-17 21:18:13 +08: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 7ef404ccc1 Update to 1.19.5 2023-01-17 20:32:44 +08:00