Louis Lam
d16be6fb7d
Fix and use null as authMethod None instead of empty string
2022-06-14 10:49:30 +08:00
Louis Lam
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2022-06-14 10:36:29 +08:00
Louis Lam
817f6db4fd
Remove SQL Server code (which in another pr already)
2022-06-14 10:32:38 +08:00
Louis Lam
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2022-06-13 20:56:14 +08:00
Louis Lam
f4f2b8ddb8
Try to fix #1658
2022-06-13 19:24:05 +08:00
Louis Lam
d4485fe62f
Make the monitor type list a bit clear
2022-06-13 18:14:47 +08:00
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2022-06-11 20:59:58 +08:00
Louis Lam
6ee7b3696a
Merge pull request #1633 from domingospanta/bugfix/1451_blank_page_on_unkown_resource
...
Bugfix/1451 blank page on unkown resource
2022-06-06 21:54:49 +08:00
Matthew Nickson
0e28707307
Minor formatting for JSDoc comments
...
Added a number of minor formatting changes to JSDoc comments in /src
2022-06-02 15:15:21 +01:00
Matthew Nickson
b0476cfb5b
Added JSDoc for src/pages/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-02 13:46:44 +01:00
Louis Lam
091158cfe7
[Status Page] Preload data
2022-06-01 13:05:12 +08:00
Nelson Chan
26ff6f45a0
Feat: Use i18n pluralization
2022-05-30 17:53:32 +08:00
Louis Lam
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08:00
Moritz R
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
Louis Lam
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2022-05-25 14:59:14 +08:00
Domingos F. Panta Jr
73b965c867
Merge branch 'master' into bugfix/1451_blank_page_on_unkown_resource
2022-05-19 19:35:58 +01:00
c0derMo
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
Moritz R
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
Nelson Chan
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
Louis Lam
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2022-05-18 19:49:54 +08:00
Alexis Lefebvre
175556f9fc
s/cros/CORS
2022-05-16 20:30:16 +02:00
Louis Lam
7a50f0e3f3
Merge pull request #1589 from AnnAngela/1.15.1_zh-CN
...
Improve translation work
2022-05-17 00:03:25 +08:00
Christopher Pickering
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
Christopher Pickering
b7dc8e3ef8
started ui update
2022-05-13 07:22:52 -05:00
Christopher Pickering
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
Domingos Panta
7cc89979f0
Moving change from axios interceptor to specific request.
2022-05-12 15:52:21 +01:00
Sascha Kruse
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
Domingos Panta
fdd781b081
Added a link to the home page on the lists of actions.
...
s new link was necessary to prevent a loop when the user tries to access a unknown resource, like status/123, and was redirected to /page-not-found. In this case going back to the last page would be /status/123 which does not exists.
2022-05-11 17:58:52 +01:00
Karel Krýda
42f931f6cf
Merge branch 'master' into master
2022-05-09 10:28:14 +02:00
Louis Lam
5bf58cc6c4
Merge pull request #1595 from Saibamen/fix_eslint
...
Fix ESLint warnings and errors
2022-05-09 13:55:08 +08:00
Karel Krýda
2fe5c090aa
small fixes
2022-05-08 20:50:08 +02:00
Karel Krýda
ed218e73bb
UI improvements
2022-05-08 20:03:24 +02:00
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
Adam Stachowicz
069d3765f0
Revert change for StatusPage
2022-05-02 01:13:17 +02:00
Karel Krýda
2b14bdae62
Merge branch 'master' into master
2022-05-01 12:40:34 +02:00
Karel Krýda
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
2022-04-30 17:17:22 +02:00
Louis Lam
db50ba91cc
Fix #1593
2022-04-30 21:44:03 +08:00
Karel Krýda
57368c8c6c
More modern look of maintenance information on status page (same design as for the new incident system)
2022-04-30 15:32:56 +02:00
Karel Krýda
11ef22edec
Fixed remaining lint errors
2022-04-30 15:13:13 +02:00
Karel Krýda
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
Karel Krýda
7532acc95d
Resolve conflicts
2022-04-30 14:33:54 +02:00
Karel Krýda
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
2022-04-30 13:40:34 +02:00
Adam Stachowicz
c114c053d6
Fix ESLint warnings and errors
2022-04-30 03:51:14 +02:00
AnnAngela-work
45da7c5431
Improve translation work
2022-04-29 20:17:15 +08:00
Louis Lam
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
2022-04-28 23:34:51 +08:00
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
Adam Stachowicz
1e595eaa76
Update linters
2022-04-26 01:26:57 +02:00
Dick Tang
db3ef3805b
correct wordings for Certificate Expiry Notification ( #1554 )
2022-04-25 08:25:06 +08:00
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
OidaTiftla
052fde5a24
Fix casing of text label
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:56:38 +02:00
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
Louis Lam
07c0801ad5
Make logout button reactive, improve dropdown menu css
2022-04-20 22:39:07 +08:00
Louis Lam
bdc23a3f57
Merge pull request #1519 from AnnAngela/1.15.0_zh-cn
...
Update en&zh-CN lang file with 1 new i18n entry
2022-04-19 23:48:07 +08:00
AnnAngela-work
18925293fb
Update en&zh-CN lang file with 1 new i18n entry
2022-04-19 10:48:20 +08:00
Louis Lam
17d4003e5c
Add dropdown menu
2022-04-19 00:39:49 +08:00
Nelson Chan
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
2022-04-18 13:04:55 +08:00
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
Louis Lam
572f2b9838
eslint
2022-04-17 14:57:31 +08:00
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2022-04-17 14:53:13 +08:00
Louis Lam
1bc01d1077
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
2022-04-17 13:21:41 +08:00
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2022-04-17 01:39:49 +08:00
Louis Lam
136fdf3768
MQTT password field to password type
2022-04-17 01:07:36 +08:00
Louis Lam
566133e350
Domain Name Expiry Notification for https monitor only
2022-04-16 15:01:53 +08:00
Louis Lam
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2022-04-16 13:28:39 +08:00
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-13 21:24:04 +01:00
Matthew Nickson
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-13 21:02:19 +01:00
Louis Lam
3436e26ed4
Fix styleline, fix css format issues globally
2022-04-14 01:20:54 +08:00
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
2022-04-14 01:20:54 +08:00
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
Louis Lam
81de2eedfb
Fix template can contain one tag only, disable vue/require-component-is eslint rule
2022-04-12 20:23:11 +08:00
Louis Lam
4a6d7207ef
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
# src/languages/en.js
# src/pages/StatusPage.vue
2022-04-12 19:39:42 +08:00
Louis Lam
f030487f7d
Fix theme color that do not apply to status page with a custom domain
2022-04-10 13:46:00 +08:00
Louis Lam
c9fa183712
Manage domain names
2022-04-10 00:25:27 +08:00
Louis Lam
0b9b5102ec
Minor
2022-04-09 17:23:22 +08:00
Louis Lam
c399984b7f
Improve status page sidebar
2022-04-09 17:03:10 +08:00
Louis Lam
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2022-04-09 16:07:09 +08:00
Louis Lam
2e50ef0e8f
Merge pull request #1450 from AnnAngela/1.14.0-zh_cn
...
1.14.0 translation improvement
2022-04-09 14:40:38 +08:00
Louis Lam
fcb577097b
[Proxy] Change to radio button
2022-04-07 15:26:00 +08:00
Louis Lam
e89356b283
Show proxy option for http monitor only
2022-04-07 14:37:33 +08:00
Louis Lam
c4e74c9943
Render <StatusPage> if domain matched
2022-04-06 22:43:22 +08:00
Louis Lam
355aec46dc
Merge branch 'master' into status-page-domain
2022-04-05 22:59:39 +08:00
Louis Lam
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
Louis Lam
4b99160b1f
Fix "Check Update" is not checked by default
2022-04-05 19:43:23 +08:00
AnnAngela
706d6cee07
Update some components to use i18n function, update en & zh-CN translation
2022-04-04 11:33:02 +08:00
Moritz R
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
Louis Lam
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
2022-04-01 14:57:35 +08:00
Louis Lam
aef7719426
Merge pull request #1435 from LoaderB0T/favico
...
feat: Favicon is updated based on satus page logo
2022-03-31 21:32:13 +08:00
Louis Lam
514b9fb68a
Add remark
2022-03-31 21:30:07 +08:00
Janik Schumacher
73b338bba6
feat: Favicon is updated based on satus page logo
2022-03-30 12:09:38 +02:00
Louis Lam
f1f4b3b377
Add reverse proxy setting page for controlling cloudflared
2022-03-30 01:49:45 +08:00
Louis Lam
0da6e6b1fb
Some improvements
2022-03-29 17:38:48 +08:00
OidaTiftla
91366ff565
Merge branch 'master' into introduce-resend-interval
2022-03-27 21:19:57 +02:00
Louis Lam
f6272155af
Show page not found for invalid routes
2022-03-26 02:09:12 +08:00
Louis Lam
1ecd2e45d0
[Status Page] Plan to support domain names for status pages
2022-03-25 18:59:06 +08:00
Louis Lam
28d72fcd08
Fix #1409 , slug cannot be empty
2022-03-24 23:43:07 +08:00
Louis Lam
fb9a206542
[Status Page] Fix - show no status page
2022-03-18 21:47:14 +08:00
Louis Lam
aef0a66205
[Status Page] Simplify show tags logic
2022-03-18 17:56:46 +08:00
Louis Lam
37be7df9b0
[Status Page] Delete status page
2022-03-18 15:19:52 +08:00
Louis Lam
8d981c8f0b
[Status Page] Fix migration and unpin incident
2022-03-18 14:14:22 +08:00
Louis Lam
220e46bc83
[Status Page] Fix theme bug
2022-03-18 12:57:37 +08:00
Louis Lam
59cdacc052
[Status Page] Enable Edit Mode only if the token is presented
2022-03-18 12:39:48 +08:00
Louis Lam
00738edbe7
[Status Page] Add ?edit
2022-03-18 00:00:56 +08:00
Louis Lam
27bfae67af
[Status Page] Add a new status page
2022-03-17 23:38:43 +08:00
Louis Lam
719a136d1e
[Status Page] Improved entry page
2022-03-17 22:44:47 +08:00
Louis Lam
502c7f87e7
[Status Page] Listing: Better loading effect
2022-03-17 19:07:05 +08:00
Louis Lam
c0c6419980
[Status Page] align icon and title using flexbox
2022-03-17 17:07:23 +08:00
Louis Lam
e87cdf4d09
[Status Page] wip, upload logo and status page listing
2022-03-17 16:42:26 +08:00
Louis Lam
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
2022-03-16 15:38:10 +08:00
Louis Lam
18ec42b060
[Status Page] wip
2022-03-16 14:14:47 +08:00
Louis Lam
7c7dbf68c1
[Status Page] wip, sidebar for editor
2022-03-15 12:00:29 +08:00
Louis Lam
d765b1c57a
Merge branch 'master' into restructure-status-page
...
# Conflicts:
# src/pages/StatusPage.vue
2022-03-12 15:50:42 +08:00
Louis Lam
c68f7944e3
[Favicon] minor
2022-03-12 15:31:01 +08:00
Louis Lam
a9efdabcec
[Favicon] Prevent error when no heartbeat
2022-03-12 15:30:02 +08:00
Louis Lam
b9dfcd1291
[Favicon] Code refactoring
2022-03-12 15:10:45 +08:00
Louis Lam
04d93c2747
Merge branch 'master' into willianrod_feat/add-favicon-badges
...
# Conflicts:
# package-lock.json
# src/mixins/socket.js
2022-03-12 11:17:32 +08:00
Louis Lam
50d6e888c2
[new status page] wip
2022-03-10 21:34:30 +08:00
Uğur Erkan
8078d0618d
Add socks proxy support to proxy feature
...
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
and moved under proxy class.
Thanks for suggestion @thomasleveil
2022-03-06 19:34:51 +03:00
Uğur Erkan
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
2022-03-06 19:34:49 +03:00
Louis Lam
88c3d952d3
Improve settings page's UI/UX on mobile
2022-03-04 23:20:42 +08:00
Karel Krýda
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
2022-01-24 22:33:15 +01:00
OidaTiftla
855b12f435
Add text for resend disabled
2022-01-24 22:20:38 +01:00
OidaTiftla
30ce53f57c
Fix min value of resend interval
2022-01-24 09:18:38 +01:00
Karel Krýda
5fda1f0f59
minor fixes (missing commas, spaces, translations)
2022-01-23 20:33:39 +01:00
OidaTiftla
11e9eee09d
Change seconds to minutes
2022-01-23 17:48:09 +01:00
OidaTiftla
1ac904d6d6
Introduce resend interval if down
2022-01-23 15:22:57 +01:00
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
2022-01-23 15:22:00 +01:00
c0derMo
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
2022-01-22 01:57:37 +00:00
Hans Mayer
c679613f7e
Updates some DE translations, fix typo in resolverserverDescription, removes some duplicates in languages
2022-01-14 19:06:21 +01:00
c0derMo
4818bb67d6
Added trailing comma, fixed spelling & translation
2022-01-14 09:09:37 +00:00
c0derMo
b0259b5592
Added docker container monitor
2022-01-13 16:17:07 +00:00
Louis Lam
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
2022-01-13 11:53:08 +08:00
Louis Lam
1c8407a433
[MQTT] Use existing fields instead of creating new ones (UI)
2022-01-13 11:36:55 +08:00
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2022-01-13 11:09:16 +08:00
Jakub Blažej
3d002b3ce9
add status boolean parameter to push monitor
2021-12-25 20:25:21 +01:00
Patrick Hafner
9ee591417d
Footer HTML support, updated german translation
2021-12-25 04:09:41 +01:00
Patrick Hafner
3a12e209da
Edit: editMode check before toggle
2021-12-21 03:55:25 +01:00
Patrick Hafner
931ca6a3ef
Add: customize status page (css and poweredby)
2021-12-21 03:27:05 +01:00
Tarun Singh
d3c90df8a8
fixed edit monitor fields empty issues
2021-12-18 16:35:18 -05:00
Ivan Bratović
475a466c7e
Add attribute to basicauth-pass to prevent browsers from autocompleting ( #1063 )
2021-12-15 18:18:30 +08:00
Juan Cruz Vincenti
fbf2df9e7a
Add conditional rendering to description
...
* Modify Details component
* Modify MonitorList component
2021-12-14 19:11:32 -03:00
Juan Cruz Vincenti
934d633d4d
Add description to monitor
...
* Add description to monitor model
* Add description field to database
* Add english and spanish translation for description
* Closes : #482
2021-12-14 19:11:32 -03:00
Louis Lam
a4841eb8aa
Fix #1016 , .at() is not support in Safari
2021-12-09 01:19:09 +08:00
Tarun Singh
5afc6a41e3
removed https requirement for url
2021-12-06 11:28:23 -05:00
Ivan Bratović
d95258e7db
Merge remote-tracking branch 'upstream/master' into improve-translatables
2021-11-29 12:51:08 +01:00
Ivan Bratović
c1b118a0f6
Use existing Example translation for HTTP headers and body placeholders
2021-11-29 12:49:08 +01:00
Ivan Bratović
9c5466890e
Revert "Replace body and header placeholder functions with translations"
...
This reverts commit 2c85491ee0
2021-11-29 12:40:53 +01:00
Louis Lam
aea128a85b
make settings' menu reactive
2021-11-29 16:50:00 +08:00
Ivan Bratović
2ca7a5b962
Merge branch 'master' into improve-translatables
2021-11-24 10:03:30 +01:00
Louis Lam
a1f9a82537
Merge pull request #884 from thomasleveil/ux/add-group-at-the-top
...
🚸 Status page - add group action adds the new group at the top
2021-11-24 11:48:58 +08:00
Louis Lam
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
2021-11-23 22:48:54 +08:00
Louis
4155f84eec
improve basic auth style
2021-11-23 19:20:55 +08:00
Nelson Chan
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
2021-11-17 10:45:19 +08:00
Nelson Chan
1a218aaa17
Fix: Fix page transition & improve active handling
...
Fix: Fix current route parsing
2021-11-17 10:45:19 +08:00
Nelson Chan
369cad90c1
WIP: Convert to use vue-router & improve layout
...
WIP: Fix security page & improve layout
WIP: Fix displaying current page
UI: Improve spacing
Chore: Improve styling
2021-11-17 10:45:18 +08:00
Nelson Chan
f9bb48de13
WIP: Convert Settings to components
2021-11-17 10:45:18 +08:00
Tarun Singh
3f5133d1ba
Added authentication logic
2021-11-16 20:44:10 -05:00
Ivan
567ea346fe
Add missing translations for placeholders in EditMonitor page
2021-11-12 15:30:31 +01:00
Ivan
b1fca7c1a7
Add translation of toast success message
2021-11-12 12:00:10 +01:00
Ivan
19dd11d624
Add translation for incident error message
2021-11-12 10:14:23 +01:00
Ivan
42ce34b6c7
Add more Status page tranlations
2021-11-12 09:54:31 +01:00
Ivan
b7a9d1474f
Fix translation of selected incident style
2021-11-12 09:53:41 +01:00
Ivan
b0615d347b
Add incident creation translations
2021-11-11 11:07:48 +01:00
Ivan
265cca9ed1
Replace "Default" notification badge with translation
2021-11-11 10:54:09 +01:00
Ivan
267654c987
Replace hard-coded names for groups in Status page with translations
2021-11-11 10:53:38 +01:00
Ivan
2c85491ee0
Replace body and header placeholder functions with translations
2021-11-11 10:52:22 +01:00
Tarun Singh
3721d11259
changed table column names for more specifity
2021-11-09 18:53:00 -05:00
Louis Lam
95bae8289d
Fix setting page when disabled auth
2021-11-09 22:37:05 +08:00
Ivan Bratović
34d8984e3a
Merge branch 'master' into http-basicauth
2021-11-07 17:15:36 +01:00
Jasper Miller-Waugh
e4506963d9
Merge branch 'louislam:master' into tags-on-status
2021-11-07 14:39:43 +13:00
Thomas LEVEIL
baf3612ece
🚸 Status page - add group action adds the new group at the top of the page
2021-11-05 11:27:19 +01:00
Tarun Singh
149015556b
server url changes
2021-11-04 22:25:29 -04:00
Tarun Singh
2bcbeba384
update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-04 22:23:02 -04:00
Ivan Bratović
0481a241f3
Add translated placeholders for editing basic auth
2021-11-04 10:22:42 +01:00
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
2021-11-04 10:14:17 +01:00
Ivan Bratović
0dcb7aed21
Delinting
2021-11-04 09:50:10 +01:00
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
2021-11-04 09:50:10 +01:00
Tarun Singh
6828e8ef6d
Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma
2021-11-03 21:47:44 -04:00
Tarun Singh
670754b697
added MQTT monitor type
2021-11-03 21:46:43 -04:00
Jasper Miller-Waugh
e5d6410caf
Apply formatting suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-03 11:46:53 +13:00
Jasper Miller-Waugh
191b81ee07
Fix grammer in comment
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2021-11-01 22:14:41 +13:00
Jasper Miller-Waugh
12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool.
...
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the tagsVisible setting in the database to fix.
2021-11-01 13:23:46 +13:00
Jasper Miller-Waugh
4004926e64
Small formatting changes from code-review
...
Co-authored-by: deef <deef551@gmail.com>
2021-11-01 12:52:21 +13:00
Jasper Miller-Waugh
b32bfb3ff1
Added toggle for tag visibility
2021-10-30 21:16:10 +13:00
Willian Rodrigues Barbosa
036218f711
Add badges to favicon
2021-10-29 22:25:32 -03:00
Adam Stachowicz
f2a27a2cf1
Use hideCount option for pagination
2021-10-29 13:37:38 +02:00
Louis Lam
5311bef3eb
Merge pull request #809 from Saibamen/pagination_no_text
...
Don't display "count" text for pagination
2021-10-29 16:05:59 +08:00
Louis Lam
c400595f67
Merge pull request #825 from SiderealArt/patch-1
...
Add Traditional Chinese (Taiwan) translation
2021-10-29 16:05:01 +08:00
SiderealArt
947fc6001e
Update Settings.vue
2021-10-29 15:43:21 +08:00
Ivan Bratović
b2fbd7e263
Add confirmDisableAuth tranlation for hr-HR
2021-10-28 16:04:56 +02:00
Louis Lam
de5cce9d90
Steam API Key to HiddenInput
2021-10-27 23:03:03 +08:00
Louis Lam
71884cf42a
Merge pull request #772 from andreasbrett/patch-6
...
show logged in user on settings page
2021-10-27 10:24:45 +08:00
Adam Stachowicz
2e7ad1b7b2
Don't display "count" text for pagination
2021-10-26 18:03:49 +02:00
Louis Lam
a9e319517a
add auto vacuum and shrink database button
2021-10-26 23:02:32 +08:00
Andreas Brett
8fb8cbdaf3
use auth0/jwt-decode
2021-10-26 13:15:31 +02:00
Andreas Brett
3f3d8b4eb3
fixes
2021-10-26 12:58:04 +02:00
Andreas Brett
4fc2603818
Merge branch 'patch-6' of https://github.com/andreasbrett/uptime-kuma into patch-6
2021-10-25 01:34:06 +02:00
Andreas Brett
7bc38d4231
remove unused vars
2021-10-25 01:33:45 +02:00
Andreas Brett
daad63d70b
Merge branch 'master' into patch-6
2021-10-25 01:24:31 +02:00
Andreas Brett
9ddd2c7365
use jwt
2021-10-25 01:23:02 +02:00
Adam Stachowicz
1239f6d1a2
PL update + fixes
2021-10-24 21:50:02 +02:00
Louis Lam
c9549c0de2
change body and header placeholders, less misleading.
2021-10-23 22:14:05 +08:00
Andreas Brett
606c967985
Merge branch 'master' into patch-6
2021-10-23 01:52:54 +02:00
Andreas Brett
9ad8e5f56a
show logged in user
2021-10-22 13:05:52 +02:00
NeuralMiner
572a5300aa
Recommended updates.
2021-10-18 13:25:53 -06:00
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges
2021-10-18 12:57:28 -06:00
Louis Lam
182597944d
fix #721
2021-10-19 00:19:26 +08:00
Louis Lam
20d59e5a13
fix and move the steam api key to settings page
2021-10-18 17:02:05 +08:00
Louis Lam
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
2021-10-18 15:50:35 +08:00
Louis Lam
6944b35ea7
Merge pull request #667 from zsxeee/i18n
...
Missing i18n and zh-CN translation
2021-10-16 22:47:58 +08:00
Louis Lam
edcaf93446
Merge pull request #721 from dpatrongomez/master
...
Add Status Translation
2021-10-16 17:41:46 +08:00
Daniel Patrón Gómez
53a008ae2b
Add Status Translation
2021-10-16 11:32:15 +02:00
Bert Verhelst
61627545a5
fix(edit-monitor): no need to escape placeholder {} if not translated
2021-10-16 11:26:32 +02:00
Louis Lam
cb43ecb46e
Merge branch 'master' into background-jobs
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
2021-10-16 15:06:59 +08:00
NeuralMiner
8cb26d2b31
Text update
2021-10-15 19:12:09 -06:00
januridp
76e619c066
Fix(Language): Bahasa Indonesia (Indonesian)
2021-10-16 07:36:07 +07:00
Louis Lam
f4b8da0a5c
Merge branch 'feature/add-support-for-method-body-and-headers'
2021-10-15 19:02:49 +08:00
Louis Lam
4178983df3
Merge remote-tracking branch 'origin/master'
2021-10-15 19:01:04 +08:00
Louis Lam
7ac0ab2e34
[http options] beautify the json format when clicked the save button
2021-10-15 18:57:27 +08:00
Louis Lam
cd211a6be7
[http options] fine tune
2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-15 16:07:05 +08:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject
...
Add support for custom subject in emails
2021-10-15 00:54:31 +08:00
Louis Lam
3b74b727f2
[Push Type] fix missing important flag and missing up notification
2021-10-14 22:32:15 +08:00
Louis Lam
8338881927
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
2021-10-14 16:07:25 +08:00
zsxeee
33f773fcd0
Move param out of the translation file
2021-10-13 15:36:07 +08:00
KangAlleW
2939bd4138
fix locale
2021-10-13 03:12:26 +07:00
KangAlleW
4b9f0a3fe6
add indonesian language and edit settings.vue
2021-10-13 02:53:46 +07:00
Nelson Chan
03b07730d3
Fix: Increase default kept period
2021-10-12 23:28:21 +08:00
zsxeee
3fe91c52cb
Fix i18n
...
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
2021-10-12 16:29:18 +08:00
Daniel S. Billing
62805014df
Update Settings.vue
2021-10-10 18:38:19 +02:00
Bert Verhelst
8a739af5ad
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
2021-10-09 21:44:22 +02:00
Nelson Chan
6cf2eb036d
Fix: Improve settings layout and wording
2021-10-09 23:51:05 +08:00
Nelson Chan
dca5a59dbc
Feat: Implement data clearing logic & frontend
2021-10-09 23:33:47 +08:00
LouisLam
cac0a46bac
fix error if tls info object is in old format
2021-10-09 19:08:38 +08:00
Bert Verhelst
d71d27220b
fix(edit-monitor): store headers as JSON
2021-10-09 12:42:32 +02:00
Bert Verhelst
b8093e909b
fix(edit-monitor): fix minification of translations containing { }
2021-10-09 11:38:12 +02:00
Bert Verhelst
c3c273f9df
fix(edit-monitor): fix regex to allow a single header
2021-10-09 11:20:33 +02:00
Bert Verhelst
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-09 11:13:16 +02:00
LouisLam
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
2021-10-08 20:03:52 +08:00
Bert Verhelst
ec4b7e4064
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-07 18:22:59 +02:00
LouisLam
2c19aef4dc
minor
2021-10-07 18:06:43 +08:00
LouisLam
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
2021-10-07 17:39:58 +08:00
LouisLam
d08a71ab49
Set primary base url in settings page
2021-10-07 16:30:16 +08:00
LouisLam
ed67803af8
improve minor style
2021-10-07 16:10:21 +08:00
Bert Verhelst
8be4bf0e16
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-07 08:56:29 +02:00
MrEddX
9f5bf37a96
Update Settings.vue
2021-10-07 09:37:13 +03:00
Nelson Chan
a87595a849
Fix: Allow underscore in hostname
2021-10-07 03:29:42 +08:00
Bert Verhelst
550825927c
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-05 18:19:07 +02:00
Louis Lam
865b721b79
Merge pull request #519 from chakflying/improve-certInfo
...
Feat: Improve Certificate Info Display
2021-10-05 16:09:08 +08:00
Bert Verhelst
afeb424dc0
fix(edit-monitor): add translations to en.js
2021-10-05 09:20:24 +02:00
Bert Verhelst
6b44116245
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-05 08:54:40 +02:00
Bert Verhelst
7ee89fab5c
fix(edit-monitor): Make json capitalised
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-04 11:29:43 +02:00
Csábi Béla
980342546e
Merge branch 'hu'
2021-10-03 23:38:13 +02:00
Csábi Béla
6b60dc9630
Initial Hungarian translation
2021-10-03 23:15:34 +02:00
Csábi Béla
8d22b43f24
Revert "Initial Hungarian translation"
...
This reverts commit dad58341c6
2021-10-03 23:11:19 +02:00
Csábi Béla
dad58341c6
Initial Hungarian translation
2021-10-03 23:09:17 +02:00
Bert Verhelst
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
2021-10-02 16:48:27 +02:00
Bert Verhelst
c2a560e2ed
fix(setup): increase left padding input fields + avoid clipping
2021-10-01 14:57:31 +02:00
Nelson Chan
13bdfefa9d
Feat: Improve Certificaet Info Display
2021-10-01 18:56:28 +08:00
LouisLam
7fa1cb83af
[push type] add ping parameter
2021-10-01 16:43:11 +08:00
Louis Lam
9d079eeec0
Merge pull request #487 from cmandesign/feature/fa-lang-rtl
...
Feature/fa lang rtl
2021-10-01 16:28:20 +08:00
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
Louis Lam
9e95d568c2
Merge pull request #501 from Saibamen/incident_use_local_timezone
...
[status-page] Display created and updated time in local timezone. Fixes #491
2021-09-30 18:13:55 +08:00
Nelson Chan
ba4a4aaf1c
Chore: Move multiselect css to own file
2021-09-30 00:08:37 +08:00
Soroosh
f2c7308c96
Fixed Change Language Direction In Setting Page
2021-09-29 10:44:34 +03:30
MrEddX
0f66e5cfc5
Added Bulgarian Language
2021-09-28 23:21:59 +03:00
Denis Freund
efbadd0737
only allow ip address for hostname when monitor type is steam
2021-09-28 13:38:46 +02:00
Adam Stachowicz
f9d633e02b
Display created and updated time in local timezone. Fixes #491
2021-09-28 08:07:42 +02:00
Denis Freund
b67b4d5afd
add steam gameserver for monitoring
2021-09-27 11:17:57 +02:00
Soroosh
1448de7b19
Update some translations
2021-09-27 00:32:51 +03:30
Soroosh
47749ca58d
Replace some hardcoded with translations
2021-09-26 19:56:43 +03:30
Soroosh
04b7a4a423
Merge Conflict Resolved
...
Farsi Lang Updated
Some hardcoded words has been replaced with translations
2021-09-26 19:56:25 +03:30
Soroosh
f41e95921f
Enable localization for pagination
2021-09-26 18:50:12 +03:30
LouisLam
87e213085f
add /status, alias of /status-page ( #471 )
2021-09-25 22:44:29 +08:00
Louis Lam
3d79e841c9
Merge pull request #466 from chakflying/public-dashboard
...
[status-page] hide select if no monitors to add
2021-09-24 18:33:00 +08:00
Nelson Chan
d2af42e579
Fix: Add placeholder if no monitors to add
2021-09-24 16:51:53 +08:00
LouisLam
50b868e751
fix #465
2021-09-24 15:26:48 +08:00
LouisLam
266b03fbf7
language key from "Status Page Nothing" to "statusPageNothing"
2021-09-24 14:42:54 +08:00
Mawoka
69bb6ef290
Removed empty selector if no monitor available
2021-09-24 00:19:09 +08:00
Cosmo Abdon
a4cad3db65
add: BR Portuguese Language and new words
2021-09-23 09:42:33 -03:00
Louis Lam
a9bb8ae6a1
Merge pull request #124 from chakflying/public-dashboard
...
Implement Public Dashboard
2021-09-23 16:54:07 +08:00
LouisLam
27d4c3c194
[status page] improve mobile layout
2021-09-23 16:31:45 +08:00
LouisLam
439f45d91e
[status page] improve the entry
2021-09-23 13:57:24 +08:00
Nelson Chan
45a6f364e1
Chore: Fix backslash in IP regex
2021-09-22 23:05:46 +08:00
Nelson Chan
95391be2ab
Revert Regex update
2021-09-22 22:36:27 +08:00
LouisLam
ad1bb93730
[status page] fix logo url
2021-09-22 15:31:15 +08:00
LouisLam
fe0fc63843
[status page] send uptime
2021-09-22 15:10:08 +08:00
Nelson Chan
5b2e1f6086
Fix: Allow number ending TLD
2021-09-22 05:29:56 +08:00
LouisLam
8c7ee94769
add modified apicache library with disabling client cache
2021-09-22 00:58:22 +08:00
LouisLam
0834770509
[status page] also apply the title to <title>
2021-09-21 23:59:46 +08:00
LouisLam
15c00d9158
upload logo and expose ./data/upload to url
2021-09-21 21:22:35 +08:00
Nelson Chan
d2b34f9285
Chore: make eslint happy
2021-09-21 18:53:45 +08:00
Nelson Chan
a96a515087
Fix: Fix hostname with dash
2021-09-21 18:44:32 +08:00
Nelson Chan
2eab919ae0
Fix: Fix typo
2021-09-21 18:41:19 +08:00
Nelson Chan
c09b67b94d
Fix: Fix TCP Ping hostname Regex
2021-09-21 18:27:40 +08:00
LouisLam
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
2021-09-20 18:48:44 +08:00
LouisLam
6aaf984f29
fix retryInterval = 0 if it is an old monitor. ( #380 https://github.com/louislam/uptime-kuma/pull/380#issuecomment-922618356 )
2021-09-20 18:23:53 +08:00
LouisLam
0b572df3d0
[status page] store config
2021-09-20 16:22:18 +08:00
LouisLam
7ee98d989c
[status page] implement rest api for heartbeat
2021-09-19 23:24:51 +08:00
Adam Stachowicz
7dc1e84e44
Avg. Ping and Avg. Response translation keys
2021-09-19 15:15:12 +02:00
LouisLam
fd95d41d9f
[status page] many update and save group list
2021-09-19 19:04:51 +08:00
LouisLam
6681f49a58
Merge branch 'master' into public-dashboard
...
# Conflicts:
# .dockerignore
2021-09-19 15:16:13 +08:00
Louis Lam
803029a9e4
Merge pull request #429 from Ponkhy/main
...
Added regex to hostname input
2021-09-19 00:38:40 +08:00
DX37
9ef45a9c7e
fresh translations to ru-RU.js and Settings.vue
2021-09-18 22:25:06 +07:00
Ponkhy
3a0bc80016
Added regex to hostname input
2021-09-17 16:02:20 +02:00
Louis
a6fdd272a6
[status page] minor
2021-09-17 14:42:19 +08:00
LouisLam
2955abb5d9
[status page] create incident
2021-09-16 22:48:28 +08:00
LouisLam
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
2021-09-16 16:53:54 +08:00
LouisLam
611d214a32
[status page] checkpoint
2021-09-16 14:37:57 +08:00
Louis Lam
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
2021-09-16 00:21:53 +08:00
LouisLam
80322cbfe7
Merge branch 'import-export'
...
# Conflicts:
# src/languages/it-IT.js
# src/languages/nl-NL.js
2021-09-16 00:18:07 +08:00
LouisLam
512ff09cca
set entry page
2021-09-15 20:40:26 +08:00
LouisLam
e8f4fabcd0
[status page] crop and resize logo
2021-09-15 18:28:48 +08:00
Ponkhy
f679c1cbaf
Export button align left
2021-09-15 12:01:30 +02:00
LouisLam
2ab06f87b8
Merge branch 'master' into public-dashboard
2021-09-15 16:46:05 +08:00
LouisLam
db05b506f3
[status page] checkpoint
2021-09-15 14:34:30 +08:00
samet.kum
7274913686
Turkish Language added
2021-09-15 02:55:04 +03:00
No0Vad
1300448bed
Adjustments to the retry interval
...
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
2021-09-15 00:59:06 +02:00
LouisLam
afe91078c4
[status page] checkpoint
2021-09-14 23:27:11 +08:00
LouisLam
fc9b4617ca
link interval and retryInterval
2021-09-14 15:48:25 +08:00
LouisLam
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
2021-09-14 15:05:04 +08:00
Louis Lam
069c811af8
Merge pull request #278 from chakflying/tags
...
Monitor: Tags with metadata
2021-09-14 14:57:53 +08:00
LouisLam
f9311e4e7f
[status page]
2021-09-14 14:55:45 +08:00
LouisLam
d7a230ac15
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
# src/main.js
2021-09-14 14:16:24 +08:00
LouisLam
9da2a01a74
[status page] checkpoint
2021-09-14 14:12:27 +08:00
LouisLam
76f1f34a0a
fix #397 , incorrect encode function for export file
2021-09-13 19:25:12 +08:00
LouisLam
35aca46b68
[status page] checkpoint
2021-09-13 19:21:39 +08:00
Nelson Chan
9b5abf9bb1
Fix: reset editMonitor after save
2021-09-13 14:12:17 +08:00
Nelson Chan
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
2021-09-13 14:12:11 +08:00
No0Vad
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
2021-09-13 00:19:51 +02:00
Ponkhy
4711aeb355
Merge branch 'master' into import-export
2021-09-12 23:21:33 +02:00
Adam Stachowicz
7199bb5ead
Remove unused i18n key
2021-09-12 23:11:07 +02:00
Ponkhy
bb87972543
Hide 2FA section if disabled auth
2021-09-12 21:58:52 +02:00
Adam Stachowicz
ea723c7595
Separate import and export. Fix ESLint
2021-09-12 21:35:37 +02:00
LouisLam
e205adfd7b
[status page] developing
2021-09-13 02:26:45 +08:00
LouisLam
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
2021-09-13 01:09:01 +08:00
LouisLam
7df9698e5d
eslint: comma-dangle for language files
2021-09-13 00:58:45 +08:00
Ponkhy
d313966d80
Merge branch 'master' into import-export
2021-09-12 18:46:11 +02:00
Louis Lam
2d7767c905
Merge pull request #392 from bertyhell/bugfix/button-margin-settings
...
fix(settings): add some button bottom margin for narrow screens
2021-09-12 23:49:21 +08:00
Louis Lam
e55193270d
Merge pull request #377 from Lrss/master
...
Fix: Inconsistent white-space for the "Avg."-Ping/Response title.
2021-09-12 23:48:29 +08:00
Louis Lam
9d39071a91
Merge pull request #363 from Ponkhy/2fa
...
Added simple TOTP Two Factor Authentication
2021-09-12 23:47:42 +08:00
Bert Verhelst
660b969178
fix(settings): switch custom styles to bootstrap class for bottom margin
2021-09-12 14:52:47 +02:00
Bert Verhelst
c26622aa39
fix(settings): add some button bottom margin for narrow screens
2021-09-12 13:40:07 +02:00
Ponkhy
7fee4a7ea7
Added import options
2021-09-11 21:53:17 +02:00
No0Vad
f8f9f59464
Added support for a retry interval to monitors
...
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
2021-09-11 18:54:55 +02:00
LouisLam
934685637a
[Status Page] WIP: Checkpoint
2021-09-11 23:43:07 +08:00
Ponkhy
8cd5bad44c
Merge branch 'master' into 2fa
2021-09-11 16:32:11 +02:00
Lars Sørensen
66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title.
2021-09-11 13:52:41 +02:00
LouisLam
3e25f0e9d9
[Status Page] WIP: Checkpoint
2021-09-11 19:40:03 +08:00
