Frank Elsinga
0e3b3a9ab8
Made sure that more of the async usages are awaited ( #4574 )
8 months ago
Louis Lam
869ee8ec50
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# .github/workflows/auto-test.yml
# extra/reset-password.js
# package-lock.json
# package.json
# server/routers/status-page-router.js
# server/server.js
# server/socket-handlers/general-socket-handler.js
# server/uptime-kuma-server.js
# src/components/ActionInput.vue
# src/util.js
# src/util.ts
11 months ago
Louis Lam
482049c72b
Merge pull request from GHSA-88j4-pcx8-q4q3
...
* WIP, still need to handle npm run reset-password
* Implement it for "npm run reset-password"
Bug fixes and change along with this commit
- Move `ssl`, `hostname`, `port` to ./server/config.js, so `reset-password` is able to read it
- Fix: FBSD is missing, no idea who dropped it.
- Fix: Frontend code should not require any backend code (./server/config.js), moved "badgeConstants" to the common util (./src/util.ts) and drop vite-common.js
* Minor
11 months ago
Adam Hancock
62780001f7
Feature: remote browser support ( #3904 )
...
* [empty commit] pull request for remote browser support
* Remote browser: Added UI screens and DB tables.
* Remote browser working
* Fixing tests
* Fix tests
* Fix tests
* fix tests
* Test browser
* revert init_db.js
* Changed drop down to ActionSelect
* Fix translations
* added remote browsers toggle
* revert changes package-lock
* Fix bad english
* Set default remote browser
* Remote browsers Requested changes
* fixed description.
12 months ago
Louis Lam
e9bf02fc2c
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package-lock.json
# package.json
# server/model/monitor.js
# server/monitor-types/tailscale-ping.js
# server/socket-handlers/general-socket-handler.js
# server/uptime-kuma-server.js
12 months ago
Louis Lam
9536c6aa6a
Minor
12 months ago
Louis Lam
b689733d59
Fix getGameList, testChrome without checkLogin
12 months ago
Nelson Chan
2267655e99
Chore: Add remaining server translation keys ( #3684 )
1 year ago
Louis Lam
98b93c887a
Show push example under the detail page ( #3739 )
1 year ago
Nelson Chan
52946c3e08
Feat: Translate toast messages by adding msgi18n to callbacks ( #3263 )
...
* WIP: Add msgTranslated to callbacks
* Chore: Unify Saved period
* Feat: add support for interpolation
1 year ago
Matthew Nickson
8a92054c2b
Added JSDoc to ESLint ( #3529 )
...
* Added JSDoc to eslint rules
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Fixed JSDoc eslint errors
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Update the check-linters workflow to Node.js 20
---------
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Tarun Singh
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
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
Louis Lam
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
Peace
9bd76c2795
Merge branch 'master' into group-monitors
1 year ago
Louis Lam
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
...
Feat: Support auto theme in status pages
2 years ago
Louis Lam
227cec86a8
WIP
2 years ago
Louis Lam
02291730fe
WIP
2 years ago
Nelson Chan
150607cc93
Feat: Support auto theme in status pages
2 years ago
Matthew Nickson
669f8700b2
Switched to nanoid for key generation
...
To try and prevent any security issues, use an external package to
generate key instead of doing it ourselves. Note: we have to use nanoid
version 3 as nanoid version 4 requires ESM. Currently, nanoid v3 is
still supported.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key
2 years ago
Matthew Nickson
42a69c16ca
Switched to crypto.randomBytes fpr key generation
...
Keys are now 32 bytes long encoded in a URL safe base64 string
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
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
Nelson Chan
c65a920050
Chore: Fix code comment
2 years ago
Nelson Chan
7b8ed01f27
Fix: getGameList returns nothing on first run
2 years ago
Peace
cef0a0faf4
Merge branch 'master' into group-monitors
2 years ago
Matthew Nickson
e7feca1cd6
Added API key authentication handler
...
API key authentication is now possible by making use of the X-API-Key
header. API authentication will only be enabled when a user adds their
first API key, up until this point, they can still use their username
and password to authenticate with API endpoints. After the user adds
their first API key, they may only use API keys in future to
authenticate with the API.
In this commit, the prometheus /metrics endpoint has been changed over
to the new authentication system.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
Matthew Nickson
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>
2 years ago
c
a823ed8ccc
Feature - Google Analytics - Removed unused import.
2 years ago
c
913bb611d5
Feature - Google Analytics - Removed regex to validate a Google Analytics tag.
2 years ago
c
2b3a3895b3
Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895
2 years ago
c
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2 years ago
Peace
2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace
f3ac351d75
feat: set childs under maintenance if parent is too
2 years ago
Louis Lam
ddce8f0cb0
Fix plugin installation
2 years ago
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2 years ago
Louis Lam
83e0401dd8
Show game list for GameDig monitor
2 years ago
Louis Lam
e88e10cc8e
Fix #2494
2 years ago
Louis Lam
df21f7da76
Check login for initServerTimezone
2 years ago
Louis Lam
39987ba9ac
Init server timezone
2 years ago
Louis Lam
e478084ff9
Fix Uptime Kuma cannot be stopped
2 years ago
Louis Lam
e07aa982c3
WIP
2 years ago
Louis Lam
c1ccaa7a9f
WIP
2 years ago
Louis Lam
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2 years ago
Louis Lam
0686757160
[Docker Monitor] Change `tcp://` to `http://`
2 years ago
Louis Lam
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2 years ago
Louis Lam
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2 years ago