Commit graph

1514 commits

Author SHA1 Message Date
Louis Lam 674b387c95 Merge branch 'master' into smtp-subject 2021-10-14 14:59:54 +08:00
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
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 2ff7c4de5d [test] genSecret 2021-10-13 22:16:46 +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
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
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
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
Tomas Rohrer 5269dcec60
Fix length
In fact, it is 10 min demo :)
2021-10-12 10:21:03 +02:00
Louis Lam 18c5a16783
Update README.md 2021-10-12 11:15:02 +08:00
Louis Lam b7528b9a4e
Merge pull request #657 from thomasleveil/patch-2
[i18n] minor fixes to french translations
2021-10-12 02:17:53 +08:00
Thomas LÉVEIL 9c058054b9 [i18n] minor update to french translations 2021-10-11 19:55:02 +02:00
Louis Lam c6683e2a9b
Merge pull request #648 from atlochowski/patch-1
Update pl.js
2021-10-12 00:04:33 +08:00
Louis Lam b558708be2
Merge pull request #650 from xjoker/master
Add Feishu as notification provider
2021-10-12 00:02:29 +08:00
Louis Lam fd0dd2d284
Merge pull request #652 from GhostSlayer/patch-1
Create PM2 Config file
2021-10-11 23:50:37 +08:00
xJoker 1bc77a06e5
Update server/notification-providers/feishu.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-11 20:38:32 +08:00
xJoker 69c623ac2b
Update server/notification-providers/feishu.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-11 20:38:19 +08:00
Atlochowski 69ffee55dd
Update pl.js 2021-10-11 14:33:00 +02:00
Slayer d769c4426c
Create PM2 Config file
I don't know if this is a good idea, but users that prefer to use PM2 instead, they can run `pm2 start` instead of `pm2 start server/server.js --name uptime-kuma` with this configuration
2021-10-11 15:22:52 +03:00
Atlochowski ebf0671fef
Update pl.js 2021-10-11 13:45:25 +02:00
Louis Lam 97af09fd50
Update README.md 2021-10-11 19:41:56 +08:00
Louis Lam 5b19e3f025
Update README.md 2021-10-11 19:40:51 +08:00
wuwenjing ce2df137e6 change text to using variable msg 2021-10-11 17:53:13 +08:00
wuwenjing 6d9b71c054 Add Feishu notification 2021-10-11 17:20:09 +08:00