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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
wuwenjing
|
57a76e6129
|
remove alicloud/pop-core keep simple
|
2021-10-13 14:41:59 +08: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 |
|