ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-31 03:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
1929 commits 31 branches 115 tags 54 MiB
Commit graph

930 commits

Author SHA1 Message Date
Andreas Brett
3f3d8b4eb3 fixes 2021-10-26 12:58:04 +02:00
Louis Lam
77addfebc8 Merge branch 'tarun7singh_master' 
# Conflicts:
#	src/languages/vi.js
 2021-10-26 16:26:59 +08:00
Louis Lam
16846c7c6d
Merge pull request #790 from Saibamen/pl_update+fixes 
PL update + fixes
 2021-10-26 16:25:04 +08:00
Louis Lam
d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification 
Support for Bark (APN) notifications
 2021-10-26 16:23:11 +08:00
Louis Lam
78424b4f2d add simple loading chart effect 2021-10-26 12:48:21 +08:00
Louis Lam
f8055ed03d minor css 2021-10-26 12:33:46 +08:00
Louis Lam
fe4724fc53 Merge branch 'master' into feat/chart-period 2021-10-26 12:25:07 +08:00
Lakr Aream
43791ee97e Merge branch 'master' into dev-lakr233-bark_notification 2021-10-26 09:08:11 +08:00
Tarun Singh
6362ef6a9c removed other langauge translation data 2021-10-25 18:30:40 -04:00
Adam Stachowicz
9d3a4e9d1e Remove dot from needPushEvery 2021-10-26 00:00:54 +02:00
Tarun Singh
ba1e025353 added click send to number 2021-10-25 04:11:57 -04:00
Andreas Brett
4fc2603818 Merge branch 'patch-6' of https://github.com/andreasbrett/uptime-kuma into patch-6 2021-10-25 01:34:06 +02:00
Andreas Brett
7bc38d4231 remove unused vars 2021-10-25 01:33:45 +02:00
Andreas Brett
daad63d70b
Merge branch 'master' into patch-6 2021-10-25 01:24:31 +02:00
Andreas Brett
9ddd2c7365 use jwt 2021-10-25 01:23:02 +02:00
Adam Stachowicz
fa5ba12e14 Missing this 2021-10-24 22:15:02 +02:00
Adam Stachowicz
85053f865e Fix typo 2021-10-24 21:56:37 +02:00
Adam Stachowicz
1239f6d1a2 PL update + fixes 2021-10-24 21:50:02 +02:00
Tarun Singh
fed611d1b9 Merge branch 'master' of https://github.com/louislam/uptime-kuma 2021-10-24 15:19:25 -04:00
Tarun Singh
bc68088350 Click send sms integration for notifications 2021-10-24 15:17:29 -04:00
Louis Lam
90200958cd
Merge pull request #780 from kry008/patch-4 
Update pl.js
 2021-10-25 00:35:31 +08:00
Ponkhy
d82f305f6e Updated german language file 2021-10-24 17:56:05 +02:00
Nelson Chan
665bae0806 UI: Simplify dropdown design 2021-10-24 01:45:57 +08:00
Nelson Chan
e4be28a9e7 Fix: Validate beat time before appending 2021-10-24 01:45:38 +08:00
Nelson Chan
445674aacb Chore: Improve code formatting & comments 2021-10-24 01:45:10 +08:00
Nelson Chan
2f7b60f5e5 Feat: Use separate storage for custom chart period 
Fix: Fix import error
 2021-10-24 01:44:55 +08:00
Nelson Chan
b83c59e308 WIP: Add options for chart period 
Fix: Fix callback, add toast on error

Fix: Improve styling

Fix: Restore default chart behavior

Fix: Replace 1h with 3h

draft only
 2021-10-24 01:44:08 +08:00
Lakr Aream
ce852dfa02 Support for Bark (APN) notifications 
Update bark.js
 2021-10-24 00:31:43 +08:00
Louis Lam
c9549c0de2 change body and header placeholders, less misleading. 2021-10-23 22:14:05 +08:00
kry008
b5eb17ed93
Update pl.js 2021-10-23 15:07:24 +02:00
Andreas Brett
4becb97a5d
Update en.js 2021-10-23 01:54:36 +02:00
Andreas Brett
85e2b36424
Update en.js 2021-10-23 01:54:07 +02:00
Andreas Brett
abdf1ae90a
Update en.js 2021-10-23 01:53:31 +02:00
Andreas Brett
606c967985
Merge branch 'master' into patch-6 2021-10-23 01:52:54 +02:00
Andreas Brett
9ad8e5f56a show logged in user 2021-10-22 13:05:52 +02:00
Louis Lam
8a481a1be0
Merge pull request #769 from andreasbrett/patch-5 
show beat.msg only if available
 2021-10-22 18:14:52 +08:00
Andreas Brett
657987a013 fix: show beat.msg only if available 2021-10-22 11:59:53 +02:00
Louis Lam
d74577608b
Merge pull request #766 from DX37/translation-ru 
Update notifications area in ru-RU.js
 2021-10-22 14:10:15 +08:00
Phuong Nguyen Minh
060dde9827
Merge branch 'louislam:master' into master 2021-10-22 08:08:22 +07:00
DX37
1d1601cf24
Update notifications area in ru-RU.js 2021-10-21 22:49:17 +07:00
DX37
29e4e41215
Update ru-RU.js 2021-10-20 23:00:29 +07:00
MrEddX
6463d4b209
Fix: Integration Link Text 
Maybe left there from the Slack template.
 2021-10-20 09:09:08 +03:00
MrEddX
d0b0c64b81
Update bg-BG.js 
- Fixed existing fields
- Added new fields
- Translated new fields
 2021-10-19 23:03:46 +03:00
Daniel Patrón Gómez
5a05d135b8
Add steam translation in spanish 2021-10-19 17:11:32 +02:00
Louis Lam
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges 
Text update
 2021-10-19 16:34:00 +08:00
Andreas Brett
7def9dcec7
Merge branch 'louislam:master' into patch-1 2021-10-19 00:37:15 +02:00
NeuralMiner
a35569481d Updates 2021-10-18 15:26:38 -06:00
NeuralMiner
572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges 2021-10-18 12:57:28 -06:00
Louis Lam
182597944d fix #721 2021-10-19 00:19:26 +08:00
Lukas
f74b2662c5 Fixed values for sms type 2021-10-18 12:02:54 +02:00
Louis Lam
300a95d779 recompile util.js with tsconfig.json 2021-10-18 17:51:40 +08:00
Louis Lam
16b44001e7 Merge remote-tracking branch 'andreasbrett/patch-1' into andreasbrett_patch-1 
# Conflicts:
#	src/util.js
 2021-10-18 17:35:17 +08:00
Louis Lam
f2f8f33b86 Merge branch 'master' into andreasbrett_patch-1 
# Conflicts:
#	src/util.js
 2021-10-18 17:30:21 +08:00
Louis Lam
20d59e5a13 fix and move the steam api key to settings page 2021-10-18 17:02:05 +08:00
Louis Lam
ae31eb6ba9 Merge branch 'master' into Revyn112_master 
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2021-10-18 15:50:35 +08:00
Andreas Brett
df4682d19b
Merge branch 'master' into patch-1 2021-10-18 01:14:58 +02:00
Andreas Brett
11a1f35cc5 independent csprng solution 2021-10-18 01:06:20 +02:00
Louis Lam
6944b35ea7
Merge pull request #667 from zsxeee/i18n 
Missing i18n and zh-CN translation
 2021-10-16 22:47:58 +08:00
Daniel Patrón Gómez
0a73b84ae6 Add records translations and fix pause translation 2021-10-16 12:45:41 +02:00
Daniel Patrón Gómez
15f36f96c3 Add spanish translation for monitor history 2021-10-16 12:15:39 +02:00
Louis Lam
edcaf93446
Merge pull request #721 from dpatrongomez/master 
Add Status Translation
 2021-10-16 17:41:46 +08:00
Daniel Patrón Gómez
53a008ae2b Add Status Translation 2021-10-16 11:32:15 +02:00
Bert Verhelst
61627545a5 fix(edit-monitor): no need to escape placeholder {} if not translated 2021-10-16 11:26:32 +02:00
Louis Lam
cb43ecb46e Merge branch 'master' into background-jobs 
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
 2021-10-16 15:06:59 +08:00
NeuralMiner
8cb26d2b31 Text update 2021-10-15 19:12:09 -06:00
januridp
d94fbede32 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:39:32 +07:00
januridp
76e619c066 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:36:07 +07:00
januridp
4e4f94ab98 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:29:51 +07:00
januridp
ed3a558397 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:15:01 +07:00
Louis Lam
f4b8da0a5c Merge branch 'feature/add-support-for-method-body-and-headers' 2021-10-15 19:02:49 +08:00
Louis Lam
4178983df3 Merge remote-tracking branch 'origin/master' 2021-10-15 19:01:04 +08:00
Louis Lam
7ac0ab2e34 [http options] beautify the json format when clicked the save button 2021-10-15 18:57:27 +08:00
Louis Lam
cd211a6be7 [http options] fine tune 2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-15 16:07:05 +08:00
Phuong Nguyen Minh
bda481c61e
Update vi.js 2021-10-15 08:26:33 +07:00
iooner
8242a1586d
Update fr-FR.js 2021-10-14 22:23:01 +02:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject 
Add support for custom subject in emails
 2021-10-15 00:54:31 +08:00
Louis Lam
37105d720b
Merge pull request #706 from firattemel/master 
Update tr-TR.js
 2021-10-14 22:40:45 +08:00
Louis Lam
3b74b727f2 [Push Type] fix missing important flag and missing up notification 2021-10-14 22:32:15 +08:00
firattemel
2f0119bc3f Update tr-TR.js 2021-10-14 17:29:13 +03:00
Louis Lam
60acb91fc8
Merge pull request #687 from xjoker/master 
Add new notification `Aliyun Sms` and `DingDing`
 2021-10-14 17:02:23 +08:00
Louis Lam
f51156f18e run eslint for #687 2021-10-14 16:24:03 +08:00
Louis Lam
8338881927 [SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements 2021-10-14 16:07:25 +08:00
Louis Lam
674b387c95 Merge branch 'master' into smtp-subject 2021-10-14 14:59:54 +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
Lukas
89b34b5748 Use double curly brackets and sanity check for customSubject 2021-10-13 18:05:18 +02:00
Andreas Brett
86dcc9bc8f import webcrypto lib 2021-10-13 17:34:56 +02:00
Louis Lam
79c81395bc Merge branch 'master' into andreasbrett_patch-1 2021-10-13 22:02:27 +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
Phuong Nguyen Minh
89c0f8b734
Update i18n.js 2021-10-13 13:44:31 +07:00
wuwenjing
57a76e6129 remove alicloud/pop-core keep simple 2021-10-13 14:41:59 +08:00
Phuong Nguyen Minh
dc805cff97
Add files via upload 2021-10-13 13:36:09 +07:00
wuwenjing
a2f2253221 Add aliyun sms notification 2021-10-13 11:55:01 +08: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
Nelson Chan
03b07730d3 Fix: Increase default kept period 2021-10-12 23:28:21 +08:00
dhfhfk
05b691d4c9
Fix typo 2021-10-12 20:39:15 +09: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
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
Atlochowski
69ffee55dd
Update pl.js 2021-10-11 14:33:00 +02:00
Atlochowski
ebf0671fef
Update pl.js 2021-10-11 13:45:25 +02: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
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
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
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
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
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
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
LouisLam
272d4bde45 find promossms language key typo 2021-10-10 13:19:10 +08:00
Louis Lam
0c88e4b2f6
Merge pull request #629 from NixNotCastey/pl-update 
Polish translation update
 2021-10-10 12:45:26 +08:00
Louis Lam
5c6230da58
Merge pull request #630 from xinac721/master 
Update Simplified Chinese Language（更新简体中文语言）
 2021-10-10 12:43:17 +08:00
新逸Cary
54f864a1bb Update Simplified Chinese Language（更新简体中文语言） 2021-10-10 10:04:07 +08:00
Lukas
d6f7be9112 Translated all missing texts and updated few of previously translated. 2021-10-10 00:38:19 +02:00
Lukas
792f3c7c5c Add support for values of Name, Hostname and Status 2021-10-09 21:48:28 +02:00
Bert Verhelst
8a739af5ad Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-09 21:44:22 +02:00
Lukas
edb75808d8
Merge branch 'louislam:master' into smtp-subject 2021-10-09 20:37:12 +02:00
Lukas
5e3ea3293c Very basic email subject customization 2021-10-09 20:32:45 +02:00
Louis Lam
1f7f20526f
Merge pull request #620 from MrEddX/bulgarian 
Update bg-BG.js
 2021-10-10 01:12:38 +08:00
Robin Schneider
6fe014fa5e
Fixed spelling for german language support 
Fixed spelling for german language support, hacktoberfest-accepted label woul be appreciated.
 2021-10-09 18:05:52 +02:00
Nelson Chan
6cf2eb036d Fix: Improve settings layout and wording 2021-10-09 23:51:05 +08:00
MrEddX
9d7def93a5
Update bg-BG.js 2021-10-09 18:44:12 +03:00