Commit Graph

641 Commits

Author SHA1 Message Date
Louis Lam
695691468c
Merge pull request #3428 from chakflying/fix/no-delete-draft-tag
Fix: Hide delete button in Settings -> Create New Tag
2023-07-16 21:39:12 +08:00
Louis Lam
e2a87eb430 Improve the filter translate keys 2023-07-16 21:15:25 +08:00
Louis Lam
80927332cb Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering 2023-07-16 21:04:46 +08:00
Nelson Chan
a0eb733d54 Fix: Hide the Delete button correctly 2023-07-16 08:10:02 +08:00
Louis Lam
c6d0c431bd
Merge pull request #3080 from duanearnett/feature/add-channel-notification-for-slack
Adds configurable @channel notification for Slack integrations
2023-07-15 18:41:17 +08:00
Louis Lam
345e61abca Merge remote-tracking branch 'origin/master' into feat/badge-generator-placeholders
# Conflicts:
#	package-lock.json
#	package.json
2023-07-15 01:05:34 +08:00
Louis Lam
99fb5836e2
Add SMSC (СМСЦентр) provider notification (#3335) By @FlatronBuda
* Add SMSC, code from #3334

Co-authored-by: FlatronBuda <>

* Update server/notification-providers/smsc.js

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update server/notification-providers/smsc.js

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update server/notification-providers/smsc.js

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update according to @FlatronBuda

* Move to the regional list

---------

Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-07-14 14:29:35 +08:00
Muhammed Hussein karimi
6bece8796e
feat: json-query monitor added (#3253)
*  feat: json-query monitor added

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: import warning error

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: br tag and remove comment

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: supporting compare string with other types

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: switch to a better lib for json query

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: better description on json query and using `v-html` in jsonQueryDescription element to fix `a` tags

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: result variable in error message

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: typos in json query description

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* 📝 docs: `HTTP(s) Json Query` added to monitor list in `README.md`

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: needed white space in `README.md`

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Nostr dm notifications (#3051)

* Add nostr DM notification provider

* require crypto for node 18 compatibility

* remove whitespace

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* move closer to where it is used

* simplify success or failure logic

* don't clobber the non-alert msg

* Update server/notification-providers/nostr.js

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* polyfills required for node <= 18

* resolve linter warnings

* missing comma

---------

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Drop nostr

* Rebuild package-lock.json

* Lint

---------

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: zappityzap <128872140+zappityzap@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-07-13 23:37:26 +08:00
Louis Lam
e5c6783781
Merge pull request #3205 from woj-tek/master
Add option to use ApiKeys in Twilio in addition to main account credentials
2023-07-13 23:11:05 +08:00
Louis Lam
18d8b3a8e0 Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body 2023-07-09 18:20:06 +08:00
Louis Lam
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
1.22.x merge to master
2023-07-05 11:35:36 +08:00
Louis Lam
df8fcffb19 Drop unused code 2023-07-03 14:50:30 +08:00
Nelson Chan
9da712054a Chore: Fix incorrect id for CopyableInput 2023-07-02 18:57:07 +08:00
Nelson Chan
35154ef9c5
Chore: Translate hours
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-06-29 19:04:34 +08:00
Nelson Chan
1baa592824
Chore: Translate preview alt
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-06-29 19:04:09 +08:00
Nelson Chan
0e725569e5 Feat: Add placeholders for badge generator
Chore: Save as dev dep.
2023-06-29 07:11:58 +08:00
Louis Lam
4f6035899d
Real browser monitor type (#3308) 2023-06-27 15:54:33 +08:00
Nelson Chan
f8c9a20afd Chore: Disable clear filters button 2023-06-26 13:42:46 +08:00
Nelson Chan
cea894cc6d Chore: Fix lint 2023-06-26 13:39:19 +08:00
Nelson Chan
79b38e0e7b Feat: Improve monitorList filtering 2023-06-26 13:23:06 +08:00
Nelson Chan
8955c3816b Chore: Rename select ID & add translation 2023-06-26 05:00:14 +08:00
Nelson Chan
7761e9a05e Chore: Add translations to options text 2023-06-26 04:59:56 +08:00
Nelson Chan
97d38ee1a8 Feat: Add custom body for Webhook Notif. 2023-06-26 04:59:55 +08:00
Peace
6c2948d2de
fix: list collapse storage 2023-06-03 20:54:52 +02:00
duane
1fa8c0f9fe Adds help text for Notify Channel option 2023-06-01 08:40:26 -05:00
duane
9a8bea5761 Changes 'Mention Channel' -> 'Notify Channel'
- Updates variable names
- Updates any Slack mention references
2023-06-01 08:23:13 -05:00
Peace
9bd76c2795
Merge branch 'master' into group-monitors 2023-05-31 20:51:33 +02:00
duane
376d84c742
Merge branch 'master' into feature/add-channel-notification-for-slack 2023-05-31 10:31:33 -05:00
Louis Lam
039fdb0730
Merge pull request #2915 from kiznick/badge-generator
Feat: Badge Generator
2023-05-31 16:09:13 +08:00
Louis Lam
20af2d9d95
Merge pull request #3209 from chakflying/fix/apikey-modal-layout
Fix: Fix incorrect modal layout in generate api-key
2023-05-31 15:09:58 +08:00
Nelson Chan
04806ba4f3 Fix: Fix incorrect modal layout 2023-05-31 09:26:54 +08:00
Yoswaris Lawpaiboon
3ff910a8f8 Fix Modal 2023-05-30 20:06:53 +07:00
Wojciech Kapcia
f3fe392ec4
Add option to use ApiKeys in Twilio in addition to main account credentials 2023-05-29 19:30:33 -04:00
Yoswaris Lawpaiboon
85eb084305 Setting Modal 2023-05-29 20:11:06 +07:00
Maximilian Krauß
8d05d80a5f feat: Adds message ttl to pushover notification 2023-05-26 07:27:43 +02: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
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
a1adc30a89 Fix: Add back PagerTree 2023-05-11 14:56:42 +08:00
Nelson Chan
9975050872 Chore: Fix line break 2023-05-07 23:20:28 +08:00
Nelson Chan
f8c2909576 UI: Improve styling 2023-05-07 23:20:28 +08:00
Nelson Chan
fcfe13e52d Feat: Use vue-multiselect in Edit Tag 2023-05-07 23:20:28 +08:00
Louis Lam
a3e31b22bc Minor 2023-04-25 18:22:17 +08:00
Louis Lam
078d1f96a5 Better handling for old added ntfy notifications 2023-04-25 18:17:32 +08:00
Louis Lam
8207f16396 Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization 2023-04-25 18:07:52 +08:00
Louis Lam
eb9c748071
Merge pull request #3006 from chakflying/ui/tags-settings-mobile
UI: Improve Tags settings design on mobile
2023-04-17 16:58:57 +08:00
Yoswaris Lawpaiboon
3579520575
Fix Eslint
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
2023-04-12 20:09:04 +07:00
Yoswaris Lawpaiboon
030faddd1c
Merge branch 'louislam:master' into badge-generator 2023-04-12 12:02:36 +07:00
Louis Lam
f433f33418 Merge remote-tracking branch 'origin/master' into update-chartjs
# Conflicts:
#	package-lock.json
#	package.json
2023-04-11 18:58:20 +08:00
Josua Frank
6b078b83bd
Merge branch 'master' into ntfy-bearer-authorization 2023-04-03 08:33:05 +02:00