Commit graph

3583 commits

Author SHA1 Message Date
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
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
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
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
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
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
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 27585d0812 Fix #2618 2023-01-17 01:21:01 +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 1a9b013fc2
Merge pull request #2328 from rmarops/mongodb-ping
added MongoDB ping monitor
2023-01-15 01:43:43 +08:00
Louis Lam 1326761a8a Update mongodb and simplify the logic of mongodbPing 2023-01-15 01:36:49 +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
Louis Lam 712a3c29d4 Fix Postgres monitor do not handle some error cases correctly 2023-01-14 21:06:10 +08:00
Louis Lam e9497ac1ab Fix knex.js issue 2023-01-14 20:49:34 +08: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 468cb004d6
Merge pull request #1690 from chakflying/feat/tags-manager
Feat: Tags Manager
2023-01-13 23:29:01 +08:00