Abdulrahman Mustafa
1197f881a1
Checked with eslint, with no errors
2023-01-22 21:31:02 +00:00
Faruk Genç
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-20 12:27:28 +03:00
Abdulrahman Mustafa
316599210d
Arabic language support is now in action ✌️
2023-01-18 19:03:04 +00:00
Matthew Nickson
86bcb85e9b
Perform sanity check on uptime for status page
...
Fixes #2628
A sanity check is performed when calculating the uptime of a monitor on
status page. If it is greater than 100%, we just show 100%. This hasn't
been implemented on the dashboard at the request of @louislam due to
concerns it would make debugging more difficult in future if changes
were made to the uptime calculation.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-18 16:38:55 +00:00
Louis Lam
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2023-01-17 21:17:04 +08:00
Louis Lam
a5ff27da7a
Drop the property monitor.maintenance, use lastHeartBeat.status to check status instead
2023-01-17 17:34:47 +08:00
Louis Lam
7bb12a7e00
Fix #2608
2023-01-17 17:25:35 +08:00
Louis Lam
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
...
Fix: Allow long sms in PromoSMS
2023-01-16 13:21:56 +08:00
Louis Lam
b073ec2287
Add Help button which links to wiki
2023-01-16 12:39:24 +08:00
Louis Lam
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-15 20:14:11 +08:00
Louis Lam
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
...
Added missing JSDoc comments
2023-01-15 13:10:17 +08:00
401Unauthorized
8128c8081b
sync language file changes
2023-01-15 10:50:52 +08:00
401Unauthorized
e99652c5a2
sync language file changes
2023-01-15 10:46:29 +08:00
401Unauthorized
ceb7d48118
add convert script
2023-01-15 10:46:29 +08:00
401Unauthorized
bfa32f6b07
comment not allowed in json file
2023-01-15 10:46:29 +08:00
401Unauthorized
ae3a543b3b
convert language files to json format
2023-01-15 10:46:29 +08:00
Louis Lam
e48a987b9c
Merge remote-tracking branch 'origin/master' into mongodb-ping
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
# src/pages/EditMonitor.vue
2023-01-15 01:13:11 +08:00
Faruk Genç
cf21aa3737
Fix lint
2023-01-14 16:51:07 +03:00
Faruk Genç
9890a0754b
Fix lint
2023-01-14 16:48:26 +03:00
Faruk Genç
15c64d458b
Fix lint
2023-01-14 16:48:12 +03:00
Faruk Genç
be850dd596
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/languages/en.js
2023-01-14 16:40:13 +03:00
Faruk Genç
3adc9e65d6
Add only xml support to http monitors
2023-01-14 16:33:21 +03:00
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2023-01-14 20:16:53 +08:00
Louis Lam
973d5692d0
Merge pull request #2604 from black23/patch-1
...
Update cs-CZ.js
2023-01-14 13:04:41 +08:00
Louis Lam
f7d41a30fa
Update src/components/TagEditDialog.vue
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-13 23:15:41 +08:00
black23
0ef686ac2f
Update cs-CZ.js
...
new string
2023-01-13 14:52:03 +01:00
long2ice
db757123ba
refactor: reuse databaseConnectionString
2023-01-13 16:32:49 +08:00
shyneko
e427c70fef
Translate fixes
2023-01-12 16:00:02 +02:00
shyneko
27e0b1eea1
Remove required attribute for optional field
2023-01-12 15:52:50 +02:00
Nelson Chan
9c1ba97e7d
Chore: Fix typo
2023-01-12 21:25:33 +08:00
Nelson Chan
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2023-01-12 21:25:33 +08:00
shyneko
521356e38a
LINT fixes
2023-01-12 15:21:56 +02:00
shyneko
b91fe9d96d
Added a more telegram options
...
such as thread id, silent notifications and forward protect
2023-01-12 15:09:05 +02:00
Louis Lam
98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
...
Add Splunk Notification Provider
2023-01-12 14:15:36 +08:00
Łukasz Szczepański
ec30147a7f
Add option for allowing long sms in PromoSMS
2023-01-11 14:32:57 +01:00
Luke
2172112144
Setting for allowing long sms
2023-01-11 12:13:47 +01:00
twiggotronix
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2023-01-11 10:34:24 +01:00
DimitriDR
890e3abf58
Updating French localization
...
Signed-off-by: DimitriDR <dimitridroeck@gmail.com>
2023-01-09 21:09:57 +01:00
Matthew Nickson
6e50784b6b
Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer
2023-01-09 20:03:11 +00:00
Joseph Irving
33355c51b7
Add Splunk Notifications
2023-01-09 13:33:10 +00:00
Louis Lam
439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
...
Fixed negative retention time values
2023-01-09 13:08:35 +08:00
Matthew Nickson
80f2d6e2a7
Added markdown support for maintenance
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:54:16 +00:00
Matthew Nickson
852a088529
Added mardown support for incident
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:46:18 +00:00
Matthew Nickson
6bc0bd84af
Allowed markdown in footer of status page
...
Markdown support has been added using the marked module. To secure
against XSS attacks, DOMPurify is used to sanitize the generated HTML
before it is loaded on the page.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:39:27 +00:00
Matthew Nickson
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 19:09:06 +00:00
Adam Spurgeon
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
Louis Lam
d596f8f7eb
Merge pull request #2560 from DimitriDR/master
...
Adding translations for Kook & ZohoCliq
2023-01-08 14:03:35 +08:00
DimitriDR
e8e4361e09
Adding translations for Kook & ZohoCliq
2023-01-07 13:10:25 +01:00
Matthew Nickson
d6c91869af
Reverted changes to en.js
...
Some changes were carried over in the merge
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:15:16 +00:00
Matthew Nickson
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:09:40 +00:00
