3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2 years ago
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2 years ago
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
...
feat: added Home Assistant notification integration
2 years ago
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
bea8679788
Merge branch 'master' into issue-1861
2 years ago
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2 years ago
a0843745f9
Remove unused language key
2 years ago
16d6885a88
Fix radio button and add description
2 years ago
96ec46765b
Update en.js
...
Just a typo.
2 years ago
4575f31094
Add support for line notify providers ( #1781 )
...
* add line notify support
* add way to get line notify
* Fix duplicate key 'HTTP Basic Auth'
* Revert language files changes
* Revert language files changes
* Fix general message
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
1062e629c5
Fix linting issues
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
fb3b407577
Added a settings page & localization
2 years ago
6ce012c9a1
Add trust proxy checkbox in Settings page
2 years ago
f84ae82983
feat: added Home Assistant notification integration
2 years ago
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2 years ago
d65abe5b8c
Merge pull request #1777 from MarcHagen/change/move_translations_to_i18n
...
[change] Move i18n from Security to locale files
2 years ago
012be23509
Update i18n
2 years ago
f7afe121e3
[change] Move i18n to locale files
2 years ago
42848bcd2e
updated translations
2 years ago
ac449ec1c2
Merge branch 'master' into master
2 years ago
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2 years ago
817c941489
Add Bark Notification Parameters
2 years ago
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2 years ago
26ff6f45a0
Feat: Use i18n pluralization
2 years ago
e9e78c26e5
Merge branch 'master' into master
2 years ago
5830f1e0b5
[feat] Adding PagerDuty notification
2 years ago
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2 years ago
a9f3142cee
Merge branch 'master' into master
2 years ago
b7ba6330db
Feat: Add cert exp. settings
2 years ago
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2 years ago
87f933df4f
added sqlserver monitor
2 years ago
398ecb7666
add radius check
2 years ago
7dd5f5ea0d
Improve translation
2 years ago
45da7c5431
Improve translation work
2 years ago
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2 years ago
a391576285
Chore: Add translation
2 years ago
18925293fb
Update en&zh-CN lang file with 1 new i18n entry
2 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2 years ago
1bc01d1077
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
2 years ago
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2 years ago
fb0064082e
Change Pushdeer to PushDeer
2 years ago
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
4656ab3d57
Add OneBot notification service
2 years ago
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2 years ago
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
361e44ad6a
Merge branch 'louislam:master' into master
2 years ago
5aa747a301
New translation
2 years ago
4a6d7207ef
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
# src/languages/en.js
# src/pages/StatusPage.vue
2 years ago
Louis Lam
rmt/src
MrEddX
0x01code
c0derMo
Moritz R
Chongyi Zheng
AnnAngela-work
Marc Hagen
Christopher Pickering
Super Manito
Nelson Chan
Sascha Kruse
Christopher Pickering
Matthew Nickson
ngc7331
ColdThunder11