Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-18 20:24:36 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,873 Commits 29 Branches 115 Tags 103 MiB
ea3b3abe36
Commit Graph

1168 Commits

Author SHA1 Message Date
Louis Lam
ea3b3abe36 Fine tune 2023-02-25 20:13:46 +08:00
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
 2023-02-25 19:14:44 +08:00
Louis Lam
a7b49fcd98 Fix json body after xml body added 2023-02-25 17:28:32 +08:00
Louis Lam
e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification 
Adds name + status + message to Slack notification
 2023-02-24 23:54:31 +08:00
Louis Lam
c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty 
Fix: getGameList returns nothing on first run
 2023-02-24 23:34:47 +08:00
Nelson Chan
c65a920050 Chore: Fix code comment 2023-02-24 21:09:55 +08:00
Nelson Chan
7b8ed01f27 Fix: getGameList returns nothing on first run 2023-02-24 21:06:00 +08:00
Louis Lam
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors 
Add xml support to HTTP monitors
 2023-02-24 17:26:47 +08:00
Louis Lam
2fa233ae7f Fix prometheus null issues 2023-02-24 17:12:57 +08:00
Louis Lam
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
Louis Lam
10228874fa Merge manually 2023-02-24 16:54:58 +08:00
Louis Lam
7e3734af53 Better handling 2023-02-23 20:59:24 +08:00
Louis Lam
5789112f55 Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction 2023-02-23 20:47:28 +08:00
Louis Lam
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance 
remember prometheus instance and expose it
 2023-02-23 20:43:05 +08:00
Louis Lam
9ccaa4d120
Merge pull request #2786 from luckman212/luckman212-tagsort-1 
sorted tags on dashboard
 2023-02-22 01:11:03 +08:00
Louis Lam
42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code 
Feat: Use error message to detect and set status code
 2023-02-22 01:01:53 +08:00
Faruk Genç
72106ba4c4 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-18 22:38:40 +03:00
Luke Hamburg
dd1d71530f
sorted tags on dashboard 
see https://github.com/louislam/uptime-kuma/issues/2785
 2023-02-15 14:06:29 -05:00
Louis Lam
d1175ff471 Fix #2777 2023-02-15 02:50:49 +08:00
Matthew Nickson
cd18b96f69
Added check to ensure backup exists when restoring (#2779) 
A check to ensure that the backup database exists before deleting the
current database.

Fixes #2778

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 00:43:40 +08:00
Faruk Genç
19c8538149 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-11 23:56:38 +03:00
Louis Lam
c12b06348b Fix parsing issues of status page's og tags 2023-02-10 17:29:32 +08:00
Nelson Chan
3439074835 Feat: Use message to improve errror status code 2023-02-09 17:42:02 +08:00
Brayan Lozano
d45aee450d
Removes unecessary ternary operator 2023-02-07 22:34:10 -05:00
Brayan Lozano
727acb32bf
Adds name + status + message to slack notification 2023-02-07 21:18:26 -05:00
Nelson Chan
e1f956879d
Fix: Use .destroy() instead of .end() 2023-02-07 05:01:53 +08:00
Faruk Genç
39c99b0ec4 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 
# Conflicts:
#	server/database.js
#	src/lang/en.json
 2023-02-05 18:19:46 +03:00
Haytham Salama
1bfb290718 feat: add message thread id for telegram nonfiction 2023-02-04 22:53:38 +02:00
Louis Lam
afadfe32d5 Trim 2023-02-04 17:03:00 +08:00
Louis Lam
5f2affb38c Relocate and fix jsesc issue 2023-02-04 16:58:39 +08:00
Louis Lam
10c6f3b688 Merge remote-tracking branch 'origin/master' into feature-google-analytics 2023-02-04 15:40:13 +08:00
Faruk Genç
666838f334 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-04 00:03:05 +03:00
c
a823ed8ccc Feature - Google Analytics - Removed unused import. 2023-02-03 11:49:25 +00:00
Joseph
2a6d98ff01
Feat: Expand and Simplify Badge Functionality (#2211) 
* [expanding badges] added new configs

* [expanding badges] recieve ping in getPreviousHeartbeat()

* [expanding badges] re-added original new badges

* [expanding badges] recreate parity between old and new badges

* [expanding badges] fix linting
 2023-02-03 12:33:48 +08:00
c
913bb611d5 Feature - Google Analytics - Removed regex to validate a Google Analytics tag. 2023-02-02 21:52:45 +00:00
c
c08d8a5eaf Google Analytics - Simplified retrieving Tag ID from Status Page. 2023-02-02 21:51:03 +00:00
c
3ff0cbe311 Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS. 2023-02-02 21:51:03 +00:00
c
fb2999706c Feature - Google Analytics - Added JSDoc to Google Analytics functions. 2023-02-02 21:51:03 +00:00
c
2b3a3895b3 Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895 2023-02-02 21:51:03 +00:00
c
99c0b8cb71 Feature - Google Analytics - Addressing PR Comments. 2023-02-02 21:51:03 +00:00
c
29e24e0de9 Feature - Added Optional Google Analytics tag for Status Page. 2023-02-02 21:51:03 +00:00
Faruk Genç
4287f7e885 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 
# Conflicts:
#	src/lang/en.json
 2023-02-02 19:43:17 +03:00
Louis Lam
683f446cf5 Add support for .env 2023-02-01 20:07:08 +08:00
Nelson Chan
348d0170fa Chore: Use constants instead of int 2023-02-01 05:33:36 +08:00
Faruk Genç
064bc00f46 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-01-30 13:09:16 +03:00
Louis Lam
fca0198d35
Merge pull request #2525 from chakflying/fix/maintenance-badge 
Fix: Add support for pending & maintenance in badges
 2023-01-30 15:32:28 +08:00
Faruk Genç
35bd129d66 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-01-28 15:47:42 +03:00
Louis Lam
ddce8f0cb0 Fix plugin installation 2023-01-28 19:00:13 +08:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support (#1787) 2023-01-27 18:25:57 +08:00
Faruk Genç
9329ec9234 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
 2023-01-25 20:20:11 +03:00