mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-11 08:04:17 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
2607 commits 31 branches 115 tags 54 MiB
Commit graph

2607 commits

This branch
This branch
All branches
Author SHA1 Message Date
Louis 55a593f75d Merge remote-tracking branch 'origin/master' 2022-01-18 01:24:28 +08:00
Louis a0d51a15cf Fix security vulnerabilities 2022-01-18 01:24:07 +08:00
Louis Lam 5a08b42e4f
Merge pull request #1194 from Rayzggz/master 
Update zh-CN.js
 2022-01-18 01:17:33 +08:00
Louis 6961af005e eslint 2022-01-18 01:12:25 +08:00
Roy Feng 847a19afc1 Update zh-CN.js 2022-01-17 15:03:39 +08:00
Louis Lam 7532e7fd3e
Merge pull request #1192 from drodmantras/master 
Update sl-SI.js
 2022-01-17 14:18:27 +08:00
Erik 63a3704836 Update sl-SI.js 2022-01-16 12:29:00 +01:00
Hans Mayer 3e87eb596f
change wording, according to PR suggestions 2022-01-15 12:25:17 +01: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
Louis bd8fa17887 Merge remote-tracking branch 'origin/master' 2022-01-15 01:25:50 +08:00
Louis d1a99b0a22 Check Node.js version, better error message 2022-01-15 01:25:28 +08:00
Joseph Benguira 3b9fac2942
Update server/prometheus.js 
removed useless spaces

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-14 08:51:45 +02:00
Dylan Khor 812e80030b
revert Token because of language file 2022-01-13 23:43:57 -05:00
Dylan Khor b89efa49aa
retain Token verbiage in display name 
since "Token" is used in several places in the 2FA setup screen
 2022-01-13 16:58:46 -05:00
Dylan Khor 6490ef3787
rename 2fa input element id and display name 2022-01-13 16:46:09 -05:00
sovushik 329c8cbc2d
Update ru-RU.js 
Add new string
 2022-01-13 22:07:21 +05:00
Louis Lam 2bf9764cec
Merge pull request #1175 from sovushik/patch-3 
Update ru-RU.js
 2022-01-13 13:18:23 +08:00
Louis Lam c116754360
Merge pull request #1171 from Saibamen/patch-1 
Update pl.js
 2022-01-13 13:17:06 +08:00
Louis Lam 227bbdea2f [MQTT] Try to improve error handling 2022-01-13 12:42:34 +08: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 32ec4beda0 Merge branch 'master' into mqtt 2022-01-13 11:24:45 +08:00
Louis Lam 2c7a701c84 Merge remote-tracking branch 'origin/master' 2022-01-13 11:24:21 +08:00
Louis Lam 9462646ad3 Fix vulnerabilities 2022-01-13 11:22:58 +08:00
Louis Lam 482b3f9233
Update server/util-server.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-13 11:20:32 +08:00
Louis Lam 6014ed1156 Fix conflict 2022-01-13 11:19:26 +08:00
Louis Lam bfee63452d Merge branch 'master' into mqtt 2022-01-13 11:16:58 +08:00
Louis Lam fd1fce0143 Update stylelint from 13.13.x to 14.2.x 2022-01-13 11:15:38 +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
sovushik 52e0d74a1e
Update ru-RU.js 
Add new string
 2022-01-12 20:49:41 +05:00
Adam Stachowicz 23532aaafe
Update pl.js 
Addendum to ab61acab63
 2022-01-12 12:26:23 +01:00
Louis Lam ab61acab63
Merge pull request #1170 from NixNotCastey/update-pl 
Update pl.js
 2022-01-12 17:39:12 +08:00
Łukasz Szczepański 06aab3dee8 Added missing text and fix typos 2022-01-12 09:48:37 +01:00
Joseph Benguira 13acdd4c65
Fix for issue in logs 
This fix address the issue described here: https://github.com/louislam/uptime-kuma/issues/1024
 2022-01-12 10:12:12 +02:00
Louis Lam fe0bce268d
Merge pull request #1164 from ledeuns/master 
Fix comment (FreeBSD->*BSD)
 2022-01-12 01:49:57 +08:00
Louis ed64853125 Keep FBSD, BSD for ping only 2022-01-12 01:44:01 +08:00
Denis 0f822d3b2a FBSD does not exists anymore 2022-01-11 13:42:51 +01:00
Denis 6bda5c6329 update comment 2022-01-11 13:39:45 +01:00
Denis Fondras 44bc98a453
Merge branch 'louislam:master' into master 2022-01-11 13:37:54 +01:00
Louis f9751d0c01 Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236 2022-01-11 19:15:28 +08:00
Denis 53df9a36e3 reintroduce exports.FBSD 2022-01-11 10:07:00 +01:00
Louis Lam ccfd04a431
Merge pull request #1155 from ledeuns/master 
ping path is common to all BSDs
 2022-01-10 18:20:06 +08:00
Louis Lam 9324137123
Merge pull request #1151 from sovushik/patch-2 
Update ru-RU.js
 2022-01-10 18:19:04 +08:00
Louis Lam 9f063cf477
Merge branch 'master' into patch-2 2022-01-10 17:56:47 +08:00
Louis Lam b83c896d0c
Merge pull request #1150 from sovushik/patch-1 
Update ru-RU.js
 2022-01-10 17:55:46 +08:00
Louis Lam aa37383065
Merge pull request #1154 from jamesmacwhite/pull-request-guidelines 
Update PULL_REQUEST_TEMPLATE.md
 2022-01-10 17:54:55 +08:00
Louis Lam 5e2c39eb4b
Merge pull request #1144 from alex3025/master 
Fixed italian (it-IT) translations
 2022-01-10 17:54:22 +08:00
Louis Lam 2a1f011f05
Merge pull request #1153 from drodmantras/master 
Update sl-SI.js
 2022-01-10 17:53:03 +08:00
Zack Elia ea43422ccf Implement gorush notifications 2022-01-09 12:05:11 -05:00
Denis 8063449f49 ping path is common to all BSDs 2022-01-09 17:27:24 +01:00