Commit graph

3104 commits

Author SHA1 Message Date
Louis Lam df4ce811d9 Merge remote-tracking branch 'origin/master' into kaysond_master
# Conflicts:
#	server/model/monitor.js
2022-05-28 23:19:58 +08:00
Louis Lam 30858ab038 Fix rollback issue of 9fc5a33 and one issue of #1694 2022-05-28 23:08:14 +08:00
dhfhfk e25d406fa5
Eslint 2022-05-28 17:12:40 +09:00
dhfhfk 10e16782b1
Update ko-KR.js 2022-05-28 17:10:40 +09:00
Furkan İpek 107a44885c Update tr-TR.js 2022-05-27 15:05:09 +03:00
Furkan İpek ef9f66fad9 Update tr-TR.js 2022-05-27 15:02:40 +03:00
Moritz R e9e78c26e5
Merge branch 'master' into master 2022-05-27 13:59:58 +02:00
Furkan İpek 46dae99695 Update tr-TR.js 2022-05-27 12:51:41 +03:00
Furkan İpek edd9bf3887 Update tr-TR.js 2022-05-27 12:39:07 +03:00
Aram Akhavan ab4edf2092
Fix log.debug calls 2022-05-26 21:45:56 -07:00
Louis Lam 334cb57fed Update to 1.16.0 2022-05-26 19:32:52 +08:00
Nelson Chan cfa5b551a5 Feat: Make the expiry days sorted 2022-05-26 12:17:24 +08:00
Nelson Chan 46ee149b70 Chore: Slightly improve design 2022-05-26 12:12:29 +08:00
Louis Lam 0a8c922abf Fix default value of pagerduty-integration-url 2022-05-25 23:34:47 +08:00
Louis Lam 058e5442af
Merge pull request #1310 from MarcHagen/feature/pagerduty
Add support for PagerDuty notifications
2022-05-25 23:26:33 +08:00
Louis Lam ea1725737f
Merge pull request #1687 from burakurer/patch-3
Update tr-TR.js
2022-05-25 23:24:10 +08:00
burakurer 5566b038c8
Update tr-TR.js 2022-05-25 17:35:05 +03:00
Marc Hagen 5830f1e0b5 [feat] Adding PagerDuty notification 2022-05-25 14:10:31 +02:00
Louis Lam 35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
Added #1059: Allow to specify Resolver Port for DNS Monitor
2022-05-25 14:59:14 +08:00
Louis Lam d892b2c549
Merge pull request #1686 from DasCanard/master
Improved Discord Notifications with Push Monitors
2022-05-25 14:57:25 +08:00
DasCanard f23baf9c22 Added Push Monitor to Discord Notifications 2022-05-24 23:14:27 +02:00
Philipp Dormann 54184350a4
fix: missing semicolons 2022-05-23 21:13:57 +02:00
Philipp Dormann 14dbe7c334
clean up + default ntfs.sh server url 2022-05-23 21:11:01 +02:00
Philipp Dormann 122e6a842b
clean up ntfy topic input 2022-05-23 21:08:56 +02:00
Philipp Dormann 77ef22bdb4
set proper ntfy priorities 2022-05-23 21:08:11 +02:00
Philipp Dormann 59f983d506
fix: unused import "HiddenInput" 2022-05-23 20:57:10 +02:00
Philipp Dormann 71f031c14e
add ntfy support
ref https://github.com/louislam/uptime-kuma/issues/1622
2022-05-23 10:55:03 +02:00
Louis Lam 6ae2a48584
Merge pull request #1662 from kiznick/master
Translate to Thai
2022-05-21 14:14:42 +08:00
Louis Lam 7373747906
Merge pull request #1659 from MrEddX/bulgarian
Bulgarian
2022-05-21 14:13:48 +08:00
Yoswaris Lawpaiboon 9d87f8d390 Update th-TH.js 2022-05-20 19:16:37 +07:00
Domingos F. Panta Jr 73b965c867
Merge branch 'master' into bugfix/1451_blank_page_on_unkown_resource 2022-05-19 19:35:58 +01:00
MrEddX 751e5ac477
Bulgarian Translation
Updated Translation
2022-05-19 20:32:01 +03:00
Yoswaris Lawpaiboon 93e5023ead Translate to Thai ! 2022-05-19 19:44:59 +07:00
c0derMo 32cfd411f8 Fixed style & code errors 2022-05-19 12:35:55 +00:00
Moritz R a9f3142cee
Merge branch 'master' into master 2022-05-19 14:24:02 +02:00
Nelson Chan b7ba6330db Feat: Add cert exp. settings 2022-05-19 16:49:34 +08:00
MrEddX 4c3aa20eb0
Update bg-BG.js
Added new fields
2022-05-18 22:18:58 +03:00
MrEddX f779c6286a
Merge branch 'louislam:master' into bulgarian 2022-05-18 22:14:18 +03:00
Sascha Kruse da99a57560 Merge remote-tracking branch 'fxgh/radius-check' into radius-check 2022-05-18 15:56:21 +02:00
Sascha Kruse 42d68edab0
(style) add trailing comma
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-18 15:55:36 +02:00
Sascha Kruse 019d638767 Merge remote-tracking branch 'ghupstream/master' into radius-check 2022-05-18 15:54:10 +02:00
Louis Lam 9fc5a3329f Revert #1208, due to the break animation 2022-05-18 20:16:50 +08:00
Louis Lam 23c4ece2a5
Merge pull request #1655 from alexislefebvre/patch-1
Fix typo “cros”?
2022-05-17 23:12:07 +08:00
Alexis Lefebvre 175556f9fc
s/cros/CORS 2022-05-16 20:30:16 +02:00
Louis Lam 398219f847 Update to 1.16.0-beta.0 2022-05-17 01:03:51 +08:00
Louis Lam 7a50f0e3f3
Merge pull request #1589 from AnnAngela/1.15.1_zh-CN
Improve translation work
2022-05-17 00:03:25 +08:00
AnnAngela 4178b003a2
fix value 2022-05-14 15:27:55 +08:00
Louis Lam 8ede6d888f Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url 2022-05-14 14:37:12 +08:00
Louis Lam cec0521834 [Discord] Fix ping type should no port, update better naming 2022-05-14 14:36:40 +08:00
Louis Lam 73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
Fixed incorrect uptime calculation for push monitors
2022-05-14 14:18:19 +08:00