Louis Lam
|
20d59e5a13
|
fix and move the steam api key to settings page
|
3 years ago |
|
Louis Lam
|
ae31eb6ba9
|
Merge branch 'master' into Revyn112_master
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
|
3 years ago |
|
Louis Lam
|
df5efcc71c
|
Merge pull request #730 from sargonas/sargonas-patch-1
Update README.md
|
3 years ago |
J. Eckert
|
4cd66b20b1
|
Update README.md
additional spelling correction
|
3 years ago |
|
J. Eckert
|
1276102c18
|
Update README.md
minor grammatical edits for slight improvements. (Honestly though, your grammar is not that bad at all for not being a native speaker!)
|
3 years ago |
|
Louis Lam
|
6944b35ea7
|
Merge pull request #667 from zsxeee/i18n
Missing i18n and zh-CN translation
|
3 years ago |
|
Louis Lam
|
88757ebbbe
|
Merge pull request #722 from dpatrongomez/master
Add spanish translation for monitor history and records
|
3 years ago |
Daniel Patrón Gómez
|
0a73b84ae6
|
Add records translations and fix pause translation
|
3 years ago |
|
Daniel Patrón Gómez
|
15f36f96c3
|
Add spanish translation for monitor history
|
3 years ago |
|
Louis Lam
|
edcaf93446
|
Merge pull request #721 from dpatrongomez/master
Add Status Translation
|
3 years ago |
|
Louis Lam
|
dec175d55f
|
Merge pull request #719 from bertyhell/bugfix/edit-monitor
fix(edit-monitor): no need to escape placeholder {} if not translated
|
3 years ago |
|
Louis Lam
|
9a60f69f66
|
Merge pull request #720 from bertyhell/bugfix/fix-error-on-first-hearthbeat
fix(monitor): safely get status of previous beat if first beat
|
3 years ago |
|
Daniel Patrón Gómez
|
53a008ae2b
|
Add Status Translation
|
3 years ago |
Bert Verhelst
|
1d63dd9ddd
|
fix(monitor): safely get status of previous beat if first beat
|
3 years ago |
|
Bert Verhelst
|
61627545a5
|
fix(edit-monitor): no need to escape placeholder {} if not translated
|
3 years ago |
|
Louis Lam
|
176fa6b60d
|
merge package-lock.json
|
3 years ago |
|
Louis Lam
|
cb43ecb46e
|
Merge branch 'master' into background-jobs
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
|
3 years ago |
|
Louis Lam
|
2e24312f67
|
[test] jest please
|
3 years ago |
|
Louis Lam
|
6ff3cb275e
|
Merge pull request #642 from andreasbrett/patch-2
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
|
3 years ago |
|
Louis Lam
|
9d364b28b1
|
Merge pull request #715 from januridp/master
Fix(Language): Bahasa Indonesia (Indonesian)
|
3 years ago |
|
Louis Lam
|
bc3e3f9118
|
[test] update
|
3 years ago |
|
Louis Lam
|
0f3ab7b1d8
|
[test] increase the timeout for reset-password
|
3 years ago |
januridp
|
d94fbede32
|
Fix(Language): Bahasa Indonesia (Indonesian)
|
3 years ago |
|
januridp
|
76e619c066
|
Fix(Language): Bahasa Indonesia (Indonesian)
|
3 years ago |
|
januridp
|
4e4f94ab98
|
Fix(Language): Bahasa Indonesia (Indonesian)
|
3 years ago |
|
januridp
|
ed3a558397
|
Fix(Language): Bahasa Indonesia (Indonesian)
|
3 years ago |
|
Louis Lam
|
a419aa527f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
Louis Lam
|
4d26825cbe
|
[test] reset-password
|
3 years ago |
|
Louis Lam
|
7276f34d90
|
fix reset-password
|
3 years ago |
|
Louis Lam
|
e1eeb44e7f
|
Update SECURITY.md
|
3 years ago |
|
Louis Lam
|
f4b8da0a5c
|
Merge branch 'feature/add-support-for-method-body-and-headers'
|
3 years ago |
|
Louis Lam
|
4178983df3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
Louis Lam
|
7ac0ab2e34
|
[http options] beautify the json format when clicked the save button
|
3 years ago |
|
Louis Lam
|
cd211a6be7
|
[http options] fine tune
|
3 years ago |
|
Louis Lam
|
4e71ab7406
|
Merge branch 'master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
Louis Lam
|
76c68071f1
|
Merge pull request #709 from iooner/patch-1
Update fr-FR.js
|
3 years ago |
iooner
|
8242a1586d
|
Update fr-FR.js
|
3 years ago |
|
Louis Lam
|
c593a962c2
|
Merge pull request #627 from NixNotCastey/smtp-subject
Add support for custom subject in emails
|
3 years ago |
|
Louis Lam
|
c9b4d2ae2a
|
Merge pull request #698 from erktime/master
Add monitor name context to Slack fallback text.
|
3 years ago |
|
Louis Lam
|
37105d720b
|
Merge pull request #706 from firattemel/master
Update tr-TR.js
|
3 years ago |
|
Louis Lam
|
3b74b727f2
|
[Push Type] fix missing important flag and missing up notification
|
3 years ago |
firattemel
|
2f0119bc3f
|
Update tr-TR.js
|
3 years ago |
|
Louis Lam
|
a7d2a34dae
|
fix ping bug
|
3 years ago |
|
Louis Lam
|
60acb91fc8
|
Merge pull request #687 from xjoker/master
Add new notification `Aliyun Sms` and `DingDing`
|
3 years ago |
|
Louis Lam
|
f51156f18e
|
run eslint for #687
|
3 years ago |
|
Louis Lam
|
8338881927
|
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
|
3 years ago |
|
Louis Lam
|
674b387c95
|
Merge branch 'master' into smtp-subject
|
3 years ago |
|
Louis Lam
|
5ff9a64e5e
|
[Push Type] Fix missing duration calculation (#685)
|
3 years ago |
|
Louis Lam
|
4bee57ea7f
|
Merge remote-tracking branch 'giacomo892/patch-1'
# Conflicts:
# server/ping-lite.js
|
3 years ago |
|
Louis Lam
|
f75c9e4f0c
|
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
|
3 years ago |
