Commit graph

1539 commits

Author SHA1 Message Date
Louis Lam a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
feat: added Home Assistant notification integration
2022-08-06 18:08:06 +08:00
Louis Lam d0d1e0de28 Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
#	src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
Louis Lam 70aa8fe453
Merge pull request #1183 from c0derMo/master
Adding option to monitor other docker containers
2022-08-02 19:08:46 +08:00
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
tamasmagyar 31c388a6e3 added cypress framework and tests for setup page 2022-07-18 20:51:13 +02: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
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