Commit graph

2804 commits

Author SHA1 Message Date
Jordan Bertasso 288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url 2022-04-15 14:13:44 +10:00
Nelson Chan 6f99d7577b Fix: Limit saved period & clear when set to recent 2022-04-15 03:24:58 +08:00
Nelson Chan 1417b6eacf Feat: Save and restore chart period 2022-04-15 02:56:21 +08:00
MrEddX 1baee42cf5
Merge branch 'louislam:master' into bulgarian 2022-04-14 10:55:04 +03: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
ngc7331 fb059f5e91 Add support for Pushdeer notifications 2022-04-14 14:34:30 +08:00
PhyxionNL 2e3414135f Update src/components/PingChart.vue
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 12:27:38 +08:00
PhyxionNL e44699216e Fix readability of chart hover 2022-04-14 12:27:38 +08:00
DX37 fd8cba1dad nudge nodemailer strings; translate new ones 2022-04-14 11:10:24 +08:00
sovushik 03dd02fd38 Update ru-RU.js
Add RU for 1.14 version
2022-04-14 11:04:46 +08:00
Louis Lam d0b5f147e2 Fix spelling and merge mistake 2022-04-14 10:58:28 +08:00
Louis Lam ddf8a7a692 Fix camelCase 2022-04-14 10:58:28 +08:00
ColdThunder11 bd9df09f87 Apply suggestions from code review, fix style
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-14 10:58:28 +08:00
ColdThunder11 4656ab3d57 Add OneBot notification service 2022-04-14 10:58:28 +08:00
Louis Lam 0a5db0cecb Fix #1478 2022-04-14 10:12:31 +08:00
MrEddX 60b44c2cdd Update bg-BG.js
Fixed translation.
2022-04-14 09:46:43 +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
MrEddX 16b61dba27
Merge branch 'louislam:master' into bulgarian 2022-04-13 21:59:53 +03:00
Louis Lam 2b0c184a88 Update package-lock 2022-04-14 01:21:43 +08:00
Louis Lam 2642e70fc8 Fix auto test failed due to autocrlf 2022-04-14 01:20:54 +08:00
Louis Lam 8d0446dc38 Add lint as part of test 2022-04-14 01:20:54 +08:00
Louis Lam 3436e26ed4 Fix styleline, fix css format issues globally 2022-04-14 01:20:54 +08:00
Louis Lam 649f3106e1 Enforce semicolon, fix format globally 2022-04-14 01:20:54 +08:00
Louis Lam 6f72ca481f
Merge pull request #1479 from AnnAngela/1.14.0_translation
New translation for zh-CN
2022-04-14 00:05:07 +08:00
Louis Lam 670ea415b2
Merge pull request #1488 from c0derMo/update-german-translation
updating german translation
2022-04-14 00:03:53 +08:00
Louis Lam 17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
introduce consistent logging
2022-04-13 23:47:08 +08:00
Louis Lam e9ce1433cd Change log_info to log.info by making it into an object 2022-04-13 23:33:37 +08:00
c0derMo f5d006add8 updating german translation 2022-04-13 14:45:41 +00:00
Louis Lam 4df147786d
Merge pull request #1483 from Alexandre-Gliganic/master
Add automatic restart for docker-compose.yml
2022-04-12 22:39:29 +08:00
Alexandre Gliganic 27861f0d14
Add automatic restart docker-compose.yml 2022-04-12 16:09:01 +02:00
AnnAngela-work 5aa747a301 New translation 2022-04-12 20:41:25 +08:00
Louis Lam 81de2eedfb Fix template can contain one tag only, disable vue/require-component-is eslint rule 2022-04-12 20:23:11 +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
Louis Lam 4053b9db1f Merge remote-tracking branch 'origin/master' 2022-04-12 17:46:24 +08:00
Louis Lam 772d009f43 Merge branch 'master' into fluencydoc_master
# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
2022-04-12 17:44:04 +08:00
MrEddX ae54d9c011
Merge branch 'louislam:master' into bulgarian 2022-04-12 12:37:52 +03:00
Louis Lam 5ca606fe99
Merge pull request #1141 from marcules/issue/1138
Issue/1138
2022-04-12 17:32:52 +08:00
Louis Lam 6179f6c982 Merge branch 'master' into issue/1138
# Conflicts:
#	server/server.js
2022-04-12 17:15:33 +08:00
Louis Lam 94770cf865 Resolve log message null reference 2022-04-12 16:57:22 +08:00
Louis Lam 9ec29c1bc4 Add back debug() for safe, but it is marked as deprecated 2022-04-12 16:37:05 +08:00
Louis Lam 279e2eb3f6 Merge branch 'master' into logging
# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
2022-04-12 16:32:14 +08:00
Louis Lam 1ba92d803e Update to 1.14.0 2022-04-12 14:17:13 +08:00
Louis Lam 45ca3085b2
Update CONTRIBUTING.md 2022-04-12 13:53:52 +08:00
jordanbertasso 0765f05090 Update Discord tests 2022-04-12 09:52:16 +10:00
jordanbertasso 2638d68c97 Cover dns and steam types in Discord notifs 2022-04-12 09:52:07 +10:00
Matthew Nickson e38742a2d0
[empty commit] pull request for #1059 2022-04-11 19:58:31 +01:00
Louis Lam a0d1ae2cce Better alignment of monitor list item 2022-04-11 18:02:18 +08:00
jordanbertasso 1b1e0f6dd9 Add Discord tests 2022-04-10 22:02:30 +10:00