Louis Lam
5ff9a64e5e
[Push Type] Fix missing duration calculation ( #685 )
2021-10-14 14:42:34 +08:00
Louis Lam
4bee57ea7f
Merge remote-tracking branch 'giacomo892/patch-1'
...
# Conflicts:
# server/ping-lite.js
2021-10-14 14:10:51 +08:00
Louis Lam
f75c9e4f0c
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
2021-10-14 14:09:16 +08:00
xJoker
8ab4788f80
Update src/components/notifications/index.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 09:33:36 +08:00
xJoker
4e4ab0577e
Update src/components/notifications/index.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 09:33:31 +08:00
xJoker
6e04ec436e
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:45 +08:00
xJoker
2d471a5e84
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:33 +08:00
xJoker
cae194f58f
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:24 +08:00
Aaron Erkenswick
655ccc86b9
Add monitor name context to Slack fallback text.
...
The text block of a slack notification payload is used for mobile
devices and plain text previews. This change allows slack users to see
the name of the failing service without having to open up Slack to read
the entire message.
2021-10-13 11:47:23 -07:00
Louis Lam
e2dbacb383
Fix encoding problem of ping result for non-English Windows
2021-10-14 00:22:49 +08:00
Lukas
89b34b5748
Use double curly brackets and sanity check for customSubject
2021-10-13 18:05:18 +02:00
Louis Lam
9b05e86c25
set newLine to LF for ts compiler
2021-10-13 22:31:36 +08:00
Louis Lam
145b722aec
Merge branch 'master' into andreasbrett_patch-1
2021-10-13 22:17:33 +08:00
Louis Lam
2ff7c4de5d
[test] genSecret
2021-10-13 22:16:46 +08:00
Louis Lam
79c81395bc
Merge branch 'master' into andreasbrett_patch-1
2021-10-13 22:02:27 +08:00
Louis Lam
178e5cd2c0
Merge pull request #689 from hrtkpf/master
...
fix translations (de-DE and en)
2021-10-13 17:47:20 +08:00
hrtkpf
84507268ad
fix translations (de-DE and en)
2021-10-13 11:13:51 +02:00
wuwenjing
843992c410
Add DingDing notification
2021-10-13 16:13:46 +08:00
zsxeee
33f773fcd0
Move param out of the translation file
2021-10-13 15:36:07 +08:00
zsxeee
26841a64f0
Update zh-CN.js
2021-10-13 15:10:59 +08:00
wuwenjing
57a76e6129
remove alicloud/pop-core
keep simple
2021-10-13 14:41:59 +08:00
giacomo892
3fe3450533
Prioritize port passed from args
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 08:29:55 +02:00
Lukas
330cd6e058
Minor rehabilitanty impedyment
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 07:32:09 +02:00
wuwenjing
a2f2253221
Add aliyun sms notification
2021-10-13 11:55:01 +08:00
Louis Lam
1e5ce92917
Merge pull request #678 from wellart/master
...
add indonesian language
2021-10-13 11:23:21 +08:00
Louis Lam
0d7c2960b0
Merge pull request #683 from Saibamen/fix_markdown
...
Fix some of markdownlint warnings
2021-10-13 11:01:37 +08:00
Louis Lam
82343de972
Merge pull request #682 from Saibamen/patch-1
...
Fix build and tests
2021-10-13 10:54:30 +08:00
Adam Stachowicz
521d57c483
Fix some of markdownlint warnings
2021-10-13 02:01:34 +02:00
Adam Stachowicz
281671b938
Fix build
...
Add `cross-env` deleted in 11c3c636e0
2021-10-13 01:10:17 +02:00
Lukas
30d8aadf12
Slightly refactor
2021-10-12 23:24:34 +02:00
KangAlleW
2939bd4138
fix locale
2021-10-13 03:12:26 +07:00
KangAlleW
dcf15c3eb7
edit i18n.js
2021-10-13 02:58:09 +07:00
KangAlleW
7c9ed98408
rename id.js to id-ID.js
2021-10-13 02:57:36 +07:00
KangAlleW
4b9f0a3fe6
add indonesian language and edit settings.vue
2021-10-13 02:53:46 +07:00
KangAlleW
5b67fec084
add indonesian language
2021-10-13 02:46:11 +07:00
Louis Lam
407581ee07
move jest config files to config dir
2021-10-13 02:53:59 +08:00
Louis Lam
11c3c636e0
move dockerfile, docker-compose.yml to docker folder
2021-10-13 02:32:02 +08:00
Louis Lam
911d4ea37b
move vite.config.js to config folder
2021-10-13 02:27:25 +08:00
Louis Lam
4039c6549e
Merge remote-tracking branch 'origin/master'
2021-10-13 02:16:03 +08:00
giacomo892
d733ec018e
Prioritize host arg
...
Otherwise launching the program with the --host argument does nothing
2021-10-12 19:37:58 +02:00
Nelson Chan
03b07730d3
Fix: Increase default kept period
2021-10-12 23:28:21 +08:00
Louis Lam
dbc87d8ab3
Merge pull request #670 from dhfhfk/master
...
Update ko-KR.js
2021-10-12 22:27:27 +08:00
dhfhfk
05b691d4c9
Fix typo
2021-10-12 20:39:15 +09:00
Louis Lam
029d6412da
Merge pull request #669 from pemassi/patch-2
...
Update ko-KR.js
2021-10-12 18:27:11 +08:00
Louis Lam
9f12f95cce
Merge pull request #666 from Rohlik/patch-1
...
Fix length
2021-10-12 17:32:20 +08:00
Kyungyoon Kim
c1112a32df
Update ko-KR.js
2021-10-12 18:19:44 +09:00
Kyungyoon Kim
efc78acfeb
Update ko-KR.js
2021-10-12 18:17:13 +09:00
zsxeee
9e01959d15
Update zh-CN.js
2021-10-12 16:30:39 +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
Tomas Rohrer
5269dcec60
Fix length
...
In fact, it is 10 min demo :)
2021-10-12 10:21:03 +02:00