Commit graph

3148 commits

Author SHA1 Message Date
Louis Lam a6007adce3 Update to 1.18.0-beta.1 2022-08-13 13:32:16 +08:00
Louis Lam 30b72d81cf
Merge pull request #1212 from OidaTiftla/introduce-resend-interval
Resend Notification if Down X times consequently
2022-08-13 13:27:49 +08:00
Louis Lam de6e1e7ddd Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
#	server/database.js
2022-08-13 13:24:00 +08:00
Louis Lam 2af754b5e8 Update package-lock.json 2022-08-11 21:09:16 +08:00
Louis Lam 3b3763351b Merge remote-tracking branch 'origin/master' into radius-check
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
#	src/pages/EditMonitor.vue
2022-08-11 21:08:06 +08:00
Louis Lam 9a488d6968
Merge pull request #1752 from SuperManito/master
Add Bark Notification Parameters
2022-08-08 17:04:08 +08:00
Louis Lam aca395cea1
Merge pull request #1957 from jbenguira/patch-2
Avoid error "SQLITE_BUSY: database is locked"
2022-08-08 17:00:06 +08:00
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
Joseph Benguira d6a113396a
Update server/database.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-01 13:18:19 +03:00
Louis Lam fb3fe17c28 Fix getClientIP
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2022-08-01 15:42:58 +08:00
Joseph Benguira 71d62ee151
removed ; after the PRAGMA command 2022-07-31 19:00:19 +03:00
Joseph Benguira 82b9bfc5a0
fixed Trailing spaces not allowed lint issue 2022-07-31 18:59:02 +03:00
Joseph Benguira f016caa513
Avoid error "SQLITE_BUSY: database is locked"
Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write
2022-07-31 18:51:53 +03:00
Louis Lam 6e29feffd3
Merge pull request #1827 from theS1LV3R/master
feat: get client ip from x-forwarded-for header if available
2022-07-31 23:43:39 +08:00
Louis Lam 2389b604fe Use Settings.get 2022-07-31 23:41:29 +08:00
Louis Lam a3b1612938 getClientIP respect trustProxy setting 2022-07-31 23:36:33 +08:00
Louis Lam a07f54f35b Merge remote-tracking branch 'origin/master' into theS1LV3R_master 2022-07-31 23:27:35 +08:00
Louis Lam b777c0c3e4
Merge pull request #1862 from harryzcy/issue-1861
Support X-Forwarded-Host header
2022-07-31 20:53:15 +08: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 f3322398e5 Fix and improve test docker host 2022-07-29 20:57:13 +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
Louis Lam df7f0b078d
Merge pull request #1934 from ankhgerel/locale/ko
chore(locale): change some typo ko-KR
2022-07-26 14:43:06 +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 d54c652d26
Merge pull request #1778 from christopherpickering/master
Added postgres monitor
2022-07-24 14:22:36 +08:00
Louis Lam f1bcecb0c6 Merge package-lock.json 2022-07-24 14:08:03 +08: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