Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2022-08-02 19:08:46 +08:00
Louis Lam
bea8679788
Merge branch 'master' into issue-1861
2022-07-31 20:06:45 +08:00
Louis Lam
a0843745f9
Remove unused language key
2022-07-31 18:12:41 +08:00
Louis Lam
16d6885a88
Fix radio button and add description
2022-07-31 18:11:40 +08:00
MrEddX
96ec46765b
Update en.js
...
Just a typo.
2022-07-31 17:23:23 +08:00
0x01code
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>
2022-07-29 15:13:50 +08:00
c0derMo
1062e629c5
Fix linting issues
2022-07-24 12:50:43 +00:00
Moritz R
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
c0derMo
fb3b407577
Added a settings page & localization
2022-07-24 12:34:43 +00:00
Chongyi Zheng
6ce012c9a1
Add trust proxy checkbox in Settings page
2022-07-12 22:45:54 -04:00
Louis Lam
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2022-06-18 19:06:03 +08:00
Louis Lam
d65abe5b8c
Merge pull request #1777 from MarcHagen/change/move_translations_to_i18n
...
[change] Move i18n from Security to locale files
2022-06-18 17:17:06 +08:00
AnnAngela-work
012be23509
Update i18n
2022-06-16 21:20:12 +08:00
Marc Hagen
f7afe121e3
[change] Move i18n to locale files
2022-06-15 19:41:21 +02:00
Christopher Pickering
42848bcd2e
updated translations
2022-06-15 09:00:47 -05:00
Moritz R
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
Louis Lam
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2022-06-13 20:56:14 +08:00
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2022-06-11 20:59:58 +08:00
Nelson Chan
26ff6f45a0
Feat: Use i18n pluralization
2022-05-30 17:53:32 +08:00
Moritz R
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
Marc Hagen
5830f1e0b5
[feat] Adding PagerDuty notification
2022-05-25 14:10:31 +02:00
Louis Lam
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2022-05-25 14:59:14 +08:00
Moritz R
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
Nelson Chan
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
Christopher Pickering
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
AnnAngela-work
7dd5f5ea0d
Improve translation
2022-04-29 20:26:56 +08:00
AnnAngela-work
45da7c5431
Improve translation work
2022-04-29 20:17:15 +08:00
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
Nelson Chan
a391576285
Chore: Add translation
2022-04-20 15:09:31 +08:00
AnnAngela-work
18925293fb
Update en&zh-CN lang file with 1 new i18n entry
2022-04-19 10:48:20 +08:00
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2022-04-17 14:53:13 +08:00
Louis Lam
1bc01d1077
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
2022-04-17 13:21:41 +08:00
Louis Lam
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
2022-04-16 13:28:39 +08:00
Louis Lam
fb0064082e
Change Pushdeer to PushDeer
2022-04-14 14:34:30 +08:00
ngc7331
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 14:34:30 +08:00
ColdThunder11
4656ab3d57
Add OneBot notification service
2022-04-14 10:58:28 +08:00
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-13 21:24:04 +01:00
Matthew Nickson
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>
2022-04-13 21:02:19 +01:00
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
AnnAngela-work
5aa747a301
New translation
2022-04-12 20:41:25 +08:00
Louis Lam
4a6d7207ef
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
# src/languages/en.js
# src/pages/StatusPage.vue
2022-04-12 19:39:42 +08:00
AnnAngela-work
8e78e62eee
Make translation better
2022-04-04 17:24:22 +08:00
AnnAngela
706d6cee07
Update some components to use i18n function, update en & zh-CN translation
2022-04-04 11:33:02 +08:00
Moritz R
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
AnnAngela-work
19b7e2ba5e
Using grep to search $t("foo")-like pattern to fill up the missing part of en i18n file
2022-04-03 22:08:03 +08:00
Louis Lam
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
2022-04-01 14:57:35 +08:00
Louis Lam
37be7df9b0
[Status Page] Delete status page
2022-03-18 15:19:52 +08:00
Louis Lam
50d6e888c2
[new status page] wip
2022-03-10 21:34:30 +08:00
Louis Lam
ae14ad5a84
Add a word "Status Pages"
2022-03-09 22:14:07 +08:00
