Commit graph

3490 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
Louis Lam b62d94184a Merge branch 'master' into restructure-status-page 2022-03-03 17:09:15 +08:00
Louis Lam e0175d0010
Delete stale-bot.yml, no idea why it deleted some feature request 2022-03-03 10:21:34 +08:00
Louis Lam 3246055696
Merge pull request #1350 from deluxghost/patch-1
Update zh-CN.js
2022-03-02 23:20:47 +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
Louis Lam 69ff6831ab
Merge pull request #1311 from deluxghost/update-zh-cn
Update zh-CN translations
2022-03-02 16:58:54 +08:00
AnnAngela 88a798704b
Update fs-rmSync.js 2022-03-02 16:10:14 +08:00
AnnAngela-work 783173fd1f Add a helper function 2022-03-02 15:48:08 +08:00
DX 0dba06e48b Update zh-CN translations 2022-03-02 15:34:11 +08:00
AnnAngela-work 281fe365c0 Mark the version as 1.11.4 in package-lock.json 2022-03-02 15:23:08 +08:00
Louis Lam 8e7c0a6163 Update pull request rules 2022-03-02 14:25:37 +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 b31af8a15c update to 1.12.1 2022-02-26 17:05:13 +08:00
Louis Lam 60f67ccb35 Revert commit: a6fd626f 2022-02-26 16:57:13 +08:00
Louis Lam 81a9807a0a Update release procedures 2022-02-26 16:03:43 +08:00
Louis Lam 3681934d05 Update Apprise to 0.9.7 2022-02-26 15:57:26 +08:00
Louis Lam d5d63474d8 update to 1.12.0 2022-02-26 15:41:32 +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
Louis Lam 3a5b413af4 Update axios to 0.26.0 due to vulnerability 2022-02-26 14:36:38 +08:00
Louis Lam 595cd93220 Check invalid interval 2022-02-24 15:11:17 +08:00
Louis Lam e12c1511db
Merge pull request #1330 from BCsabaEngine/master
fix: hu lang
2022-02-23 22:36:05 +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 211b44269c
Do not close feature-request 2022-02-21 11:48:03 +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 d0ed99a310
Merge pull request #1298 from ananthkamath/master
Fix mattermost couldn't find channel issue
2022-02-13 23:56:12 +08:00
Ananth Kamath 258d93be72 Fix mattermost couldn't find channel issue 2022-02-13 21:17:02 +05:30
Jens Neuber 454c1687cf Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-02-13 11:12:22 +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 e7e30bf497 update to 1.11.4 2022-02-09 21:54:33 +08: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