Commit graph

3490 commits

Author SHA1 Message Date
LouisLam a8e170f6a8 Merge branch 'master' into public-dashboard
# Conflicts:
#	server/server.js
2021-09-20 18:48:44 +08:00
LouisLam 6aaf984f29 fix retryInterval = 0 if it is an old monitor. (#380 https://github.com/louislam/uptime-kuma/pull/380#issuecomment-922618356) 2021-09-20 18:23:53 +08:00
LouisLam 76a39f1388 update to 1.6.3 2021-09-20 16:56:03 +08:00
LouisLam 34c0fa59a8 fix reset-password (#448)
(cherry picked from commit b0e9c5bcb4)
2021-09-20 16:33:22 +08:00
LouisLam 0664217a09 Merge remote-tracking branch 'origin/master' 2021-09-20 16:29:43 +08:00
LouisLam b0e9c5bcb4 fix reset-password (#448) 2021-09-20 16:29:18 +08:00
LouisLam 0b572df3d0 [status page] store config 2021-09-20 16:22:18 +08:00
zsxeee ad6fcc2f2e
Merge branch 'master' into notification_component 2021-09-20 13:16:24 +08:00
Adam Stachowicz bcc02c1680 Add formatting and comments from util.ts to util.js 2021-09-19 23:09:52 +02:00
Louis Lam 795d5f586f
Merge pull request #444 from Saibamen/avg-ping_avg-response
Avg. Ping and Avg. Response translation keys
2021-09-20 02:23:50 +08:00
LouisLam 7ee98d989c [status page] implement rest api for heartbeat 2021-09-19 23:24:51 +08:00
Adam Stachowicz 7dc1e84e44 Avg. Ping and Avg. Response translation keys 2021-09-19 15:15:12 +02:00
LouisLam 6350c43cc3 fix newline? 2021-09-19 19:20:27 +08:00
LouisLam fd95d41d9f [status page] many update and save group list 2021-09-19 19:04:51 +08:00
zsxeee ffbc25722d
Move default setting to child component 2021-09-19 18:05:22 +08:00
Louis Lam 7665bae927
Merge pull request #441 from iomataani/master
Italian translation updated
2021-09-19 16:32:08 +08:00
Ioma Taani 09e38269c6
Merge branch 'louislam:master' into master 2021-09-19 09:45:42 +02:00
LouisLam 6681f49a58 Merge branch 'master' into public-dashboard
# Conflicts:
#	.dockerignore
2021-09-19 15:16:13 +08:00
Louis Lam 3fc2ba3d76
Merge pull request #436 from nbvcxz/running_non-root_user
Docker entrypoint to run the application as non-root user
2021-09-19 14:33:20 +08:00
Louis Lam 78e12ab899
Merge pull request #439 from gaby/dockerignore
Add missing entries to dockerignore
2021-09-19 12:58:55 +08:00
Juan Calderon-Perez 2b8c049e7b
Add missing entries to dockerignore 2021-09-18 13:53:24 -04:00
LouisLam f0ac3c82d2 add some comments 2021-09-19 00:51:05 +08:00
Louis Lam 803029a9e4
Merge pull request #429 from Ponkhy/main
Added regex to hostname input
2021-09-19 00:38:40 +08:00
Louis Lam c3f1cebeab
Merge pull request #435 from DX37/translation-ru
fresh translations to ru-RU.js and Settings.vue
2021-09-19 00:37:37 +08:00
Louis Lam 5d9814559c
Merge pull request #424 from Saibamen/fix_PL
Fix polish translation and translate new keys
2021-09-19 00:37:23 +08:00
DX37 9ef45a9c7e
fresh translations to ru-RU.js and Settings.vue 2021-09-18 22:25:06 +07:00
Michal Ciania 7f78cc8d0f Substitute default values only once 2021-09-18 11:33:25 +02:00
Ioma Taani ca84044809
Merge branch 'louislam:master' into master 2021-09-17 23:05:56 +02:00
Michal Ciania 9eaa4ab846 Docker entrypoint for running the application as non-root user 2021-09-17 22:57:27 +02:00
Marcos Sigueros Fernández c3122a9807
Update es-ES.js (#430)
Simple but annoying language fix.
2021-09-17 22:20:45 +08:00
Ponkhy f6498caa9a Merge branch 'main' of https://github.com/Ponkhy/uptime-kuma into main 2021-09-17 16:02:28 +02:00
Ponkhy 3a0bc80016 Added regex to hostname input 2021-09-17 16:02:20 +02:00
zsxeee 2fb3c40307
Variable name and key binding 2021-09-17 20:40:57 +08:00
zsxeee 66e40d9fcb
Edit comment and remove unused variable 2021-09-17 20:20:44 +08:00
Ioma Taani cbbc503f8e
Merge branch 'louislam:master' into master 2021-09-17 11:31:21 +02:00
zsxeee de8b61ef2b
Remove unused imports 2021-09-17 17:16:52 +08:00
zsxeee 534ac4b720
Move Apprise check to child component 2021-09-17 16:54:50 +08:00
zsxeee e9735d239b
Convert notification form to separate component 2021-09-17 16:07:03 +08:00
Louis 5be51abd8f Merge remote-tracking branch 'origin/master' 2021-09-17 15:19:36 +08:00
Louis 6ec219908b test nodejs 16 2021-09-17 15:19:19 +08:00
Louis a6fdd272a6 [status page] minor 2021-09-17 14:42:19 +08:00
Ponkhy 1b5e723f60 Added descriptions to uploadBackup function 2021-09-17 03:25:18 +02:00
Ponkhy 4bdada36a9 Removed if includes version 2021-09-16 20:18:31 +02:00
Adam Stachowicz 250c2bdd6d Missing this 2021-09-16 20:17:25 +02:00
Adam Stachowicz 8e49d84050 Fix polish translation and translate new keys 2021-09-16 20:13:57 +02:00
Louis Lam 112d72da47
update discussion 2021-09-17 00:48:04 +08:00
LouisLam 9b8f01cfc6 since eslint can auto fix semicolon, standardize all end with semicolon 2021-09-16 22:57:34 +08:00
LouisLam 579e07ded4 Merge branch 'master' into public-dashboard 2021-09-16 22:52:05 +08:00
kry008 a04878fa84
Finishing the translation of PL (#422) 2021-09-16 22:49:24 +08:00
LouisLam 2955abb5d9 [status page] create incident 2021-09-16 22:48:28 +08:00