2873 Commits

Author SHA1 Message Date
Tarun Singh
50d4091ded Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry 2023-07-18 22:57:48 -04:00
Nelson Chan
66cfbd02c3
Fix: Update monitor-list height (#3444) 2023-07-18 14:39:05 +08:00
Louis Lam
8e72d6f534
Fix codespace url (#3436)
* Fix codespace url (https://github.com/louislam/uptime-kuma/pull/3432#discussion_r1265120809)
2023-07-17 20:14:05 +08:00
Muhammed Hussein karimi
278b88a9d9
feat: added kafka producer (#3268)
*  feat: added kafka producer

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

* 🐛 fix: eslint warn

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

* 🐛 fix: typings and auth problems

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

* 🐛 fix: better variable name to trrack disconnection

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

* 🐛 fix: grouping Kafka Producer special settings into one template

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

*  feat: add kafka producer translations into `en.json`

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

* 🐛 fix: disable close-on-select on kafka broker picker

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

* 🐛 fix: `en.json` invalid json (conflict resolve)

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

* 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

* Minor

* Fix a bug of clone

---------

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-07-17 16:15:44 +08:00
Louis Lam
084cf01fcd
Add support for Codespaces (#3432)
* Create devcontainer.json

* WIP

* WIP

* WIP

* Create README.md

* Try to fix cypress issue

* Add extensions

* WIP

* Minor
2023-07-17 14:54:40 +08:00
Tarun Singh
f6c1b92fc6 Added http type check and tags based design 2023-07-17 02:01:10 -04:00
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
Louis Lam
973db9d4b2
Merge pull request #3330 from chakflying/fix/datetime-wrong-type
Chore: Fix incorrect data type for DateTime component
2023-07-14 12:26:22 +08:00
Tarun Singh
2e75142fe5 Bug fix and unknown days added 2023-07-13 20:50:17 -04:00
Tarun Singh
ad3ffacf45 PR comment fix 2023-07-13 20:37:21 -04:00
Tarun Singh
6f4af30701 Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry 2023-07-13 20:02:50 -04:00
Tarun Singh
b1f266ceb1 Added expiry changes to status page and fixes 2023-07-13 20:00:23 -04: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
ac68a35d3a
Merge pull request #3386 from chakflying/patch-1
Fix: Multiselect blocked by bottom bar
2023-07-10 15:16:02 +08:00
Louis Lam
18d8b3a8e0 Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body 2023-07-09 18:20:06 +08:00
Nelson Chan
3d50572dd7
Fix: Multiselect blocked by bottom bar 2023-07-08 23:33:14 +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
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
Tarun Singh
4ea5771f97 Status page certificate expiry 2023-07-04 19:37:45 -04:00
Louis Lam
4fe0891a60
Merge pull request #3296 from crystalcommunication/pr-custom-domain-auto
Fix auto theme for status pages on custom domains
2023-07-03 15:48:38 +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
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
Louis Lam
ccc39b9516 Move all old db patch files to db/old_migrations/ 2023-07-01 20:54:47 +08:00
Louis Lam
e26abc3156 Improve the setup database 2023-07-01 02:48:42 +08:00
Louis Lam
d286c534bd Improve the setup database for embedded MariaDB 2023-06-30 22:17:07 +08:00
Louis Lam
16a1a66e09 Merge remote-tracking branch 'origin/master' into 2.0.X
# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/debian-base.dockerfile
#	docker/dockerfile
#	package.json
#	server/database.js
#	server/jobs/util-worker.js
#	server/model/maintenance.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/uptime-kuma-server.js
2023-06-30 13:38:56 +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
9882fc65b1 Fix: Incorrect label for badge values 2023-06-29 07:12:19 +08:00
Nelson Chan
0e725569e5 Feat: Add placeholders for badge generator
Chore: Save as dev dep.
2023-06-29 07:11:58 +08:00
Nelson Chan
afcfb7e19c Fix: Incorrect data type for DateTime component 2023-06-29 04:17:47 +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
Tarun Singh
cf4220901b Translated using Weblate (Hindi)
Currently translated at 5.4% (41 of 754 strings)

Co-authored-by: Tarun Singh <tarun7singh7@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/hi/
Translation: Uptime Kuma/Uptime Kuma
2023-06-26 04:52:40 +00:00
Buchtič
f3996fdef4 Translated using Weblate (Czech)
Currently translated at 100.0% (754 of 754 strings)

Co-authored-by: Buchtič <martin.buchta@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/
Translation: Uptime Kuma/Uptime Kuma
2023-06-26 04:52:40 +00:00
CarlosCF
1dfe5227ad Translated using Weblate (Galician)
Currently translated at 2.7% (21 of 754 strings)

Added translation using Weblate (Galician)

Co-authored-by: CarlosCF <carloscaamano@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/gl/
Translation: Uptime Kuma/Uptime Kuma
2023-06-26 04:52:40 +00:00
SEOAlexRamon
4ead0609af Translated using Weblate (Catalan)
Currently translated at 3.4% (26 of 754 strings)

Translated using Weblate (Spanish)

Currently translated at 95.0% (717 of 754 strings)

Added translation using Weblate (Catalan)

Co-authored-by: SEOAlexRamon <seoalexramon@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ca/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/es/
Translation: Uptime Kuma/Uptime Kuma
2023-06-26 04:52:40 +00:00
401Unauthorized
a8bf52b1e0 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (754 of 754 strings)

Co-authored-by: 401Unauthorized <hi@4o1.to>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/
Translation: Uptime Kuma/Uptime Kuma
2023-06-26 04:52:40 +00:00
Adam Stachowicz
ede6d90497 Translated using Weblate (Polish)
Currently translated at 96.6% (729 of 754 strings)

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pl/
Translation: Uptime Kuma/Uptime Kuma
2023-06-26 04:52:40 +00:00