Commit graph

1804 commits

Author SHA1 Message Date
MrEddX 19d8761305
Update bg-BG.js
Just a typo
2022-08-02 07:48:54 +03:00
Louis Lam bea8679788
Merge branch 'master' into issue-1861 2022-07-31 20:06:45 +08:00
rmt/src f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification 2022-07-31 12:41:18 +01:00
Louis Lam a0843745f9 Remove unused language key 2022-07-31 18:12:41 +08:00
Louis Lam 16d6885a88 Fix radio button and add description 2022-07-31 18:11:40 +08:00
Louis Lam 4d975a5bd5
Merge pull request #1955 from dtorner/patch-1
Updated ES translation
2022-07-31 17:24:15 +08:00
MrEddX 96ec46765b Update en.js
Just a typo.
2022-07-31 17:23:23 +08:00
MrEddX 96971f6776 Update bg-BG.js
- Translation Update
- Fixed Some Accidentally Deleted Fields
2022-07-31 17:23:23 +08:00
MrEddX ffb1a948fe Update bg-BG.js
Translation Update
2022-07-31 17:23:23 +08:00
dtorner 4e4156285a
Updated ES tramaslation
Just some changes here and there, mainly caps and some words.
TY to the developers for this good piece of code :-)
2022-07-31 11:13:36 +02:00
Louis Lam 1223b56205 Add example 2022-07-30 19:57:51 +08:00
Louis Lam 8ced61697a Fix save docker host issue 2022-07-30 19:48:12 +08:00
Louis Lam b76ca59dfe
Merge pull request #1786 from treboryx/master
fix: hide mobile header when not logged in
2022-07-29 15:25:43 +08:00
Louis Lam 554b0d2bc3
Merge pull request #1931 from mariogarridopt/add-language-pt-pt
Add pt-PT language file
2022-07-29 15:19:51 +08:00
0x01code 4575f31094
Add support for line notify providers (#1781)
* add line notify support

* add way to get line notify

* Fix duplicate key 'HTTP Basic Auth'

* Revert language files changes

* Revert language files changes

* Fix general message

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-07-29 15:13:50 +08:00
Mario Garrido d8253405b4
fix: add language to the language list 2022-07-26 02:07:38 +01:00
Mário Garrido 56c6c0c6f1
Merge branch 'louislam:master' into add-language-pt-pt 2022-07-26 02:04:50 +01:00
__filename b16cb6a337
fix(locale): Edit non-space place
Co-authored-by: Kyungyoon Kim <ruddbs5302@gmail.com>
2022-07-25 20:11:51 +08:00
__filename 694b4cadb3
fix(locale): Edit typo
Co-authored-by: Kyungyoon Kim <ruddbs5302@gmail.com>
2022-07-25 16:41:29 +08:00
__filename 75f6ff8b58
fix(locale): Edit multiple space
Co-authored-by: Kyungyoon Kim <ruddbs5302@gmail.com>
2022-07-25 16:39:00 +08:00
c0derMo 1062e629c5 Fix linting issues 2022-07-24 12:50:43 +00:00
__filename 13f7db655b
chore(locale): change some typo ko-KR 2022-07-24 20:44:43 +08:00
Moritz R 60e7824ff0
Merge branch 'master' into master 2022-07-24 14:37:22 +02:00
c0derMo fb3b407577 Added a settings page & localization 2022-07-24 12:34:43 +00:00
Louis Lam 88afd662db Merge remote-tracking branch 'origin/master' into postgres
# Conflicts:
#	package-lock.json
#	package.json
2022-07-24 14:07:30 +08:00
c0derMo e356d5f623 Fixing linting & adding documentation 2022-07-22 15:57:40 +00:00
c0derMo 0d098b0958 Docker Hosts are now a table & have their own dialog 2022-07-22 15:47:04 +00:00
Mario Garrido 2ccf1fe41b
fix: small changes in semantics 2022-07-22 15:42:38 +01:00
Mario Garrido 77340cf0d2
feat: adicionar pt-PT 2022-07-22 15:16:23 +01:00
Mario Garrido c412c66aeb
Add pt-PT language file 2022-07-22 06:29:41 +01:00
Rolf Bachmann c4a2ce4e78 Add authentication support for ntfy 2022-07-19 12:17:15 +02:00
tamasmagyar 31c388a6e3 added cypress framework and tests for setup page 2022-07-18 20:51:13 +02:00
Jan Hartje 95dba6dcaf feat(notification): add Authorization Header option to frontend 2022-07-18 16:04:18 +00:00
Denis Stepanov 525607f49e
Update ukrainian language 2022-07-18 09:00:44 +03:00
SiderealArt d44d984a46
update zh-TW 2022-07-14 22:25:39 +08:00
Matthew Nickson a54e58b4d6
Added Ping packet size #1891
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-14 08:32:51 +01:00
Louis Lam d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
Feat: New Notification Type for AlertNow
2022-07-14 15:04:35 +08:00
Chongyi Zheng 6ce012c9a1
Add trust proxy checkbox in Settings page 2022-07-12 22:45:54 -04:00
Matthew Nickson 1b120f8a6f
Made link icon only show for http and keyword
The option to enable links to the monitors is now only available for
http and keyword monitor types. The link will also no longer be shown
on the edit page to prevent issues with the url not being present if
the monitor was not already enabled for sendUrl

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-04 13:31:05 +01:00
Louis Lam 6f57c4195a Slightly improve css 2022-07-04 18:33:38 +08:00
Louis Lam baa592bce3 Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page 2022-07-04 18:21:56 +08:00
Thomas Christlieb 42e30de209 change page title to " - Login" when on Login Form 2022-07-04 10:16:33 +02:00
Louis Lam 6418f99f1a
Merge pull request #1852 from thehijacker/patch-1
Update sl-SI.js
2022-06-30 16:40:03 +08:00
Louis Lam f65bef686c
Merge pull request #1857 from MarcHagen/lang/nl
[i18n] Update NL (Dutch)
2022-06-30 16:19:26 +08:00
Marc Hagen 2f26864892 [i18n] Update NL (Dutch) 2022-06-29 23:26:41 +02:00
thehijacker 303738b7c2
Update sl-SI.js 2022-06-29 13:58:52 +02:00
Louis Lam e36b65c2df Add frontend version 2022-06-28 21:55:05 +08:00
rmt/src 5dd197374d
fix: only add en translation 2022-06-26 10:56:46 +01:00
rmt/src f84ae82983
feat: added Home Assistant notification integration 2022-06-25 21:27:30 +01:00
Unai Tolosa b5cbc6f5f6 fix: lint 2022-06-23 23:30:01 +02:00
Unai Tolosa 5dd3d32d77 add: basque translations 2022-06-23 16:20:24 +02:00
Unai Tolosa ff8bba6863 add: basque translation file 2022-06-23 13:29:37 +02:00
Louis Lam c36d9a4b8b Fix port data type #1802 2022-06-21 22:33:09 +08:00
Louis Lam a7063b8aca Fix logo height in the status page list 2022-06-21 15:46:22 +08:00
Louis Lam ea400ac35f
Merge pull request #1795 from MrEddX/bulgarian
Update bg-BG.js
2022-06-20 21:50:00 +08:00
MrEddX 89717495dc
Update bg-BG.js
Added and translated new fields
2022-06-20 11:52:12 +03:00
Adam Stachowicz 7b710af12c
Update README for i18n
Related: https://github.com/louislam/uptime-kuma/pull/1777
2022-06-19 21:17:03 +02:00
Louis Lam 5b278ca500 Add a description that certification expiry have to be assigned to a monitor 2022-06-19 20:57:52 +08:00
Matthew Nickson f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page 2022-06-18 23:53:35 +01:00
Louis Lam b97019eea8 Fix cloudflared cannot be stopped in No Auth mode due to password checking 2022-06-18 19:06:03 +08:00
Louis Lam d65abe5b8c
Merge pull request #1777 from MarcHagen/change/move_translations_to_i18n
[change] Move i18n from Security to locale files
2022-06-18 17:17:06 +08:00
Robert c4e2d67d17
fix: hide mobile header when not logged in 2022-06-17 10:11:53 +03:00
Louis Lam 7533041696
Merge pull request #1784 from AnnAngela/master
Update i18n for en & zh-CN
2022-06-17 13:30:47 +08:00
MrEddX b4a4171178
Update bg-BG.js
Translation fixes.
2022-06-16 21:08:17 +03:00
AnnAngela-work 012be23509 Update i18n 2022-06-16 21:20:12 +08:00
sur.la.route 4b2a465c94
Fix order of type and placeholder
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-15 20:14:06 -05:00
Marc Hagen f7afe121e3 [change] Move i18n to locale files 2022-06-15 19:41:21 +02:00
Christopher Pickering 945288f0c0
Added postgres monitor 2022-06-15 12:12:47 -05:00
OidaTiftla ac27e6e2af Rename feature to: Resend Notification if Down X times consequently
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-06-15 17:50:35 +02:00
OidaTiftla 869a040011
Merge branch 'master' into introduce-resend-interval 2022-06-15 16:19:47 +02:00
Christopher Pickering 42848bcd2e
updated translations 2022-06-15 09:00:47 -05:00
Louis Lam a3b94aa532
Merge pull request #1550 from Computroniks/jsdoc-for-src
JSDoc for src/*/*
2022-06-15 19:29:51 +08:00
Moritz R ac449ec1c2
Merge branch 'master' into master 2022-06-15 11:33:00 +02:00
Louis Lam da91317760
Merge pull request #1772 from chakflying/fix/mobile-monitor-list
Fix: Fix monitor list layout on mobile
2022-06-15 15:50:04 +08:00
Louis Lam 7d63b700e1
Merge pull request #1767 from christopherpickering/patch-2
[beta] workstation field should be text, not password
2022-06-15 15:31:24 +08:00
Louis Lam 0223f86a2a Merge remote-tracking branch 'origin/master' 2022-06-15 15:18:29 +08:00
Louis Lam c170b1edd0 Better optgroup text color 2022-06-15 15:18:14 +08:00
Nelson Chan 62acd2edb1 Fix: misc. layout fix on mobile 2022-06-14 22:43:44 +08:00
Christopher Pickering 483cbfb636
added default value for sql server connection string 2022-06-14 09:00:23 -05:00
sur.la.route 6995a29980
workstation field should be text, not password 2022-06-14 07:45:04 -05:00
Nelson Chan f723930d11 Fix: Unify design with Security page 2022-06-14 15:04:46 +08:00
Nelson Chan e425e408a2 Fix: Fix missing default settings 2022-06-14 15:04:14 +08:00
Louis Lam af7c905b44
Merge pull request #1759 from MrEddX/bulgarian
Bulgarian
2022-06-14 10:57:14 +08:00
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
MrEddX 7a27d3752a
Merge branch 'louislam:master' into bulgarian 2022-06-13 22:36:00 +03:00
MrEddX f0e8f34aeb
Update bg-BG.js
Added new fields
2022-06-13 22:32:55 +03: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
Super Manito 774fe58ddc Update 2022-06-13 01:30:27 +08:00
Super Manito 5f347b10ba Update 2022-06-13 01:15:38 +08:00
Super Manito f442507cab Update 2022-06-13 00:16:34 +08:00
Super Manito a23ab9d1de Update 2022-06-12 23:18:32 +08:00
Super Manito 817c941489 Add Bark Notification Parameters 2022-06-12 22:30:42 +08:00
Daeho Ro 5f6347d277 pull request for adding alertnow notification 2022-06-12 04:02:44 +09:00
Matthew Nickson fbfa5a33ed
Added Clickable hostname on status page. #1221
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-11 17:23:12 +01: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
Louis Lam cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
feat: ntfy push support
2022-06-06 21:52:41 +08:00
Louis Lam a707b51053
Page Loading Speed Optimization (#1711)
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets

Original: ~1.2MB
Optimized: ~370KB
2022-06-05 23:43:25 +08:00
Matthew Nickson a927f5cd15
Fixed typos + improved clarity and detail of some JSDoc
Apply suggestions from code review

Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2022-06-02 16:40:56 +01: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 c94dcf1533
Added JSDoc for src/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-02 14:32:38 +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
Matthew Nickson 2170229031
Improve JSDoc for some components
Apply suggestions from code review

Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2022-06-02 10:42:37 +01:00
Matthew Nickson 213aca4fc3
Added JSDoc for src/mixins/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-02 10:38:17 +01:00
Matthew Nickson 2b42c3c828
Added JSDoc for src/components/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-02 00:32:05 +01:00
Matthew Nickson d939d03690
Added JSDoc for src/components/settings/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-01 23:44:10 +01:00
Louis Lam c6c1bb5b5c
Merge pull request #1710 from AnnAngela/master
Update zh-CN translation
2022-06-01 16:05:23 +08:00
Louis Lam 091158cfe7 [Status Page] Preload data 2022-06-01 13:05:12 +08:00
AnnAngela-work abb6ce2366 Update zhCN translation 2022-06-01 11:28:10 +08:00
Nelson Chan 179e3569b5 Chore: Add code comments 2022-05-31 16:24:39 +08:00
Nelson Chan 43527f2f40 Chore: Update remaining languages 2022-05-30 18:05:28 +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
Louis Lam 46a593534b
Merge pull request #1695 from furkanipek/update-tr-lang
Update tr-TR.js
2022-05-29 12:13:52 +08:00
Louis Lam 7a4b54f4ee
Merge pull request #1702 from dhfhfk/master
Update Ko-KR.js
2022-05-29 12:12:07 +08:00
Louis Lam 30858ab038 Fix rollback issue of 9fc5a33 and one issue of #1694 2022-05-28 23:08:14 +08:00
dhfhfk e25d406fa5
Eslint 2022-05-28 17:12:40 +09:00
dhfhfk 10e16782b1
Update ko-KR.js 2022-05-28 17:10:40 +09:00
Furkan İpek 107a44885c Update tr-TR.js 2022-05-27 15:05:09 +03:00
Furkan İpek ef9f66fad9 Update tr-TR.js 2022-05-27 15:02:40 +03:00
Moritz R e9e78c26e5
Merge branch 'master' into master 2022-05-27 13:59:58 +02:00
Furkan İpek 46dae99695 Update tr-TR.js 2022-05-27 12:51:41 +03:00
Furkan İpek edd9bf3887 Update tr-TR.js 2022-05-27 12:39:07 +03:00
Nelson Chan cfa5b551a5 Feat: Make the expiry days sorted 2022-05-26 12:17:24 +08:00
Nelson Chan 46ee149b70 Chore: Slightly improve design 2022-05-26 12:12:29 +08:00
Louis Lam 0a8c922abf Fix default value of pagerduty-integration-url 2022-05-25 23:34:47 +08:00
Louis Lam 058e5442af
Merge pull request #1310 from MarcHagen/feature/pagerduty
Add support for PagerDuty notifications
2022-05-25 23:26:33 +08:00
burakurer 5566b038c8
Update tr-TR.js 2022-05-25 17:35:05 +03:00
Marc Hagen 5830f1e0b5 [feat] Adding PagerDuty notification 2022-05-25 14:10:31 +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
Philipp Dormann 54184350a4
fix: missing semicolons 2022-05-23 21:13:57 +02:00
Philipp Dormann 14dbe7c334
clean up + default ntfs.sh server url 2022-05-23 21:11:01 +02:00
Philipp Dormann 122e6a842b
clean up ntfy topic input 2022-05-23 21:08:56 +02:00
Philipp Dormann 77ef22bdb4
set proper ntfy priorities 2022-05-23 21:08:11 +02:00
Philipp Dormann 59f983d506
fix: unused import "HiddenInput" 2022-05-23 20:57:10 +02:00
Philipp Dormann 71f031c14e
add ntfy support
ref https://github.com/louislam/uptime-kuma/issues/1622
2022-05-23 10:55:03 +02:00
Louis Lam 6ae2a48584
Merge pull request #1662 from kiznick/master
Translate to Thai
2022-05-21 14:14:42 +08:00
Yoswaris Lawpaiboon 9d87f8d390 Update th-TH.js 2022-05-20 19:16:37 +07: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
MrEddX 751e5ac477
Bulgarian Translation
Updated Translation
2022-05-19 20:32:01 +03:00
Yoswaris Lawpaiboon 93e5023ead Translate to Thai ! 2022-05-19 19:44:59 +07: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
MrEddX 4c3aa20eb0
Update bg-BG.js
Added new fields
2022-05-18 22:18:58 +03:00
Sascha Kruse 019d638767 Merge remote-tracking branch 'ghupstream/master' into radius-check 2022-05-18 15:54:10 +02:00
Louis Lam 9fc5a3329f Revert #1208, due to the break animation 2022-05-18 20:16:50 +08: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
AnnAngela 4178b003a2
fix value 2022-05-14 15:27:55 +08:00
Louis Lam 92a43e1f30 Make the sibling beats a bit smaller 2022-05-14 14:11:43 +08:00
Louis Lam 0cf395dfc3 Fix merge issue 2022-05-14 14:06:35 +08:00
Louis Lam 749ca6f4a8 Merge remote-tracking branch 'origin/master' into feature-improve-status-styling
# Conflicts:
#	src/components/HeartbeatBar.vue
#	src/components/PublicGroupList.vue
2022-05-14 14:05:28 +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 668e97c5a9 fix: lint errors. 2022-05-12 13:39:10 +01: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
Domingos Panta 373bd9b962 Added response interceptor to axios response.
This interceptor checks for response code 404 and redicts the user if that is the case.
2022-05-11 17:56:31 +01:00
Louis Lam 8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
Fix apprise integration for Zulip Streams
2022-05-11 00:47:50 +08: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
Clemens Wolff b680371746 Make apprise notification title configurable in UI 2022-05-07 11:00:57 -04:00
MrEddX aa8ea6d398
Update bg-BG.js (#1617)
Translation Fixes
2022-05-07 13:01:06 +08:00
Karel Krýda 9a35386841
Merge branch 'master' into master 2022-05-06 11:24:21 +02:00
Louis Lam 8b0813ceff Fix #1596 hopefully 2022-05-06 14:52:09 +08: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
Louis Lam 39aa0a7f07 Merge branch 'fix/chart-error' 2022-05-01 17:57:17 +08:00
Louis Lam a12dffd1bc Fallback to eqeq for PingChart.vue 2022-05-01 17:56:42 +08:00
Louis Lam 410805052e Log this.chartPeriodHrs 2022-05-01 17:46:43 +08:00
Louis Lam 02a8147f22 Remove undefined variable forceShowContent 2022-05-01 17:31:58 +08:00
Nelson Chan 272956025c Fix: Fix chart error on switch back to recent 2022-05-01 05:18:08 +08: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 5a069b278d
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-29 21:42:54 +08:00
AnnAngela 65ea2e6aeb
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-29 21:42:48 +08:00
AnnAngela-work e82fc1df61 Match up en lang file 2022-04-29 20:31:36 +08:00
AnnAngela-work 7dd5f5ea0d Improve translation 2022-04-29 20:26:56 +08:00
AnnAngela-work 45da7c5431 Improve translation work 2022-04-29 20:17:15 +08:00
Louis Lam 6333231f1b
Merge pull request #1108 from trogper/push-status-param
Add status parameter to push monitor
2022-04-29 00:12:44 +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
Louis Lam 66e4c89897
Merge pull request #1560 from MrEddX/bulgarian
Update bg-BG.js
2022-04-28 23:23:09 +08:00
Louis Lam d210548ae8
Merge pull request #1581 from NixNotCastey/update-pl
Update polish translation
2022-04-28 23:22:31 +08:00
Łukasz Szczepański 09fdef9bdc Update polish translation 2022-04-28 11:14:02 +02:00
Dmitry Yaskovich 7078b06272
Fix typo in Russian localization 2022-04-27 21:22:42 +03:00
Matthew Nickson 3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port 2022-04-27 18:26:11 +01:00
Phuong Nguyen Minh a3baa3c149
Update language vi.js (#1572)
Update vi-VN.js
2022-04-27 15:07:42 +08:00
Louis Lam 2adb142ae2
Merge pull request #1571 from MarkusDick/update-german-translations
lang: update german translations
2022-04-27 15:04:04 +08:00
MrEddX 372bf57e9f
Update bg-BG.js
Translation fixes
2022-04-27 09:19:13 +03:00
MrEddX 03e6f0a6c8
Update bg-BG.js
Translation fixes.
2022-04-26 21:39:14 +03:00
Markus Dick dcec53a755 lang: update german translations 2022-04-26 20:27:00 +02:00
Adam Stachowicz 1e595eaa76 Update linters 2022-04-26 01:26:57 +02:00
MrEddX 4c8da89c36
Update bg-BG.js
Translation fixes
2022-04-25 07:26:40 +03: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 c7ec9a07e2 Add translation for text label 2022-04-21 17:59:38 +02: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
MrEddX 4d4d04adbd
Update bg-BG.js
Some translation fixes
2022-04-20 22:01:57 +03:00
MrEddX f8c9472ea2
Update bg-BG.js
- Updated and fixed
2022-04-20 21:54:57 +03:00
Louis Lam 4e28ad4ac2
Merge pull request #1524 from chakflying/fix/disable-auth-icon
Fix: Handle disabled auth in user dropdown
2022-04-20 23:50:33 +08:00
Louis Lam 07c0801ad5 Make logout button reactive, improve dropdown menu css 2022-04-20 22:39:07 +08:00
SiderealArt 8cefc96c78
Update Traditional Chinese (Taiwan) translation 2022-04-20 18:11:26 +08:00
Nelson Chan a391576285 Chore: Add translation 2022-04-20 15:09:31 +08:00
Nelson Chan e0966e55c8 Fix: Handle disabled auth in user dropdown 2022-04-20 15:01:13 +08:00
Koen Habets 59d9891105
Update nl-NL.js 2022-04-19 21:17:33 +02: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
Louis Lam cd7c2beca6 Update CSS for dropdown menu 2022-04-19 19:46:21 +08:00
Louis Lam 8ee99760ec Minor lint 2022-04-19 19:41:52 +08:00
Louis Lam cb55e23718 Add $root.username 2022-04-19 19:40:28 +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
Louis Lam cefb5bb60a Merge branch 'master' into #1209-Logout-button-in-navbar 2022-04-18 20:39:24 +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 cd3dfd3146
Merge pull request #1083 from patrickhafner/customstatuspage
Custom status page
2022-04-17 15:04:02 +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 4e6ddc8880
Merge pull request #1497 from MrEddX/bulgarian
Bulgarian
2022-04-17 01:40:43 +08:00
Louis Lam 07c474db0b Merge remote-tracking branch 'origin/master' 2022-04-17 01:40:05 +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 30e113755e Add HIDE_LOG and catch error if cannot subscribe topic 2022-04-16 14:50:48 +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
Louis Lam b7aebceaab
Update bg-BG.js 2022-04-15 19:49:16 +08:00
MrEddX 0302fdbc96
Update bg-BG.js
Status pages - fix
2022-04-15 13:10:14 +03:00
MrEddX 84a50f058f
Update bg-BG.js 2022-04-15 13:06:22 +03:00
Nelson Chan 6f99d7577b Fix: Limit saved period & clear when set to recent 2022-04-15 03:24:58 +08:00
Nelson Chan 1417b6eacf Feat: Save and restore chart period 2022-04-15 02:56:21 +08:00
Louis Lam fb0064082e Change Pushdeer to PushDeer 2022-04-14 14:34:30 +08:00
ngc7331 93c51504f9 fixes: formatting and security issues
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 14:34:30 +08:00
ngc7331 fb059f5e91 Add support for Pushdeer notifications 2022-04-14 14:34:30 +08:00
PhyxionNL 2e3414135f Update src/components/PingChart.vue
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 12:27:38 +08:00
PhyxionNL e44699216e Fix readability of chart hover 2022-04-14 12:27:38 +08:00
DX37 fd8cba1dad nudge nodemailer strings; translate new ones 2022-04-14 11:10:24 +08:00
sovushik 03dd02fd38 Update ru-RU.js
Add RU for 1.14 version
2022-04-14 11:04:46 +08:00
ColdThunder11 4656ab3d57 Add OneBot notification service 2022-04-14 10:58:28 +08:00
MrEddX 60b44c2cdd Update bg-BG.js
Fixed translation.
2022-04-14 09:46:43 +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
Louis Lam 6f72ca481f
Merge pull request #1479 from AnnAngela/1.14.0_translation
New translation for zh-CN
2022-04-14 00:05:07 +08:00
Louis Lam 670ea415b2
Merge pull request #1488 from c0derMo/update-german-translation
updating german translation
2022-04-14 00:03:53 +08:00
Louis Lam 17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
introduce consistent logging
2022-04-13 23:47:08 +08:00
Louis Lam e9ce1433cd Change log_info to log.info by making it into an object 2022-04-13 23:33:37 +08:00
c0derMo f5d006add8 updating german translation 2022-04-13 14:45:41 +00:00
Moritz R 361e44ad6a
Merge branch 'louislam:master' into master 2022-04-13 15:58:17 +02:00
AnnAngela-work 5aa747a301 New translation 2022-04-12 20:41:25 +08: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 772d009f43 Merge branch 'master' into fluencydoc_master
# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
2022-04-12 17:44:04 +08:00
Louis Lam 9ec29c1bc4 Add back debug() for safe, but it is marked as deprecated 2022-04-12 16:37:05 +08:00
Louis Lam 279e2eb3f6 Merge branch 'master' into logging
# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
2022-04-12 16:32:14 +08:00
Louis Lam a0d1ae2cce Better alignment of monitor list item 2022-04-11 18:02:18 +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 a2d9474e85 Copy some keys from zh-TW to zh-HK 2022-04-09 14:51:26 +08:00
Louis Lam 8479e772cd
Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation
Update zh-TW translation
2022-04-09 14:44:44 +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
JohnnyChiang 25b5edea7f Update zh-TW translation 2022-04-08 01:47:01 +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-work 8e78e62eee Make translation better 2022-04-04 17:24:22 +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
AnnAngela-work 43eed45bae first part of zh-CN.js translation 2022-04-03 22:08:24 +08:00
AnnAngela-work 19b7e2ba5e Using grep to search $t("foo")-like pattern to fill up the missing part of en i18n file 2022-04-03 22:08:03 +08:00
Louis Lam 3218a0eee8 Merge remote-tracking branch 'origin/master' 2022-04-02 11:26:24 +08:00
Louis Lam 87ee3c20bd Update proxy password field 2022-04-02 11:25:27 +08: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
Balázs Csaba 53cea7f8d3 fix: update hu lang 2022-03-31 22:25:22 +02: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
Louis Lam da32a1aa19 Add uk-UA to the languageList 2022-03-31 16:24:28 +08:00
Louis Lam 7a69f9f56f
Merge pull request #1438 from Deni7/master
Add ukrainian translation
2022-03-31 16:22:29 +08:00
Louis Lam c50c20faa4 Minor fix for uk-UA 2022-03-31 16:19:04 +08:00
Louis Lam cb6eeaef34 Bring connection error bar to the top 2022-03-31 16:15:34 +08:00
Denis Stepanov ee3d7d8b42
Add ukrainian translation 2022-03-30 23:21:09 +03:00
Denis Stepanov a277cfe9e8
Add ukrainian translation 2022-03-30 23:16:04 +03:00
Denis Stepanov 95b0df0270
Add ukrainian translation 2022-03-30 23:15:28 +03:00
Louis Lam 71be030733 Add package-lock.json and minor words 2022-03-30 18:52:10 +08:00
Janik Schumacher 73b338bba6 feat: Favicon is updated based on satus page logo 2022-03-30 12:09:38 +02:00
Louis Lam 82ea896bbc Improve the workflow of cloudflared 2022-03-30 11:59:49 +08:00
Louis Lam f1f4b3b377 Add reverse proxy setting page for controlling cloudflared 2022-03-30 01:49:45 +08:00
Louis Lam b8dea3a823 Merge remote-tracking branch 'origin/master' 2022-03-29 17:39:12 +08:00
Louis Lam 0da6e6b1fb Some improvements 2022-03-29 17:38:48 +08:00
DX37 61d0a0abce
update russian translation 2022-03-28 21:16:13 +07:00
OidaTiftla 91366ff565
Merge branch 'master' into introduce-resend-interval 2022-03-27 21:19:57 +02:00
Matthew Nickson 88604845e6
Merge branch 'master' into #1209-Logout-button-in-navbar 2022-03-27 13:48:50 +01:00
sovushik e11ea7b061
Update ru-RU.js
Add new string for 1.13.1
2022-03-26 10:46:07 +05:00
Louis Lam 12237dec6e Merge remote-tracking branch 'origin/master' 2022-03-26 02:09:25 +08: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
Ivan Bratović 5922771909 Update croatian (hr-HR) translation file
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
2022-03-25 11:05:51 +01:00
Louis Lam 28d72fcd08 Fix #1409, slug cannot be empty 2022-03-24 23:43:07 +08:00
Louis Lam 40991fbc28 Show reverse proxy guide along with websocket error 2022-03-22 23:46:13 +08:00
Louis Lam bf20f9d290 Merge remote-tracking branch 'origin/master' 2022-03-22 21:37:18 +08:00
Louis Lam 5fa14161c4 Minor css 2022-03-22 21:37:04 +08:00
Louis Lam 5a2a59250d
Merge pull request #1405 from sovushik/patch-9
Update ru-RU.js
2022-03-22 17:17:37 +08:00
sovushik 210eebe144
Update ru-RU.js
Add some fix for 1.13
2022-03-22 13:00:16 +05:00
sovushik 4b04a9c214
Update ru-RU.js
Add new string for version 1.13
2022-03-22 12:58:38 +05:00
MrEddX f65d0654a6
Update bg-BG.js
Added new field.
2022-03-21 21:12:15 +02:00
Louis Lam 4545eec3fe Better sticky monitor list 2022-03-21 23:53:55 +08:00
burakurer 73d904952d
Update tr-TR.js
spelling correction "Sağlık Dırımları" => "Sağlık Durumları"
2022-03-20 17:03:32 +03:00
Louis Lam c22cc4d794
Merge pull request #1385 from jtagcat/patch-1
Update et-EE.js
2022-03-20 10:56:24 +08:00
Kyungyoon Kim 2f5beefa37
Update ko-KR.js 2022-03-19 03:19:02 -06:00
jtagcat dae5ff690a
Update et-EE.js 2022-03-18 13:56:45 +00:00
Louis Lam fb9a206542 [Status Page] Fix - show no status page 2022-03-18 21:47:14 +08:00
jtagcat dc3da45dd6
Update et-EE.js 2022-03-18 11:27:33 +00: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 78a732409b [Status Page] Fix translations 2022-03-17 18:56:59 +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