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 |
|
Nelson Chan
|
dca5a59dbc
|
Feat: Implement data clearing logic & frontend
|
2021-10-09 23:33:47 +08:00 |
|
Kyungyoon Kim
|
2e95e2016d
|
Translate to Korean
|
2021-10-09 05:25:49 -06:00 |
|
LouisLam
|
cac0a46bac
|
fix error if tls info object is in old format
|
2021-10-09 19:08:38 +08:00 |
|
Bert Verhelst
|
d71d27220b
|
fix(edit-monitor): store headers as JSON
|
2021-10-09 12:42:32 +02:00 |
|
Bert Verhelst
|
b8093e909b
|
fix(edit-monitor): fix minification of translations containing { }
|
2021-10-09 11:38:12 +02:00 |
|
Bert Verhelst
|
c3c273f9df
|
fix(edit-monitor): fix regex to allow a single header
|
2021-10-09 11:20:33 +02:00 |
|
Bert Verhelst
|
daab2a05f5
|
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
|
2021-10-09 11:13:16 +02:00 |
|
Daniel Patrón Gómez
|
d7eac1a413
|
Update es-ES.js
|
2021-10-08 23:48:37 +02:00 |
|
LouisLam
|
5ce09953e2
|
use Segoe UI font for Windows among all languages
|
2021-10-08 20:15:54 +08:00 |
|
LouisLam
|
fc8d1e78b6
|
[push type] hide upside down mode, apply primary base url
|
2021-10-08 20:03:52 +08:00 |
|
Louis Lam
|
efb3f2b19c
|
Merge pull request #605 from NixNotCastey/promosms
Add PromoSMS as notification provider
|
2021-10-08 18:19:06 +08:00 |
|
LouisLam
|
11abc1f1e0
|
[test] add test for i18n currentLocale
|
2021-10-08 13:35:04 +08:00 |
|
LouisLam
|
288e87bb3d
|
Merge branch 'master' into status-page-default-locale
|
2021-10-08 12:12:29 +08:00 |
|
LouisLam
|
8ae79ab9bf
|
improve #560
|
2021-10-08 10:51:03 +08:00 |
|
Lukas
|
12b5489eb5
|
PromoSMS as Notification Provider
Add PromoSMS (Polish SMS Gateway) as new notification provider
|
2021-10-07 21:56:32 +02:00 |
|
LouisLam
|
ddad2dcb4a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/languages/en.js
|
2021-10-08 01:40:34 +08:00 |
|
LouisLam
|
e96121f69a
|
fix merging mistake
|
2021-10-08 01:39:14 +08:00 |
|
LouisLam
|
5b4af550fb
|
Merge branch 'master' into DeeJayPee_master
|
2021-10-08 01:27:06 +08:00 |
|
LouisLam
|
0fcb310b97
|
Merge remote-tracking branch 'Empty2k12/feature/matrix-notifications' into feature/matrix-notifications
# Conflicts:
# src/languages/en.js
|
2021-10-08 01:13:09 +08:00 |
|
LouisLam
|
2ce5c28ed4
|
Merge branch 'master' into feature/matrix-notifications
# Conflicts:
# src/languages/en.js
|
2021-10-08 00:59:39 +08:00 |
|
Bert Verhelst
|
ec4b7e4064
|
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
|
2021-10-07 18:22:59 +02:00 |
|
Kevin Petit
|
5b758a4e98
|
Better locale default for status page.
|
2021-10-07 18:07:24 +02:00 |
|
LouisLam
|
adfe640f42
|
show fewer beat on mobile
|
2021-10-07 22:53:13 +08:00 |
|
LouisLam
|
9f1e7b0a88
|
Revert "fix(heartbeat-bar): cleanup css styling and minor syntax issues"
This reverts commit 3d6c8b7f
|
2021-10-07 21:47:11 +08:00 |
|
LouisLam
|
cdf81a36d3
|
fix broken animation caused by #521
|
2021-10-07 21:42:36 +08:00 |
|
LouisLam
|
2c19aef4dc
|
minor
|
2021-10-07 18:06:43 +08:00 |
|
LouisLam
|
e5f6d7f047
|
slack and rocket.chat use the primary base url
env var to show time logger
|
2021-10-07 17:39:58 +08:00 |
|
LouisLam
|
d08a71ab49
|
Set primary base url in settings page
|
2021-10-07 16:30:16 +08:00 |
|
LouisLam
|
ed67803af8
|
improve minor style
|
2021-10-07 16:10:21 +08:00 |
|
Louis Lam
|
5eb3c6b194
|
Merge branch 'master' into bulgarian
|
2021-10-07 15:12:53 +08:00 |
|
LouisLam
|
8233f3b875
|
try to standardize the language name list
|
2021-10-07 15:06:16 +08:00 |
|
Bert Verhelst
|
8be4bf0e16
|
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
|
2021-10-07 08:56:29 +02:00 |
|
LouisLam
|
cccf393ee5
|
update zh-HK.js
|
2021-10-07 14:55:32 +08:00 |
|
MrEddX
|
9f5bf37a96
|
Update Settings.vue
|
2021-10-07 09:37:13 +03:00 |
|
MrEddX
|
1eb3f63a82
|
Update bg-BG.js
|
2021-10-07 09:27:05 +03:00 |
|
Louis Lam
|
8c63536eb8
|
Merge pull request #451 from zsxeee/notification_form_i18n
Notification form i18n
|
2021-10-07 14:13:08 +08:00 |
|
MrEddX
|
0c6b434d79
|
Moved Bulgarian to the Cyrillic family languages
|
2021-10-07 08:00:53 +03:00 |
|
Louis Lam
|
b5bd92ce78
|
Merge pull request #578 from jtagcat/et5
l10n: update et
|
2021-10-07 11:31:02 +08:00 |
|
Bert Verhelst
|
162ef04c41
|
Merge branch 'master' into feature/add-support-for-method-body-and-headers
|
2021-10-06 21:56:28 +02:00 |
|
Nelson Chan
|
a87595a849
|
Fix: Allow underscore in hostname
|
2021-10-07 03:29:42 +08:00 |
|
jtagcat
|
7626e1f2e4
|
l10n: update et
|
2021-10-06 21:02:34 +03:00 |
|
zsxeee
|
7f1edb49bc
|
Fix i18n
Upgrade vue-i18n to 9.1.9.
Fix wrong tag name.
|
2021-10-07 00:04:13 +08:00 |
|
Gero Gerke
|
d184733af9
|
update text
|
2021-10-06 13:44:36 +02:00 |
|
Gero Gerke
|
704d63b49f
|
Merge branch 'master' into feature/matrix-notifications
|
2021-10-06 13:36:28 +02:00 |
|
zsxeee
|
54d2fbcc02
|
Fix i18n
Prevent use esm-bundler build vue-i18n
Escape keyword: '@'
|
2021-10-06 18:21:31 +08:00 |
|
Gero Gerke
|
fbd4d54812
|
Update src/components/notifications/Matrix.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2021-10-06 10:55:21 +02:00 |
|
LouisLam
|
c8706b9aa1
|
Merge branch 'master' into notification_form_i18n
# Conflicts:
# src/components/notifications/SMTP.vue
# src/languages/en.js
|
2021-10-06 16:48:14 +08:00 |
|
Louis Lam
|
52102d72a0
|
Merge pull request #572 from Brainpitcher/patch-1
Update ru-RU.js
|
2021-10-06 15:28:29 +08:00 |
|
Louis Lam
|
8ea7a693a1
|
Merge pull request #499 from Saibamen/fix_pl_i18n
Fix Polish language, add missing `Status Page` i18n
|
2021-10-06 13:29:02 +08:00 |
|
Brainpitcher
|
7a8b6a03e0
|
Update ru-RU.js
"Cert Exp.": "Сертификат истекает" now it sounds in russian
|
2021-10-06 09:49:44 +05:00 |
|
Gero Gerke
|
6bebc623f9
|
UI polish
|
2021-10-05 21:59:58 +02:00 |
|