ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-30 19:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
4490 commits 31 branches 115 tags 54 MiB
Commit graph

99 commits

Author SHA1 Message Date
Louis Lam
e2a87eb430 Improve the filter translate keys 2023-07-16 21:15:25 +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
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
ed6b4e5ae5 Merge remote-tracking branch 'origin/master' into miles/invert-keyword 
# Conflicts:
#	server/database.js
 2023-07-08 16:19:44 +08:00
Nelson Chan
af78da1dd9
Chore: Add missing translation 
Co-authored-by: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
 2023-07-02 18:52:56 +08:00
Nelson Chan
9e041f219b
Chore: Fix translation string 
Co-authored-by: Yoswaris Lawpaiboon <22832362+kiznick@users.noreply.github.com>
 2023-07-02 18:52:36 +08:00
Nelson Chan
9882fc65b1 Fix: Incorrect label for badge values 2023-06-29 07:12:19 +08:00
Louis Lam
4f6035899d
Real browser monitor type (#3308) 2023-06-27 15:54:33 +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
Cyril59310
4e420ee3ff
Missing translation key (#3281) 
* missing translation key

* Update src/lang/en.json

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

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2023-06-19 13:17:58 +08:00
Louis Lam
596402e71f
Merge pull request #3246 from chakflying/ui/monitor-group-select 
UI: Improve no group monitor message
 2023-06-17 16:43:03 +08:00
Louis Lam
c61a3d360f
Merge pull request #3254 from CommanderStorm/transaltion_home 
Chore: Added a translation key for "Home"
 2023-06-13 23:05:02 +08:00
Frank Elsinga
ba4d925374 Added a translation key for "Home" 2023-06-12 17:58:54 +02:00
Nelson Chan
de9ad0fe60 UI: Add help msg for no Group Mon. 2023-06-12 19:26:50 +08:00
Frank Elsinga
ac8ca36895 Enabled adding missing keys to the translation database 2023-06-11 22:43:33 +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
4b3a2ee71b
Merge pull request #3211 from kiznick/badge-generator 
Add i18n variable for Badge Generator #2915
 2023-05-31 18:00:13 +08:00
Yoswaris Lawpaiboon
1634df5a39 Update en.json 2023-05-31 16:00:38 +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
Maximilian Krauß
8d05d80a5f feat: Adds message ttl to pushover notification 2023-05-26 07:27:43 +02:00
duane
fd10897988 Adds translation for English Slack channel mention label 2023-05-19 11:01:08 -05:00
Louis Lam
a3e31b22bc Minor 2023-04-25 18:22:17 +08:00
Miles Steele
171aff1226 add invert keyword feature 2023-04-06 15:25:25 -05:00
Josua Frank
6b078b83bd
Merge branch 'master' into ntfy-bearer-authorization 2023-04-03 08:33:05 +02:00
Louis Lam
a6acd065bb WIP 2023-03-31 20:58:45 +08:00
Louis Lam
227cec86a8 WIP 2023-03-31 20:25:37 +08:00
Louis Lam
02291730fe WIP 2023-03-31 04:04:17 +08:00
Josua Frank
fc4312ca1a
Merge branch 'master' into ntfy-bearer-authorization 2023-03-26 19:09:48 +02:00
Faruk Genç
b64c835cee Add Twilio Sms Notification Provider 2023-03-25 19:56:01 +03:00
Louis Lam
097567e5f0
Merge pull request #2878 from chakflying/feat/status-page-countdown 
Feat: Add status page countdown to refresh
 2023-03-23 17:18:57 +08:00
Louis Lam
35f300c8eb Improve and reuse language keys 2023-03-23 17:17:53 +08:00
Josua Frank
8921ed0cff fix indentation of language json files 2023-03-21 13:44:06 +01:00
Josua Frank
35a56dd9e0 Added dropdown for authentication methods 2023-03-21 13:40:24 +01:00
Louis Lam
ba7af9b569 Uppercase and improve language keys 2023-03-10 15:55:39 +08:00
Louis Lam
6e0aa109bc Uppercase and improve language keys 2023-03-10 15:36:23 +08:00
cyril59310
70bb69fc73 add keys for translation 2023-03-04 15:17:20 +01:00
Louis Lam
71c800b880 Merge remote-tracking branch 'origin/master' into notification-provider-pagertree 
# Conflicts:
#	src/lang/en.json
 2023-03-01 16:17:18 +08:00
Louis Lam
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
Louis Lam
48c6f0578c Merge manually 2023-02-25 19:16:33 +08:00
Louis Lam
4fed0c152e Show Copy of in front of the cloned monitor name 2023-02-25 17:05:03 +08:00
Louis Lam
54cd7a0402 Merge manually 2023-02-25 15:08:39 +08:00
Louis Lam
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