7532acc95d
Resolve conflicts
3 years ago
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
3 years ago
07c0801ad5
Make logout button reactive, improve dropdown menu css
3 years ago
cb55e23718
Add $root.username
3 years ago
d71c086447
Standardize array bracket spacing
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
f030487f7d
Fix theme color that do not apply to status page with a custom domain
3 years ago
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
3 years ago
82ea896bbc
Improve the workflow of cloudflared
3 years ago
f1f4b3b377
Add reverse proxy setting page for controlling cloudflared
3 years ago
40991fbc28
Show reverse proxy guide along with websocket error
3 years ago
220e46bc83
[Status Page] Fix theme bug
3 years ago
27bfae67af
[Status Page] Add a new status page
3 years ago
502c7f87e7
[Status Page] Listing: Better loading effect
3 years ago
7c7dbf68c1
[Status Page] wip, sidebar for editor
3 years ago
d765b1c57a
Merge branch 'master' into restructure-status-page
...
# Conflicts:
# src/pages/StatusPage.vue
3 years ago
b9dfcd1291
[Favicon] Code refactoring
3 years ago
04d93c2747
Merge branch 'master' into willianrod_feat/add-favicon-badges
...
# Conflicts:
# package-lock.json
# src/mixins/socket.js
3 years ago
50d6e888c2
[new status page] wip
3 years ago
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
3 years ago
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
c50b2b636a
[lazy load lang] load the language file on create
3 years ago
50593f3edf
[wip] lazy load language file
3 years ago
95bae8289d
Fix setting page when disabled auth
3 years ago
1dbf1c3dea
fix logout
3 years ago
036218f711
Add badges to favicon
3 years ago
b83c59e308
WIP: Add options for chart period
...
Fix: Fix callback, add toast on error
Fix: Improve styling
Fix: Restore default chart behavior
Fix: Replace 1h with 3h
draft only
3 years ago
182597944d
fix #721
3 years ago
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
3 years ago
73bf1216d1
[wip] more test
3 years ago
13bdfefa9d
Feat: Improve Certificaet Info Display
3 years ago
3394e1f148
fix undefined callback
3 years ago
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
f9d633e02b
Display created and updated time in local timezone. Fixes #491
3 years ago
87e213085f
add /status, alias of /status-page ( #471 )
3 years ago
27d4c3c194
[status page] improve mobile layout
3 years ago
439f45d91e
[status page] improve the entry
3 years ago
15c00d9158
upload logo and expose ./data/upload to url
3 years ago
7ee98d989c
[status page] implement rest api for heartbeat
3 years ago
fd95d41d9f
[status page] many update and save group list
3 years ago
2955abb5d9
[status page] create incident
3 years ago
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
3 years ago
80322cbfe7
Merge branch 'import-export'
...
# Conflicts:
# src/languages/it-IT.js
# src/languages/nl-NL.js
3 years ago
512ff09cca
set entry page
3 years ago
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
3 years ago
9da2a01a74
[status page] checkpoint
3 years ago
35aca46b68
[status page] checkpoint
3 years ago
6e3a904aaa
WIP: Add tags functionality
...
WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version
3 years ago
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
3 years ago
d313966d80
Merge branch 'master' into import-export
3 years ago
7fee4a7ea7
Added import options
3 years ago
8cd5bad44c
Merge branch 'master' into 2fa
3 years ago
3e25f0e9d9
[Status Page] WIP: Checkpoint
3 years ago
4b0a8087a2
do not connect to socket io for status page
3 years ago
2da77d8448
fix ipv6 connection problem
3 years ago
403202d4d4
Added simple TOTP Two Factor Authentication
3 years ago
242e494cb5
Merge branch 'master' into import-export
3 years ago
da131a5156
Merge branch 'master' into clear-monitor-data
...
# Conflicts:
# src/languages/da-DK.js
# src/languages/en.js
# src/languages/es-ES.js
# src/languages/fr-FR.js
# src/languages/ja.js
# src/languages/ko-KR.js
# src/languages/nl-NL.js
# src/languages/ru-RU.js
# src/languages/sr-latn.js
# src/languages/sr.js
# src/languages/sv-SE.js
# src/languages/zh-CN.js
# src/languages/zh-HK.js
3 years ago
5837c353b7
change the default theme to auto from light
3 years ago
299506ce45
reset the heartbeat list instead of reload the page after cleared events or heartbeats
3 years ago
2f6c5963c5
Added import and export function
3 years ago
7b92166d18
Added clear all db statistics function
3 years ago
1952e34110
Added the possibility to clear monitor data
3 years ago
64498163e1
add /list for mobile
3 years ago
432388a905
Merge branch 'Ponkhy_master'
3 years ago
c9c51e47e1
add some comments
3 years ago
5e52f230b1
create datetime mixin
3 years ago
72f0724b9a
Update src/mixins/theme.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
35176a614f
Update src/mixins/theme.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8e883c9c6a
Update src/mixins/theme.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
233c5661af
Added user choice heartbeat bar
3 years ago
37f1d60f82
also change meta tag theme-color
3 years ago
7ca80fc086
fix auto theme
3 years ago
9ba1743900
split mobile mixin from socket mixin
3 years ago
123fca43a1
FEAT: darkmode ( #155 )
...
* darkmode fixes
* fix: darkmode: empty beats in active/ hovered state
* fix: color for empty beats
* fix: navbar background color
* Update src/assets/vars.scss
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
* Update src/assets/app.scss
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
* wip, split dark theme style by .dark and store light theme to normal
* add back missing css
* working switch theme button and tuning dark theme
* finish dark theme
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Co-authored-by: LouisLam <louislam@users.noreply.github.com>
3 years ago
8ebaca4c5c
improve disableAuth handling
3 years ago
6f868c9ec3
implement no auth
3 years ago
9f0be5f531
improve the connection error msg
3 years ago
4c8fdd07d9
Manual fixes
3 years ago
9648d700d7
Autofix on save
3 years ago
5b18a6a518
Merge branch 'master' into tls-expiry
...
# Conflicts:
# server/model/monitor.js
3 years ago
96c60dd94a
Feat: Add database storage for TLS info
3 years ago
ccda6f05f5
Feat: Add Barebones certificate info display
3 years ago
02230930c5
Merge branch 'master' of https://github.com/Spiritreader/uptime-kuma
3 years ago
a8b102ad4a
add retries for pinging function
...
backend:
- new field for monitor: maxretries
- new pending status while service is retrying: 2
- pending status event is not marked important
- pending pings however register as downtime in the calculation
frontend:
- added pending status while service is retrying
- added color for new pending status
- added field to configure amount of retries
database:
- IMPORTANT: THIS REQUIRES MIGRATION!!!!
- added field: maxretries with default value 0
3 years ago
77af41bfff
env default to production
3 years ago
5bd3184ebf
Use connect_error event
3 years ago
59ebe134f1
Fix indentation
3 years ago
851ceef3d5
Use `NODE_ENV` from Express and Socket.IO
3 years ago
010ebea210
show version in the footer
4 years ago
f9800a087e
optimize for mobile
4 years ago
ae07cd9c35
prepare for docker
4 years ago
5f89940ab6
add setup page
4 years ago
3bdf174e90
add telegram notification
4 years ago
d4a651e211
implement remember me
4 years ago
55bd6b6d7a
implement timezone
4 years ago
84c21b71c0
implement uptime
4 years ago
46f07fc17e
many update again
4 years ago
9fa84a0a2b
many update
4 years ago
Karel Krýda
Louis Lam
Uğur Erkan
Willian Rodrigues Barbosa
Nelson Chan
Adam Stachowicz
Ponkhy
Ponkhy
Ponkhy
Philipp Dormann
Nelson Chan
Sam