Tarun Singh
|
22256dfcd2
|
added timeout for removing the dead loop state
|
2022-01-20 13:04:59 -05: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 |
|
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 |
|
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 |
|
Denis
|
8063449f49
|
ping path is common to all BSDs
|
2022-01-09 17:27:24 +01:00 |
|
James White
|
b6ad4c845a
|
Update PULL_REQUEST_TEMPLATE.md
Correct checklist item and make the UI type of change consistent with all others.
|
2022-01-09 15:31:26 +00:00 |
|
Erik
|
cdcdf377ec
|
Update sl-SI.js
Small langue updates
|
2022-01-09 11:39:05 +01:00 |
|
sovushik
|
30a345d8b6
|
Update ru-RU.js
Updated language files and added new lines
|
2022-01-08 23:00:18 +05:00 |
|
sovushik
|
83d60fea29
|
Update ru-RU.js
1. Updated the language lines (in the correct declension)
2. Added new lines for the "Create Incident" functionality
|
2022-01-08 22:46:05 +05:00 |
|
Matteo D
|
2304c53c8d
|
Fixed some translations
And made them more user-friendly.
|
2022-01-08 13:28:48 +01:00 |
|
Louis Lam
|
d4b86dc472
|
Merge pull request #1133 from thomasleveil/patch-1
fix `TypeError: Cannot read property 'id' of null`
|
2022-01-06 16:19:36 +08:00 |
|
Thomas LÉVEIL
|
46fa6a56fa
|
fix TypeError: Cannot read property 'id' of null
when testing a Google Chat notification
see https://github.com/louislam/uptime-kuma/issues/1126#issuecomment-1006343423
|
2022-01-06 08:48:12 +01:00 |
|
Louis Lam
|
ec5037f30d
|
update to 1.11.3
|
2022-01-06 14:51:20 +08:00 |
|
Louis Lam
|
81a194d826
|
Merge remote-tracking branch 'origin/master'
|
2022-01-06 14:47:21 +08:00 |
|
Louis Lam
|
64b3e04d3f
|
Fix #1129
|
2022-01-06 14:34:45 +08:00 |
|
Louis Lam
|
4ee829ab25
|
Merge pull request #1130 from bilipp/google-chat-notifications
Fix Google Chat notification type mismatch
|
2022-01-06 13:05:55 +08:00 |
|
Philipp Bischoff
|
bcc3cec7d6
|
extract translation for notification type
|
2022-01-05 23:57:40 +01:00 |
|
Philipp Bischoff
|
f8c5015e3f
|
fix google chat type mismatch
|
2022-01-05 23:44:14 +01:00 |
|
Louis Lam
|
8f3ec33591
|
update to 1.11.2
|
2022-01-05 16:40:50 +08:00 |
|
Louis Lam
|
c5fe3a64c2
|
Merge remote-tracking branch 'origin/master'
|
2022-01-05 16:26:03 +08:00 |
|
Louis Lam
|
2a1456cfd0
|
Merge pull request #1124 from MrEddX/bulgarian
Update bg-BG.js
|
2022-01-05 14:28:39 +08:00 |
|
MrEddX
|
69dfc0c0d2
|
Update bg-BG.js
Fixed some typos.
|
2022-01-05 08:15:34 +02:00 |
|
Louis Lam
|
6d11289257
|
Merge pull request #1095 from LeslieLeung/add-wecom-notification
feat(*): support WeCom notification
|
2022-01-04 22:50:30 +08:00 |
|
Leslie Leung
|
590859a95b
|
Merge branch 'master' into add-wecom-notification
|
2022-01-03 21:43:56 +08:00 |
|
Louis Lam
|
f9c0ff1841
|
Merge pull request #1109 from iomataani/master
Updated translation
|
2022-01-03 20:05:46 +08:00 |
|
Louis Lam
|
a8566acbaa
|
Merge pull request #1116 from Minvinea/master
Update translation FR
|
2022-01-03 20:04:33 +08:00 |
|