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
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
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
2e75142fe5
Bug fix and unknown days added
2023-07-13 20:50:17 -04:00
ad3ffacf45
PR comment fix
2023-07-13 20:37:21 -04:00
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
2023-07-13 20:02:50 -04:00
b1f266ceb1
Added expiry changes to status page and fixes
2023-07-13 20:00:23 -04:00
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
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
18d8b3a8e0
Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body
2023-07-09 18:20:06 +08:00
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
2023-07-05 11:35:36 +08:00
4ea5771f97
Status page certificate expiry
2023-07-04 19:37:45 -04:00
df8fcffb19
Drop unused code
2023-07-03 14:50:30 +08:00
9da712054a
Chore: Fix incorrect id for CopyableInput
2023-07-02 18:57:07 +08:00
35154ef9c5
Chore: Translate hours
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-06-29 19:04:34 +08:00
1baa592824
Chore: Translate preview alt
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-06-29 19:04:09 +08:00
0e725569e5
Feat: Add placeholders for badge generator
...
Chore: Save as dev dep.
2023-06-29 07:11:58 +08:00
4f6035899d
Real browser monitor type ( #3308 )
2023-06-27 15:54:33 +08:00
f8c9a20afd
Chore: Disable clear filters button
2023-06-26 13:42:46 +08:00
cea894cc6d
Chore: Fix lint
2023-06-26 13:39:19 +08:00
79b38e0e7b
Feat: Improve monitorList filtering
2023-06-26 13:23:06 +08:00
8955c3816b
Chore: Rename select ID & add translation
2023-06-26 05:00:14 +08:00
7761e9a05e
Chore: Add translations to options text
2023-06-26 04:59:56 +08:00
97d38ee1a8
Feat: Add custom body for Webhook Notif.
2023-06-26 04:59:55 +08:00
6c2948d2de
fix: list collapse storage
2023-06-03 20:54:52 +02:00
1fa8c0f9fe
Adds help text for `Notify Channel` option
2023-06-01 08:40:26 -05:00
9a8bea5761
Changes 'Mention Channel' -> 'Notify Channel'
...
- Updates variable names
- Updates any Slack mention references
2023-06-01 08:23:13 -05:00
9bd76c2795
Merge branch 'master' into group-monitors
2023-05-31 20:51:33 +02:00
376d84c742
Merge branch 'master' into feature/add-channel-notification-for-slack
2023-05-31 10:31:33 -05:00
039fdb0730
Merge pull request #2915 from kiznick/badge-generator
...
Feat: Badge Generator
2023-05-31 16:09:13 +08:00
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
04806ba4f3
Fix: Fix incorrect modal layout
2023-05-31 09:26:54 +08:00
3ff910a8f8
Fix Modal
2023-05-30 20:06:53 +07:00
f3fe392ec4
Add option to use ApiKeys in Twilio in addition to main account credentials
2023-05-29 19:30:33 -04:00
85eb084305
Setting Modal
2023-05-29 20:11:06 +07:00
8d05d80a5f
feat: Adds message ttl to pushover notification
2023-05-26 07:27:43 +02:00
9825b33ef3
Fixes eslint warnings for Slack notification modal
2023-05-19 11:01:08 -05:00
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
966066b897
Update src/components/BadgeGeneratorDialog.vue
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-05-15 13:56:59 +07:00
a1adc30a89
Fix: Add back PagerTree
2023-05-11 14:56:42 +08:00
9975050872
Chore: Fix line break
2023-05-07 23:20:28 +08:00
f8c2909576
UI: Improve styling
2023-05-07 23:20:28 +08:00
fcfe13e52d
Feat: Use vue-multiselect in Edit Tag
2023-05-07 23:20:28 +08:00
a3e31b22bc
Minor
2023-04-25 18:22:17 +08:00
078d1f96a5
Better handling for old added ntfy notifications
2023-04-25 18:17:32 +08:00
8207f16396
Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization
2023-04-25 18:07:52 +08:00
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
3579520575
Fix Eslint
...
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
2023-04-12 20:09:04 +07:00
030faddd1c
Merge branch 'louislam:master' into badge-generator
2023-04-12 12:02:36 +07:00
f433f33418
Merge remote-tracking branch 'origin/master' into update-chartjs
...
# Conflicts:
# package-lock.json
# package.json
2023-04-11 18:58:20 +08:00
6b078b83bd
Merge branch 'master' into ntfy-bearer-authorization
2023-04-03 08:33:05 +02:00
b975c24531
UI: Improve design on mobile
2023-03-31 21:54:35 +08:00
a6acd065bb
WIP
2023-03-31 20:58:45 +08:00
227cec86a8
WIP
2023-03-31 20:25:37 +08:00
02291730fe
WIP
2023-03-31 04:04:17 +08:00
fc4312ca1a
Merge branch 'master' into ntfy-bearer-authorization
2023-03-26 19:09:48 +02:00
4869e6531c
Merge pull request #2980 from Genc/feature/twilio-notification-provider
...
Add Twilio Sms Notification Provider
2023-03-26 15:38:53 +08:00
302b9cf644
Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts
...
Feat: Add opsgenie notification provider
2023-03-26 15:36:50 +08:00
b64c835cee
Add Twilio Sms Notification Provider
2023-03-25 19:56:01 +03:00
b6169408be
Merge pull request #2962 from chakflying/fix/missing-clear-form
...
Fix: Add missing clearForm func.
2023-03-25 14:31:47 +08:00
a2014278b8
Fix #2969
2023-03-24 19:16:12 +08:00
4c9d7ac8ca
Fix: Add missing clearForm func.
2023-03-22 15:06:38 +08:00
d9558833fc
Fix linting
2023-03-21 19:45:44 +01:00
776a482a1d
Add Opsgenie notification provider
2023-03-21 19:29:37 +01:00
d2527d7254
Merge branch 'master' into feature/opsgenie-alerts
2023-03-21 18:10:10 +01:00
6dfca0c163
Add Opsgenie notification provider
2023-03-21 18:07:19 +01:00
df47609671
Added default dropdown value
2023-03-21 13:55:51 +01:00
e63f7562f8
linter fixes
2023-03-21 13:48:00 +01:00
35a56dd9e0
Added dropdown for authentication methods
2023-03-21 13:40:24 +01:00
442f54de84
Merge branch 'louislam:master' into ntfy-bearer-authorization
2023-03-21 13:01:49 +01:00
e5a6238cde
chore: remove invalid template
2023-03-19 21:59:34 +08:00
29b2809279
Change Icon, Add missing var
2023-03-10 22:04:47 +07:00
16f2701f61
idk how to fix camelcase lint 😢
2023-03-10 20:24:10 +07:00
3bbf269da0
generator modal
2023-03-10 19:25:04 +07:00
ba7af9b569
Uppercase and improve language keys
2023-03-10 15:55:39 +08:00
6e0aa109bc
Uppercase and improve language keys
2023-03-10 15:36:23 +08:00
e8814e8479
added option for ntfy access tokens
2023-03-08 13:28:02 +00:00
70bb69fc73
add keys for translation
2023-03-04 15:17:20 +01:00
8d1847c032
Merge pull request #2744 from bobby-ore/add-lunasea-user-id
...
Add ability to use User ID for LunaSea notifications
2023-03-04 17:35:15 +08:00
beb22f743d
Chore: Update chart.js & improve perf.
2023-03-02 04:47:51 +08:00
71c800b880
Merge remote-tracking branch 'origin/master' into notification-provider-pagertree
...
# Conflicts:
# src/lang/en.json
2023-03-01 16:17:18 +08:00
b21c2adcc2
Rework lunasea notification to allow for device id and user id
2023-02-28 09:47:35 -06:00
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2023-02-28 16:55:50 +08:00
7e178d93df
Moved location of disable expiry checkbox
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-27 18:44:32 +00:00
97e276bdb5
Fixed processing error with add API key
...
Also added padding below add button
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-27 18:19:56 +00:00
11fa690e09
Updated API Keys UI
...
The UI has now been moved to the settings page.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-26 18:07:57 +00:00
ea3b3abe36
Fine tune
2023-02-25 20:13:46 +08:00
7f9332c753
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
2023-02-25 19:14:44 +08:00
f0ae67f89a
Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
...
# Conflicts:
# src/languages/en.js
# src/pages/EditMonitor.vue
2023-02-25 14:56:51 +08:00
98bb854832
Merge pull request #2764 from chakflying/feat/add-new-tag
...
Feat: Add "Add New Tag" button in settings
2023-02-25 02:27:32 +08:00
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2023-02-25 00:06:25 +08:00
af82ea742c
Merge manually
2023-02-24 17:21:53 +08:00
e9475ed3c0
Merge remote-tracking branch 'origin/master' into telegram_test
...
# Conflicts:
# server/notification-providers/telegram.js
# src/languages/en.js
2023-02-24 17:08:48 +08:00
06278dc51f
Fix telegram silent issue
2023-02-24 17:03:40 +08:00
10228874fa
Merge manually
2023-02-24 16:54:58 +08:00
c5034c8f38
Merge remote-tracking branch 'origin/master' into nlutsenko.telegram_silentnotification
...
# Conflicts:
# server/notification-providers/telegram.js
# src/components/notifications/Telegram.vue
# src/languages/en.js
2023-02-24 16:42:57 +08:00
7e3734af53
Better handling
2023-02-23 20:59:24 +08:00
5789112f55
Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction
2023-02-23 20:47:28 +08:00
fa7f75a930
Organize notification list
2023-02-23 18:01:42 +08:00
7da48b27a5
Fix `getUniqueDefaultName`
2023-02-22 04:29:43 +08:00
de7df46aa8
Sort the notification list by name and remove translation keys of brand names or product names
2023-02-22 04:27:12 +08:00
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2023-02-14 19:53:33 +00:00
0d6a8b2101
Added more options for confirm modal
...
The ability to set the title of the modal has been added, as well as
custom callbacks for the no option.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-14 18:23:51 +00:00
33bb9f1ade
Feat: Add simple validation on input
2023-02-14 07:16:18 +08:00
51dbb23230
Feat: Add "Add New Tag" button in settings
2023-02-13 05:05:30 +08:00
48b637d4c8
Refactor to not introduce a breaking change
2023-02-09 08:49:19 -06:00
53d9e98e47
Added required to LunaSea notification type select field
2023-02-08 14:13:41 -06:00
8725e5daf9
Add ability to use User ID for LunaSea notifications
2023-02-08 14:08:25 -06:00
1c0174c319
ESLint and verbiage changes
2023-02-06 13:07:56 -07:00
ef54d9e3b6
Add PagerTree Notification Provider
2023-02-06 11:33:14 -07:00
c42e550382
style: formats
2023-02-04 23:46:19 +02:00
1bfb290718
feat: add message thread id for telegram nonfiction
2023-02-04 22:53:38 +02:00
2c581ade90
Merge branch 'louislam:master' into group-monitors
2023-02-01 20:44:09 +01:00
66573934f6
refactor: remove old code
2023-01-28 15:21:17 +01:00
c444d78706
style: fix linting errors
2023-01-28 15:20:40 +01:00
9a46b50989
docs: add comments
2023-01-28 14:22:15 +01:00
faf3488b1e
fix: unfold tree if monitor is accessed directly
2023-01-28 14:15:25 +01:00
ddce8f0cb0
Fix plugin installation
2023-01-28 19:00:13 +08:00
97bd306a09
Merge branch 'louislam:master' into group-monitors
2023-01-28 03:07:42 +01:00
645fd94bba
feat: add ability to group monitors in dashboard
2023-01-28 02:58:03 +01:00
50573e6c89
Merge pull request #2635 from Computroniks/bug/2628-uptime-over-100
...
Perform sanity check on uptime for status page
2023-01-27 18:33:37 +08:00
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
ae0ef79060
Update french translation ( #2634 )
2023-01-24 15:16:18 +08:00
e9044ae956
Removed repetitiion of %
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-23 18:10:45 +00:00
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
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
a5ff27da7a
Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead
2023-01-17 17:34:47 +08:00
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
...
Fix: Allow long sms in PromoSMS
2023-01-16 13:21:56 +08:00
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
f7d41a30fa
Update src/components/TagEditDialog.vue
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-13 23:15:41 +08:00
27e0b1eea1
Remove required attribute for optional field
2023-01-12 15:52:50 +02:00
9c1ba97e7d
Chore: Fix typo
2023-01-12 21:25:33 +08:00
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2023-01-12 21:25:33 +08:00
521356e38a
LINT fixes
2023-01-12 15:21:56 +02:00
b91fe9d96d
Added a more telegram options
...
such as thread id, silent notifications and forward protect
2023-01-12 15:09:05 +02:00
ec30147a7f
Add option for allowing long sms in PromoSMS
2023-01-11 14:32:57 +01:00
2172112144
Setting for allowing long sms
2023-01-11 12:13:47 +01:00
33355c51b7
Add Splunk Notifications
2023-01-09 13:33:10 +00:00
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 19:09:06 +00:00
dc8289df12
Added JSDoc for src/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:55:51 +00:00
edd8fe2e22
Fix: Fix incorrect tag form validation
2023-01-03 22:18:45 +08:00
cd7a6e4019
Merge pull request #2478 from YehowahLiu/master
...
Add Kook notification provider
2023-01-01 02:53:03 +08:00
5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider)
...
Zoho Cliq Notification Provider
2022-12-29 19:00:50 +08:00
9fe9e235ca
Merge pull request #2236 from mishankov/fix/stats-30-days
...
Simple fix for Uptime component
2022-12-28 15:37:46 +08:00
4d0bdae6bf
Add jsdoc for Tag type
...
Does not work properly but is still useful
2022-12-27 23:27:23 +01:00
50b84f5f45
fix code style: add missing semicolon
2022-12-27 14:12:22 +08:00
c60b741406
Add kook notification provider
2022-12-27 14:12:22 +08:00
4862bec965
Update Fr language + added variable for missing translation ( #2395 )
...
* Update FR language
2022-12-13 22:00:54 +08:00
aa784fb3b2
Fix #2394
2022-12-13 16:48:23 +08:00
3b87209e26
Add configurable dns cache
2022-12-12 17:19:22 +08:00
Louis Lam
Tarun Singh
Muhammed Hussein karimi
Nelson Chan
Nelson Chan
Peace
duane
Peace
duane
Yoswaris Lawpaiboon
Wojciech Kapcia
Maximilian Krauß
Josua Frank
Faruk Genç
niclas.koegl
401Unauthorized
cyril59310
Bobby Ore
Matthew Nickson
Austin Miller
Haytham Salama
Cyril59310
shyneko
Łukasz Szczepański
Luke
Joseph Irving
Mathias Haugsbø
401Unauthorized