Commit graph

1507 commits

Author SHA1 Message Date
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
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
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
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
Atlochowski a433de74e6
Update pl.js
small fix
2021-10-11 09:24:45 +02:00
LouisLam 8e3f43d60b Merge remote-tracking branch 'origin/master' 2021-10-11 13:28:42 +08:00
Louis Lam 2a1fd93444
Merge pull request #643 from andreasbrett/patch-3
translation fixes (german)
2021-10-11 12:55:25 +08:00
Andreas Brett dc1de50a02 fix for max-inclusive 2021-10-11 01:18:33 +02:00
Andreas Brett 0e6d7694ce
Update util.js 2021-10-10 23:54:45 +02:00
Andreas Brett 503d1f0a91
translation fixes 2021-10-10 23:20:56 +02:00
Andreas Brett 11bcd1e2ed
const 2021-10-10 22:55:32 +02:00
Andreas Brett 06310423f4
typo 2021-10-10 22:19:10 +02:00
Andreas Brett e127e168b6
typed parameters 2021-10-10 22:15:42 +02:00
Andreas Brett 075535ba46
Update util.ts 2021-10-10 21:59:23 +02:00
Andreas Brett 13cf6891ac
cryptographically strong secret generation
generate TOTP secret using WebCrypto API (see https://github.com/louislam/uptime-kuma/issues/640)
2021-10-10 21:58:23 +02:00