7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-10-31 11:29:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,410 Commits 13 Branches 125 Tags
e12225e59548bc60827b39d1da01516ffbdaa057
Commit Graph

1682 Commits

Author SHA1 Message Date
Louis Lam
c52c8a4206 Merge branch 'master' into alerta 
# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
 2022-03-04 14:10:37 +08:00
Louis Lam
9789d8cde8 Merge branch 'master' into alerta 2022-03-04 14:09:01 +08:00
Louis Lam
ccb3d85a48 Merge pull request #1157 from zackelia/master 
Implement gorush notifications
 2022-03-03 22:03:09 +08:00
Louis Lam
333505b039 Merge remote-tracking branch 'origin/master' 2022-03-03 20:49:13 +08:00
Louis Lam
602da565eb Sort notification types 2022-03-03 20:49:00 +08:00
deluxghost
b3a690f3b1 Update zh-CN.js 2022-03-02 23:12:30 +08:00
Louis Lam
7bc8c447cd Merge branch 'MikMuellerDev_master' 
# Conflicts:
#	src/languages/de-DE.js
 2022-03-02 17:17:15 +08:00
DX
0dba06e48b Update zh-CN translations 2022-03-02 15:34:11 +08:00
Louis Lam
0671e4ea2b Merge remote-tracking branch 'AnnAngela/master' 
# Conflicts:
#	src/languages/zh-CN.js
 2022-03-02 13:43:34 +08:00
Louis Lam
cd8eaef903 Merge pull request #1187 from pfandie/translations-de 
Updates some DE translations
 2022-03-02 13:39:19 +08:00
Louis Lam
51f5c009e3 Merge remote-tracking branch 'PrikolMen/patch-1' 
# Conflicts:
#	src/languages/ru-RU.js
 2022-03-02 13:37:21 +08:00
Louis Lam
3bf62c9ceb Merge branch 'patch-7-ru' 
# Conflicts:
#	src/languages/ru-RU.js
 2022-03-02 13:33:37 +08:00
Louis Lam
7b11539cff Merge branch 'patch-62' 
# Conflicts:
#	src/languages/ru-RU.js
 2022-03-02 13:31:43 +08:00
PrikolMen:-b
b4a3d68356 More correct Russian translation 
I tried to fix most of the shortcomings of the Russian translation...
 2022-02-28 14:55:23 +04:00
Louis Lam
60f67ccb35 Revert commit: a6fd626f 2022-02-26 16:57:13 +08:00
Louis Lam
a6fd626fb8 Locked Russian language, ask Putin to stop the war and unlock it 2022-02-26 14:56:57 +08:00
Balázs Csaba
f3112c0b85 fix: hu lang 2022-02-23 09:35:56 +01:00
Louis Lam
af07850ddf Merge pull request #1287 from sovushik/patch-5 
Update ru-RU.js
 2022-02-21 15:12:27 +08:00
Louis Lam
7638b73645 Fix #1300 2022-02-15 23:30:07 +08:00
Mik Mueller
a997f8e4f9 Update de-DE.js 2022-02-15 12:58:02 +01:00
Mik Mueller
09dbb143ea Merge branch 'louislam:master' into master 2022-02-15 12:51:21 +01:00
Hans Mayer
f19e983818 Merge remote-tracking branch 'origin/master' into translations-de 2022-02-14 14:39:21 +01:00
Louis Lam
986ddd92ff Merge pull request #1198 from Buchtic/master 
CSY translation
 2022-02-13 14:11:00 +08:00
AnnAngela
c75c6c5640 Update zh-CN.js 
Update DingDing and AliyunSms setting dialogs for better translations and document links
 2022-02-11 22:50:46 +08:00
AnnAngela
5aed36b470 Update zh-CN 
----
关于 smtpDkimKeySelector：
Google Workspace 的帮助里用词为
[前缀选择器](https://annangela.page.link/smtpDkimKeySelector)
 2022-02-10 22:45:24 +08:00
sovushik
76b9fb967f Update ru-RU.js 
Add new string
 2022-02-09 21:37:45 +05:00
sovushik
b58120d258 Update ru-RU.js 
Correct some words on Russian
 2022-02-09 21:26:47 +05:00
sovushik
79f99ce215 Update ru-RU.js 
Add new string
 2022-02-09 21:19:00 +05:00
Louis Lam
efaa55ad1f Merge pull request #1269 from holao09/master 
Update Vietnamese language
 2022-02-09 21:42:02 +08:00
Louis Lam
32a898bee5 Merge pull request #1270 from rovast/master 
Update zh-CN  translation for setting module.
 2022-02-09 21:36:07 +08:00
Việt Nguyễn
daac9ddffc Update Vietnamese language 
Cập nhật một số thông tin tiếng Việt
 2022-02-09 16:17:10 +07:00
James White
6bd2ee8c69 Fix minor typos on disable auth warning 2022-02-08 21:53:15 +00:00
rovast
45dca072b2 Update zh-CN translation for setting module. 2022-02-07 15:28:21 +08:00
Mik Mueller
7d8b72c6c0 Merge branch 'louislam:master' into master 2022-02-06 10:57:10 +01:00
Hans Mayer
40cc885eb8 resolve conflict after update state 2022-02-05 11:48:48 +01:00
Mik Mueller
f1007ad42f Update de-DE.js 2022-02-02 22:59:13 +01:00
Mik Mueller
dd28ecaa2d Update de-DE.js 2022-02-02 22:57:02 +01:00
Mik Mueller
ffa585376d Merge branch 'louislam:master' into master 2022-02-02 22:54:23 +01:00
dave9123
c1c1e2ba5b Fixed the grammar issue 
Here's my pull request
 2022-02-02 10:13:55 +07:00
Louis Lam
2f7e24191a Merge pull request #1237 from dave9123/patch-1 
[id-ID] Fixed some grammar error
 2022-02-02 00:31:50 +08:00
vfaergestad
0fce1b4b9b Update nb-NO.js (#1232) 
Improved and finished the translation.
 2022-02-02 00:31:00 +08:00
Mik Mueller
11c2e86bfe Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:13:30 +01:00
Mik Mueller
1bbf17f3da Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:13:23 +01:00
Mik Mueller
39f8b30b36 Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:13:13 +01:00
Mik Mueller
ffb2c2996b Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:12:42 +01:00
dave9123
65896ed035 Fixed some grammar error 
I fixed at some part of the text.
 2022-01-31 08:01:45 +07:00
Mik Mueller
b13b20bd95 improve certain German words and phrases, improve grammer in README.md 2022-01-30 00:17:25 +01:00
Phuong Nguyen Minh
a9df7b4a14 Update vi.js (#1226) 
* update vi.js
 2022-01-28 21:23:37 +08:00
Alvin Pergens
cefe43800f add alerta service 2022-01-27 20:54:04 +01:00
Computroniks
97a5b400db Added log out button to nav bar 
Implements Logout button in navbar #1209

Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2022-01-27 19:45:31 +00:00