Commit graph

4944 commits

Author SHA1 Message Date
MaxX
6c95140db1 Translated using Weblate (Vietnamese)
Currently translated at 56.3% (486 of 862 strings)

Translated using Weblate (Thai)

Currently translated at 75.2% (649 of 862 strings)

Translated using Weblate (Slovenian)

Currently translated at 42.2% (364 of 862 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 31.6% (273 of 862 strings)

Translated using Weblate (Basque)

Currently translated at 64.6% (557 of 862 strings)

Co-authored-by: MaxX <github@levantinlynx.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/eu/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/nb_NO/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sl/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/th/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/vi/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Bartosz Gajdemski
8fc693dab3 Translated using Weblate (Polish)
Currently translated at 99.6% (859 of 862 strings)

Co-authored-by: Bartosz Gajdemski <veroneczek@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pl/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Gregor Godler
406e5d5fdd Translated using Weblate (Slovenian)
Currently translated at 41.6% (359 of 861 strings)

Co-authored-by: Gregor Godler <gregor@godler.si>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sl/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
aditya wahyudi
b801d22cd3 Translated using Weblate (Indonesian)
Currently translated at 100.0% (861 of 861 strings)

Co-authored-by: aditya wahyudi <aditbaco@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/id/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Harry Suryapambagya
a3bb0243cf Translated using Weblate (Indonesian)
Currently translated at 99.8% (876 of 877 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (861 of 861 strings)

Co-authored-by: Harry Suryapambagya <harsxv@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/id/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Marcus Vechiato
1f441fa3a4 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (861 of 861 strings)

Co-authored-by: Marcus Vechiato <vechiato@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_BR/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Buchtič
b0a771e341 Translated using Weblate (Czech)
Currently translated at 100.0% (861 of 861 strings)

Co-authored-by: Buchtič <martin.buchta@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
0n1cOn3
0065effc26 Translated using Weblate (German (Switzerland))
Currently translated at 100.0% (861 of 861 strings)

Co-authored-by: 0n1cOn3 <0n1cOn3@gmx.ch>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de_CH/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
geovanedev5
976b6e684b Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.7% (859 of 861 strings)

Co-authored-by: geovanedev5 <geovanedev5@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_BR/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
william luqui
3e14c77b59 Translated using Weblate (Portuguese)
Currently translated at 5.8% (50 of 861 strings)

Co-authored-by: william luqui <william.luqui@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Jochem Pluim
e21aa12fb1 Translated using Weblate (Dutch)
Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Dutch)

Currently translated at 95.2% (820 of 861 strings)

Translated using Weblate (English)

Currently translated at 100.0% (861 of 861 strings)

Co-authored-by: Jochem Pluim <jochem@pluim.nu>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/en/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/nl/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Peter Dave Hello
d53d818321 Translated using Weblate (Chinese (Traditional))
Currently translated at 98.7% (866 of 877 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 99.8% (860 of 861 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 87.6% (755 of 861 strings)

Co-authored-by: Peter Dave Hello <hsu@peterdavehello.org>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
sander732
05eb5b0884 Translated using Weblate (Dutch)
Currently translated at 90.8% (782 of 861 strings)

Co-authored-by: sander732 <eligiussander@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/nl/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Haim Cohen
2f595e464b Translated using Weblate (Hebrew)
Currently translated at 0.1% (1 of 861 strings)

Translated using Weblate (Hebrew (Israel))

Currently translated at 86.5% (745 of 861 strings)

Added translation using Weblate (Hebrew)

Co-authored-by: Haim Cohen <haim1979@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/he/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/he_IL/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Listum
b63305315a Translated using Weblate (Russian)
Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (859 of 859 strings)

Co-authored-by: Listum <listum@orudo.ru>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ru/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
G'olib Narzullayev
60503d0676 Translated using Weblate (Uzbek)
Currently translated at 10.9% (94 of 861 strings)

Translated using Weblate (Uzbek)

Currently translated at 8.6% (74 of 859 strings)

Translated using Weblate (Uzbek)

Currently translated at 0.2% (2 of 859 strings)

Co-authored-by: G'olib Narzullayev <gnarzullayev2000@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/uz/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Alex Campo
9113c049d4 Translated using Weblate (Portuguese (Brazil))
Currently translated at 96.8% (832 of 859 strings)

Co-authored-by: Alex Campo <alex.mdcampo@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_BR/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Kisem
b7ab17bf5e Translated using Weblate (Hungarian)
Currently translated at 63.3% (544 of 859 strings)

Co-authored-by: Kisem <kiss.m.aron@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/hu/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Andy Chatziliadis
61f32f5bbe Translated using Weblate (Greek)
Currently translated at 77.9% (670 of 859 strings)

Co-authored-by: Andy Chatziliadis <chatzeiliadis@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/el/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Michal
3dbc15cb69 Translated using Weblate (Czech)
Currently translated at 99.4% (856 of 861 strings)

Translated using Weblate (Czech)

Currently translated at 97.9% (841 of 859 strings)

Co-authored-by: Michal <black23@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/cs/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
AnnAngela
caf4584311 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 98.0% (860 of 877 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (858 of 858 strings)

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
wc7086
2637f6665b Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (858 of 858 strings)

Co-authored-by: wc7086 <j19981106@protonmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Bond
cfe35c382e Translated using Weblate (Vietnamese)
Currently translated at 56.5% (485 of 858 strings)

Co-authored-by: Bond <xuantan97@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/vi/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Marco
643ebea0a6 Translated using Weblate (German)
Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (German)

Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (German)

Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (German)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (German)

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (German)

Currently translated at 100.0% (858 of 858 strings)

Co-authored-by: Marco <marco@nanoweb.ch>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de_CH/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Алексей Добрый
92324e94da Translated using Weblate (Russian)
Currently translated at 97.8% (823 of 841 strings)

Co-authored-by: Алексей Добрый <support@diera.ru>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ru/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Regis Vieira Delgado
43bfb366f2 Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.8% (806 of 841 strings)

Co-authored-by: Regis Vieira Delgado <finallf@hotmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pt_BR/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
DevMirza
5820c472cb Translated using Weblate (Punjabi)
Currently translated at 0.5% (5 of 861 strings)

Translated using Weblate (Punjabi (Pakistan))

Currently translated at 1.1% (10 of 861 strings)

Translated using Weblate (Urdu)

Currently translated at 62.4% (538 of 861 strings)

Translated using Weblate (Urdu)

Currently translated at 61.3% (528 of 861 strings)

Translated using Weblate (Punjabi (Pakistan))

Currently translated at 0.4% (4 of 841 strings)

Translated using Weblate (Urdu)

Currently translated at 60.2% (507 of 841 strings)

Added translation using Weblate (Punjabi)

Added translation using Weblate (Punjabi (Pakistan))

Co-authored-by: DevMirza <pzhafeez@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pa/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pa_PK/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ur/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
AnnAngela
127608ffe9 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hans/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
stanol
917b20fe3d Translated using Weblate (Ukrainian)
Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.8% (876 of 877 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.8% (876 of 877 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (858 of 858 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: stanol <stanol777@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/uk/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:32 +00:00
Ömer Faruk Genç
221f625db1 Translated using Weblate (Turkish)
Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (Turkish)

Currently translated at 99.8% (876 of 877 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (858 of 858 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: Ömer Faruk Genç <omer@farukgenc.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/tr/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
Adam Stachowicz
45c83fdd49 Translated using Weblate (Polish)
Currently translated at 100.0% (858 of 858 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/pl/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
Davide Pirelli
a06d88832c Translated using Weblate (Italian)
Currently translated at 76.2% (641 of 841 strings)

Co-authored-by: Davide Pirelli <info@inkstudio.it>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/it/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
OlevO1
59cadc20d0 Translated using Weblate (Hungarian)
Currently translated at 58.8% (495 of 841 strings)

Co-authored-by: OlevO1 <imagyarcsik@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/hu/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
Ivan Bratović
2557cd3c3e Translated using Weblate (Croatian)
Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: Ivan Bratović <ivanbratovic4@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/hr/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
Cyril59310
8b1324493e Translated using Weblate (French)
Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (French)

Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (French)

Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (French)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (French)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (French)

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (French)

Currently translated at 100.0% (858 of 858 strings)

Translated using Weblate (French)

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: Cyril59310 <archas.cyril@hotmail.fr>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
Louis Lam
f80168e0de Translated using Weblate (Uzbek)
Currently translated at 0.2% (2 of 859 strings)

Added translation using Weblate (Uzbek)

Translated using Weblate (German)

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/uz/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
Marco
332bc43bbc Translated using Weblate (German (Switzerland))
Currently translated at 100.0% (858 of 858 strings)

Translated using Weblate (German)

Currently translated at 100.0% (841 of 841 strings)

Translated using Weblate (German (Switzerland))

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: Marco <marco@nanoweb.ch>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/de_CH/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
simonghpub
d28627e855 Translated using Weblate (Danish)
Currently translated at 75.3% (634 of 841 strings)

Co-authored-by: simonghpub <simonpmt@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/da/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
MrEddX
26c3b79d5c Translated using Weblate (Bulgarian)
Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (877 of 877 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (862 of 862 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (861 of 861 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (859 of 859 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (858 of 858 strings)

Translated using Weblate (Bulgarian)

Currently translated at 100.0% (841 of 841 strings)

Co-authored-by: MrEddX <mreddx@chatrix.one>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/bg/
Translation: Uptime Kuma/Uptime Kuma
2023-12-15 10:18:31 +00:00
Louis Lam
207847505a
1.23.10 to master (#4226) 2023-12-13 02:10:04 +08:00
Louis Lam
1a47563eb8 Merge branch '1.23.X' into version-merge
# Conflicts:
#	package-lock.json
#	package.json
#	server/server.js
#	server/uptime-kuma-server.js
2023-12-13 01:54:08 +08:00
Nelson Chan
4185ec20b0
Fix: Origin undefined on error handling (#4224) 2023-12-13 01:35:39 +08:00
Louis Lam
4245ea86e7 Update to 1.23.10 2023-12-13 00:55:58 +08:00
Louis Lam
f861a48dfc
Smoothing the update for origin check (#4216) 2023-12-12 16:23:41 +08:00
Louis Lam
fa1214ae5e
Rebse #4213 (#4215)
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2023-12-11 19:30:01 +08:00
Nelson Chan
99adac3eb9
Fix: typo for disconnectAllSocketClients (#4213) 2023-12-11 19:26:20 +08:00
Nelson Chan
89beb5f264
Fix: Handle trailing slash for status page routing (#4185)
* Fix: Handle trailing slash

* Chore: Add desc for default slug

* Chore: Use margin instead of space

* Minor
2023-12-11 03:05:13 +08:00
Louis Lam
65e57e5621
Merge pull request #4208 from louislam/1.23.X-merge-to-2.X.X
1.23.9 changes merge to master
2023-12-11 02:40:12 +08:00
Louis Lam
719ef856e8 Merge manually 2023-12-11 02:36:08 +08:00
Louis Lam
869ee8ec50 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
# Conflicts:
#	.github/workflows/auto-test.yml
#	extra/reset-password.js
#	package-lock.json
#	package.json
#	server/routers/status-page-router.js
#	server/server.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
#	src/components/ActionInput.vue
#	src/util.js
#	src/util.ts
2023-12-11 02:13:47 +08:00