Commit graph

3860 commits

Author SHA1 Message Date
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
e223e826a3 linting 2021-10-11 01:02:54 +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
b5b391c73b
avoid default values for token verification
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640)
2021-10-10 22:13:18 +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
Louis Lam
ad0cde6554
Merge pull request #633 from dhfhfk/master
Update ko-KR
2021-10-11 01:04:32 +08:00
Louis Lam
25d18f0da3
Merge pull request #636 from DanielRTRD/add-norwegian-lang
Add Norwegian Language
2021-10-11 01:03:55 +08:00
RisedSky
e9445bb2e3
Merge pull request #1 from RisedSky/RisedSky-patch-FR-Lang
Update fr-FR.js (again)
2021-10-10 19:03:22 +02:00
RisedSky
ecc25ba596
Update fr-FR.js
Fixed wrong string
Also, "Primary Base URL" is missing from english file
2021-10-10 19:02:35 +02:00
LouisLam
e5286b0973 eslint for ko-KR.js 2021-10-11 00:52:46 +08:00
LouisLam
4e94cb9aad fix upload dist path 2021-10-11 00:51:18 +08:00
Daniel S. Billing
037fdd73a3 Norsk 2021-10-10 18:50:18 +02:00
Daniel S. Billing
bb9a936658 Translated some of the notifications services 2021-10-10 18:49:03 +02:00
Bert Verhelst
5445c2a2ff fix(monitor): revert unintentional change to comment 2021-10-10 18:41:29 +02:00
Bert Verhelst
dc08510e72 Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-10 18:40:53 +02:00
Daniel S. Billing
62805014df Update Settings.vue 2021-10-10 18:38:19 +02:00
Daniel S. Billing
c79e80442a Update i18n.js 2021-10-10 18:38:15 +02:00
Daniel S. Billing
f0ff96afd9 Create nb-NO.js 2021-10-10 18:31:17 +02:00
Louis Lam
8083368a81
Merge pull request #634 from RisedSky/patch-1
Update fr-FR.js
2021-10-10 23:58:09 +08:00
RisedSky
afb75e07d5
Update fr-FR.js
Fixed string (Device => Appareil in French)
2021-10-10 17:37:05 +02:00
RisedSky
efd3822930
Update fr-FR.js
All the lines corresponds to the English version (sorted correctly)
Plus, updated all the translated strings
2021-10-10 17:33:02 +02:00
dhfhfk
2adac64c83
Update ko-KR.js 2021-10-11 00:02:37 +09:00
Louis
cee225bcb2 no idea why npm prune --production suddenly not working, switch to npm ci --production 2021-10-10 17:55:31 +08:00
Louis
8958c21736 Merge remote-tracking branch 'origin/master' 2021-10-10 17:41:54 +08:00
Louis
2286f78f57 update to 1.8.0 2021-10-10 16:37:53 +08:00
Louis
d9eab90a69 Merge branch 'no-need-build'
# Conflicts:
#	.dockerignore
#	.gitignore
2021-10-10 16:34:13 +08:00
Louis Lam
4ba2025451
minor 2021-10-10 14:40:19 +08:00
LouisLam
272d4bde45 find promossms language key typo 2021-10-10 13:19:10 +08:00
LouisLam
0550ceb6d4 Merge remote-tracking branch 'origin/master' 2021-10-10 13:09:52 +08:00
LouisLam
82131f4dd2 merge conflict 2021-10-10 13:09:30 +08:00