ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-27 16:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
3066 commits 30 branches 115 tags 66 MiB
Commit graph

3066 commits

This branch
This branch
All branches
Author SHA1 Message Date
cyril59310
6a802bf68c fix by eslint 2022-09-06 18:38:55 +02:00
cyril59310
252d6ea9c9 Remove unused translations 2022-09-05 20:58:00 +02:00
cyril59310
7d12cd0d42 Update Fr language 2022-09-05 20:21:46 +02:00
Louis Lam
cf10e26aff Update to 1.18.0 2022-09-05 17:43:42 +08:00
Louis Lam
c0fe2d54f9
Merge pull request #2034 from Max-le/fr_translate 
French translation contribution
 2022-09-05 17:41:58 +08:00
Louis Lam
d8303f1f4d
Merge pull request #2036 from Buchtic/patch-1 
Update cs-CZ.js
 2022-09-05 17:41:04 +08:00
Buchtič
ee14ab6751
Update cs-CZ.js 2022-09-04 09:43:07 +02:00
max
87e45b21fa [empty commit] pull request for French translation contribution 2022-09-02 10:56:54 +02:00
Louis Lam
cbc0b9c553
Merge pull request #2026 from filipporomani/patch-1 
Italian language fixes
 2022-08-31 17:59:12 +08:00
Filippo Romani
c2472bf750
Italian language fixes 
A few grammar fixes made from an italian.
Some phrases were not really correct.
 2022-08-30 19:11:54 +02:00
Louis Lam
84fad93555
Merge pull request #1735 from woooferz/patch-1 
Added label to status badge
 2022-08-29 21:19:15 +08:00
Louis Lam
2975204a0a
Merge pull request #2017 from kiznick/master 
Update th-TH.js
 2022-08-26 15:09:40 +08:00
Yoswaris Lawpaiboon
31150642cd forgot to save lol 2022-08-26 01:08:21 +07:00
Yoswaris Lawpaiboon
3c5c49c16d Update th-TH.js 2022-08-26 00:57:44 +07:00
Louis Lam
5c25354682
Merge pull request #1998 from MrEddX/bulgarian 
Bulgarian
 2022-08-17 16:55:58 +08:00
Louis Lam
2aad2510b7
Merge pull request #1993 from AnnAngela/1.18.0-zhCN 
1.18.0 zh-CN
 2022-08-17 16:55:02 +08:00
MrEddX
fac2f1cbc6
Update bg-BG.js 
Translated new fields for the upcoming 1.18.0 release.
 2022-08-14 08:52:53 +03:00
MrEddX
8bc3651a7d
Merge branch 'louislam:master' into bulgarian 2022-08-14 07:20:37 +03:00
AnnAngela
684d0a7eb8 feat: Update zh-CN languages file 
Due to no Radius server and Home Assistant device or server in my hands, the translation may be incorrect.\nRef:\n- Radius secret → Radius 共享机密: https://docs.microsoft.com/zh-cn/azure/active-directory/authentication/howto-mfaserver-dir-radius#:~:text=%E5%8F%AF%E9%80%89%EF%BC%89%E5%92%8C-,%E5%85%B1%E4%BA%AB%E6%9C%BA%E5%AF%86,-%E3%80%82\n- Called Station Id → NAS 网络访问服务器号码: https://docs.microsoft.com/zh-cn/windows-server/networking/technologies/nps/nps-plan-proxy#:~:text=Called%2DStation%2DID%E3%80%82-,NAS%20%E7%BD%91%E7%BB%9C%E8%AE%BF%E9%97%AE%E6%9C%8D%E5%8A%A1%E5%99%A8%20(%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81),-%E3%80%82%20%E6%AD%A4%E5%B1%9E%E6%80%A7%E7%9A%84\n- Calling Station Id → 呼叫方号码: https://docs.microsoft.com/zh-cn/windows-server/networking/technologies/nps/nps-plan-proxy#:~:text=Calling%2DStation%2DID%E3%80%82-,%E5%91%BC%E5%8F%AB%E6%96%B9%E4%BD%BF%E7%94%A8%E7%9A%84%E7%94%B5%E8%AF%9D%E5%8F%B7%E7%A0%81,-%E3%80%82%20%E6%AD%A4%E5%B1%9E%E6%80%A7%E7%9A%84
 2022-08-13 16:23:51 +08:00
AnnAngela
b3712ee1cc fix: Update en language file to match up newest development 2022-08-13 16:19:51 +08:00
Louis Lam
af94424283 Update to 1.18.0-beta.0 2022-08-13 14:04:17 +08:00
Louis Lam
728e811969 Update Apprise to 1.0.0 2022-08-13 13:35:03 +08:00
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