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

2103 commits

This branch
This branch
All branches
Author SHA1 Message Date
Louis Lam 5c3892313e add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN 2021-10-19 14:41:05 +08:00
Louis Lam c57c94642c Merge remote-tracking branch 'origin/master' 2021-10-19 14:26:26 +08:00
Louis Lam 62f168a2a5 config response header 2021-10-19 14:26:10 +08:00
Louis Lam c808f78f09
Merge pull request #735 from gaby/stale-bot 
Support for closing stale Issues/PRs after 6 months of inactivity
 2021-10-19 11:59:37 +08:00
Louis Lam 9c80e1c732
Merge pull request #641 from andreasbrett/patch-1 
Harden 2FA/TOTP implementation according to rfc6238 (part 1)
 2021-10-19 10:17:04 +08:00
Andreas Brett acc2995d86 invalidate used token 2021-10-19 00:42:33 +02:00
Andreas Brett 7def9dcec7
Merge branch 'louislam:master' into patch-1 2021-10-19 00:37:15 +02:00
NeuralMiner a35569481d Updates 2021-10-18 15:26:38 -06:00
NeuralMiner 9ddffc0f7f Updates 2021-10-18 14:35:47 -06:00
NeuralMiner 76e7c8b276 Rebase 2021-10-18 14:35:36 -06:00
NeuralMiner 572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
NeuralMiner e1f1d4a959
Merge branch 'louislam:master' into textchanges 2021-10-18 12:57:28 -06:00
Louis Lam c6fc385289 update to 1.9.1 2021-10-19 00:20:27 +08:00
Louis Lam c645658161 Merge remote-tracking branch 'origin/master' 2021-10-19 00:19:41 +08:00
Louis Lam 182597944d fix #721 2021-10-19 00:19:26 +08:00
Louis Lam 8eaa8116c3
update email 2021-10-18 23:55:00 +08:00
Louis Lam 3512faad14 move kubernetes folder to the k8s-unofficial branch 2021-10-18 23:38:29 +08:00
Louis Lam f11417e854 [upload artifacts] no idea why suddenly not working via env var, hardcode the VERSION instead 2021-10-18 20:43:17 +08:00
Juan Calderon-Perez b5857f7c0c
Fix syntax issue. 2021-10-18 08:23:18 -04:00
Juan Calderon-Perez 6277babf25
Migrate to actions/stale v4.0 2021-10-18 08:22:08 -04:00
Louis Lam 5f36d2acda fix upload artifacts 2021-10-18 20:02:50 +08:00
Louis Lam cc36ff5210 update to 1.9.0 2021-10-18 19:46:15 +08:00
Louis Lam c363d3374e fix "build-docker-nightly-alpine" wrong path 2021-10-18 19:45:50 +08:00
Louis Lam 65a8cb5307
Merge pull request #738 from NixNotCastey/promosms 
PromoSMS - Fixed values for sms type
 2021-10-18 18:28:58 +08:00
Lukas f74b2662c5 Fixed values for sms type 2021-10-18 12:02:54 +02:00
Louis Lam 300a95d779 recompile util.js with tsconfig.json 2021-10-18 17:51:40 +08:00
Louis Lam 23714ab688 genSecret don't need await 2021-10-18 17:37:11 +08:00
Louis Lam 16b44001e7 Merge remote-tracking branch 'andreasbrett/patch-1' into andreasbrett_patch-1 
# Conflicts:
#	src/util.js
 2021-10-18 17:35:17 +08:00
Louis Lam f2f8f33b86 Merge branch 'master' into andreasbrett_patch-1 
# Conflicts:
#	src/util.js
 2021-10-18 17:30:21 +08:00
Louis Lam 6e18f39eb4 [steam] code cleanup 2021-10-18 17:15:28 +08:00
Louis Lam 68d44dd9b3 [steam] do not request if there is no steam api key 2021-10-18 17:11:41 +08:00
Louis Lam 20d59e5a13 fix and move the steam api key to settings page 2021-10-18 17:02:05 +08:00
Louis Lam ae31eb6ba9 Merge branch 'master' into Revyn112_master 
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2021-10-18 15:50:35 +08:00
Andreas Brett df4682d19b
Merge branch 'master' into patch-1 2021-10-18 01:14:58 +02:00
Andreas Brett 11a1f35cc5 independent csprng solution 2021-10-18 01:06:20 +02:00
Juan Calderon-Perez 2a3ce15328
Use default number of operations per day. Defaults to 30 2021-10-17 17:23:44 -04:00
Juan Calderon-Perez 7cb25255bf
Update stale-bot 2021-10-17 17:20:32 -04:00
Juan Calderon-Perez c622f7958f
Add support for closing stale Issues/PR 2021-10-17 17:16:07 -04:00
Louis Lam df5efcc71c
Merge pull request #730 from sargonas/sargonas-patch-1 
Update README.md
 2021-10-17 23:25:19 +08:00
J. Eckert 4cd66b20b1
Update README.md 
additional spelling correction
 2021-10-17 08:08:44 -07:00
J. Eckert 1276102c18
Update README.md 
minor grammatical edits for slight improvements. (Honestly though, your grammar is not that bad at all for not being a native speaker!)
 2021-10-16 23:07:25 -07:00
Louis Lam 6944b35ea7
Merge pull request #667 from zsxeee/i18n 
Missing i18n and zh-CN translation
 2021-10-16 22:47:58 +08:00
Louis Lam 88757ebbbe
Merge pull request #722 from dpatrongomez/master 
Add spanish translation for monitor history and records
 2021-10-16 22:46:29 +08:00
Daniel Patrón Gómez 0a73b84ae6 Add records translations and fix pause translation 2021-10-16 12:45:41 +02:00
Daniel Patrón Gómez 15f36f96c3 Add spanish translation for monitor history 2021-10-16 12:15:39 +02:00
Louis Lam edcaf93446
Merge pull request #721 from dpatrongomez/master 
Add Status Translation
 2021-10-16 17:41:46 +08:00
Louis Lam dec175d55f
Merge pull request #719 from bertyhell/bugfix/edit-monitor 
fix(edit-monitor): no need to escape placeholder {} if not translated
 2021-10-16 17:38:00 +08:00
Louis Lam 9a60f69f66
Merge pull request #720 from bertyhell/bugfix/fix-error-on-first-hearthbeat 
fix(monitor): safely get status of previous beat if first beat
 2021-10-16 17:34:44 +08:00
Daniel Patrón Gómez 53a008ae2b Add Status Translation 2021-10-16 11:32:15 +02:00
Bert Verhelst 1d63dd9ddd fix(monitor): safely get status of previous beat if first beat 2021-10-16 11:28:03 +02:00