Commit Graph

4532 Commits

Author SHA1 Message Date
Louis Lam
8ed2b59410 Resolve conflict 2023-05-26 21:38:51 +08:00
Louis Lam
0b8dddba24 Merge remote-tracking branch 'origin/master' into skaempfe#2593
# Conflicts:
#	server/model/monitor.js
#	src/pages/Details.vue
2023-05-26 21:32:58 +08:00
Louis Lam
2114295381
Merge pull request #3052 from chakflying/ui/monitor-page-design-mobile
UI: Improve monitor page layout on mobile
2023-05-26 18:30:43 +08:00
Louis Lam
bc95875aa0
Merge pull request #3156 from maximilian-krauss/feat/add-pushover-ttl
feat: Adds message ttl to pushover notification
2023-05-26 18:18:24 +08:00
Louis Lam
c1efe0f26d Add a warning for Node.js >= 20 2023-05-26 18:09:05 +08:00
Maximilian Krauß
a0d0d5b015 fix: sends pushover ttl only if defined 2023-05-26 07:27:43 +02:00
Maximilian Krauß
8d05d80a5f feat: Adds message ttl to pushover notification 2023-05-26 07:27:43 +02:00
Louis Lam
36942de329
Merge pull request #2916 from lukasbableck/master
Add safe-area-inset-bottom padding to bottom-nav
2023-05-25 17:53:44 +08:00
Louis Lam
771ca09331 npm update (mainly for socket.io) 2023-05-25 13:41:35 +08:00
Louis Lam
3cb287a40e
Merge pull request #3009 from chakflying/ui/url-more-monitor-types
UI: Support more monitor types in URL field
2023-05-24 20:46:48 +08:00
duane
9c3bb67b6b
Merge branch 'master' into feature/add-channel-notification-for-slack 2023-05-23 10:31:11 -05:00
duane
5200e10aab Removes ternary operator for Slack channel mention 2023-05-23 10:29:18 -05:00
Nelson Chan
f1a396b0f7 Fix: Align radius timeout to default 2023-05-23 18:18:54 +08:00
Nelson Chan
83a59bd984 Fix: Add password filtering 2023-05-22 04:17:45 +08:00
Nelson Chan
446b5fa9e4 UI: Support more monitor types in URL field 2023-05-21 16:03:05 +08:00
Zaid-maker
0d1b5321ad 🚀 Update legacy deps 2023-05-21 12:02:02 +08:00
Louis Lam
1e1cc86a10 Update Apprise to 1.4.0 2023-05-20 01:46:07 +08:00
duane
9825b33ef3 Fixes eslint warnings for Slack notification modal 2023-05-19 11:01:08 -05:00
duane
00f733d352 Adds ability to notify channel when Slack webhook triggered
- Adds field to toggle channel mentions on/off for Slack integration
- Adds special mention for @channel when enabled

Reference:
[Slack docs](https://api.slack.com/reference/surfaces/formatting#special-mentions)
2023-05-19 11:01:08 -05:00
duane
fd10897988 Adds translation for English Slack channel mention label 2023-05-19 11:01:08 -05:00
Nelson Chan
317024ed72 Fix: Use safebeat for push monitor 2023-05-19 18:52:00 +08:00
Janne Nowak
f604d96c5b splited if to inner if 2023-05-18 09:55:33 +02:00
Janne Nowak
f30f00655f small fix for down containers 2023-05-17 23:18:29 +02:00
Janne Nowak
891f09def7 removed log 2023-05-17 19:15:10 +02:00
Janne Nowak
6b5e179bb0 linting 2023-05-17 19:02:34 +02:00
Janne Nowak
f653aba735 added docker health status 2023-05-17 18:52:28 +02:00
Louis Lam
9dc02bb8e2 Update .gitignore 2023-05-16 21:57:08 +08:00
Louis Lam
bb15fa0179
Merge pull request #3154 from chakflying/fix/clear-data-remove-worker-thread
Fix: Remove use of worker threads in clear-old-data
2023-05-16 19:51:20 +08:00
Yoswaris Lawpaiboon
966066b897
Update src/components/BadgeGeneratorDialog.vue
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-05-15 13:56:59 +07:00
Louis Lam
8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
Trim before truncating "keword not found" message
2023-05-13 18:36:04 +08:00
Louis Lam
ba7de3fd37
Merge pull request #3152 from AnnAngela/patch-1
feat: show time as server timezone in dingding notification
2023-05-13 18:15:05 +08:00
Nelson Chan
80c8fd7372 Chore: Remove util-worker 2023-05-13 01:51:23 +08:00
Nelson Chan
a27386bb92 Fix: Use croner for clear-old-data 2023-05-13 00:59:58 +08:00
AnnAngela
ce70b3fc62
feat: add a space to separate the words 2023-05-12 22:14:59 +08:00
AnnAngela
06fba5b55a
feat: show time as server timezone in dingding notification 2023-05-12 22:04:44 +08:00
Louis Lam
f2c294e9e5
Merge pull request #3150 from theitguycj/master
Update README.md
2023-05-12 13:56:03 +08:00
The IT Guy CJ
332e54937e
Update README.md 2023-05-11 23:19:09 -05:00
Louis Lam
a1adc30a89 Fix: Add back PagerTree 2023-05-11 14:56:42 +08:00
Louis Lam
6ce882ad4a
Update README.md 2023-05-10 22:51:44 +08:00
Louis Lam
e392d12585
Mention in the README that Node.js 20 is not supported due to a weird issue 2023-05-09 23:37:51 +08:00
Louis Lam
253214ad2b
Merge pull request #3024 from chakflying/feat/edit-tag-multiselect
UI: Use vue-multiselect in Edit Tag & Styling Fixes
2023-05-09 20:43:30 +08:00
Louis Lam
33de7bdb1c Merge conflict 2023-05-09 00:45:31 +08:00
Louis Lam
7f5d0e5490 Merge remote-tracking branch 'origin/1.21.X'
# Conflicts:
#	package-lock.json
2023-05-09 00:42:11 +08:00
Louis Lam
1a344c1371 Update to 1.21.3 2023-05-09 00:28:29 +08:00
Louis Lam
28b0f8fc00 Update dependencies 2023-05-08 22:52:57 +08:00
Louis Lam
0eaaa8b6fa Minor 2023-05-08 22:52:41 +08:00
Louis Lam
5cd506e340 Minor 2023-05-08 22:39:32 +08:00
Louis Lam
f0beccf6bf Fix Same As Server Timezone do not save correctly 2023-05-08 22:14:58 +08:00
Louis Lam
72c16c3aa2 Fix eslint warnings 2023-05-08 04:26:11 +08:00
Louis Lam
aa8454b73f Slightly improve error check on maintenance edit page 2023-05-08 04:14:24 +08:00