7330db3563
Improve error handling of mysqlQuery and return row count as result
2023-03-24 16:08:30 +08:00
dbe73bd6ae
Update monitor.js ( #2929 )
...
Language
2023-03-15 15:00:28 +08:00
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-03-12 18:38:19 +08:00
533bc1505b
Prevent generating duplicated timeslots
2023-03-09 22:03:23 +08:00
2dedc1cfbd
Fix #2776
2023-03-07 20:48:11 +08: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
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
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-02-25 17:57:25 +08:00
a7b49fcd98
Fix json body after xml body added
2023-02-25 17:28: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
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
2fa233ae7f
Fix prometheus null issues
2023-02-24 17:12:57 +08:00
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
2023-02-23 20:43:05 +08:00
1d4af39820
Fixed JSDoc for one method
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-15 19:31:22 +00:00
dd1d71530f
sorted tags on dashboard
...
see https://github.com/louislam/uptime-kuma/issues/2785
2023-02-15 14:06:29 -05:00
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-14 22:41:06 +00:00
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2023-02-14 19:53:33 +00:00
ee2eb5109b
Added basic web interface for API keys
...
Web interfaces for manging API keys have been added however translation
keys are still required.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-14 19:49:04 +00:00
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-11 23:56:38 +03:00
c12b06348b
Fix parsing issues of status page's og tags
2023-02-10 17:29:32 +08:00
43941fa2c6
feat: add mtls authen method in http/http keyword
2023-02-07 09:40:47 +07:00
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
5f2affb38c
Relocate and fix jsesc issue
2023-02-04 16:58:39 +08:00
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2023-02-04 15:40:13 +08:00
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-04 00:03:05 +03:00
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
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
2023-02-02 21:51:03 +00:00
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2023-02-02 21:51:03 +00:00
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2023-02-02 21:51:03 +00:00
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2023-02-02 21:51:03 +00:00
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-28 15:47:42 +03:00
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
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
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
2023-01-25 16:12:33 +08:00
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2023-01-25 00:22:51 +08:00
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2023-01-25 00:19:54 +08:00
c4c720027c
Fix: Use correct log call format
2023-01-24 23:47:33 +08:00
83e0401dd8
Show game list for GameDig monitor
2023-01-24 23:03:01 +08:00
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2023-01-24 19:44:21 +08:00
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2023-01-24 10:32:49 +00:00
aef85078eb
reorder fix
2023-01-20 12:29:56 +03:00
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-20 12:27:28 +03:00
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2023-01-18 09:53:04 +08: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
e48a987b9c
Merge remote-tracking branch 'origin/master' into mongodb-ping
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
# src/pages/EditMonitor.vue
2023-01-15 01:13:11 +08:00
be850dd596
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/languages/en.js
2023-01-14 16:40:13 +03:00
3adc9e65d6
Add only xml support to http monitors
2023-01-14 16:33:21 +03:00
db757123ba
refactor: reuse databaseConnectionString
2023-01-13 16:32:49 +08:00
Louis Lam
tombii
Matthew Nickson
Luke Hamburg
Faruk Genç
Suriya Soutmun
Joseph
c
Nelson Chan
Thomas Spalinger
long2ice