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