Commit graph

684 commits

Author SHA1 Message Date
LouisLam 916b9da0dc Merge branch 'master' into something
# Conflicts:
#	server/notification.js
#	src/components/NotificationDialog.vue
2021-07-22 11:12:52 +08:00
LouisLam afd4cf2425 Merge branch 'master' into simple_pagination 2021-07-22 10:42:30 +08:00
Sam 8b905b6b12
Indentation fix in editor
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-07-20 17:38:21 +02:00
LouisLam 02b4dfc100 prevent the telegram getUpdates URL go out of box 2021-07-20 20:18:56 +08:00
Sam 02230930c5 Merge branch 'master' of https://github.com/Spiritreader/uptime-kuma 2021-07-19 18:26:00 +02:00
Sam a8b102ad4a add retries for pinging function
backend:
- new field for monitor: maxretries
- new pending status while service is retrying: 2
- pending status event is not marked important
- pending pings however register as downtime in the calculation

frontend:
- added pending status while service is retrying
- added color for new pending status
- added field to configure amount of retries

database:
- IMPORTANT: THIS REQUIRES MIGRATION!!!!
- added field: maxretries with default value 0
2021-07-19 18:23:06 +02:00
LouisLam 77af41bfff env default to production 2021-07-19 23:06:42 +08:00
Adam Stachowicz 5bd3184ebf Use connect_error event 2021-07-18 20:59:00 +02:00
Adam Stachowicz 59ebe134f1 Fix indentation 2021-07-18 20:46:45 +02:00
Adam Stachowicz 851ceef3d5 Use NODE_ENV from Express and Socket.IO 2021-07-18 20:21:17 +02:00
Adam Stachowicz 16f363ac38 Merge branch 'master' into simple_pagination 2021-07-18 13:36:57 +02:00
Louis Lam d6b9403f60
Merge pull request #76 from Saibamen/fix_remember_me
Fix multiple labels for `Remember me`
2021-07-18 19:28:48 +08:00
Adam Stachowicz f9274557f3 Fix center 2021-07-18 13:22:39 +02:00
Adam Stachowicz 44b66cbd2e Fix Remember me label 2021-07-18 13:00:59 +02:00
LouisLam 66037e236c add apprise support 2021-07-18 18:51:58 +08:00
Adam Stachowicz ce6841eae7 Merge branch 'master' into simple_pagination 2021-07-18 11:46:32 +02:00
Adam Stachowicz 268c8e50f5
Merge branch 'master' into something 2021-07-18 09:42:08 +00:00
Louis Lam 13b3a5be9c
Merge pull request #68 from Saibamen/use_console_error
Improve printing to console
2021-07-18 14:55:30 +08:00
Louis Lam 2e31e780a1
Merge pull request #67 from Saibamen/lighthouse_improvements
[Lighthouse] Some improvements
2021-07-18 13:48:35 +08:00
Louis Lam 6f3ea21864
Merge pull request #61 from NiNiyas/slack-enhancements
Slack Enhancements and aligns footer to center
2021-07-18 13:47:04 +08:00
Adam Stachowicz d94894b7e0 Fix require-v-for-key, remove unused declarations and double spaces 2021-07-18 03:10:15 +02:00
Adam Stachowicz a173700cd4 Add pagination 2021-07-18 03:04:40 +02:00
Adam Stachowicz 2bff62cade Improve printing to console 2021-07-17 23:13:54 +02:00
Adam Stachowicz bfb4a5bcd4 Add alt="Logo" 2021-07-17 22:56:54 +02:00
Adam Stachowicz e87b78501b rel="noopener" for external link 2021-07-17 22:55:53 +02:00
Niyas 7808aef58f
Pushover support 2021-07-17 18:42:54 +05:30
Niyas 20cad50593
Pushover support 2021-07-17 17:49:56 +05:30
Niyas 829a2a191d
Footer center align 2021-07-17 13:42:05 +05:30
Niyas 65b320d06b
Slack Enhancements 2021-07-17 12:48:42 +05:30
LouisLam dfa9b3a0ca fix require() actually not working after build in the frontend 2021-07-17 00:51:28 +08:00
LouisLam b3bff8d735 add graceful shutdown 2021-07-16 01:44:51 +08:00
Louis Lam f2af5bc064
Merge pull request #46 from NiNiyas/slack-webhook
Added Slack webhook notification
2021-07-15 11:59:41 +08:00
Philipp Dormann 25a93b05dc
easier merging 🤞 2021-07-14 22:00:15 +02:00
Philipp Dormann 53e203d2f9
add gotify priority
ref https://github.com/louislam/uptime-kuma/pull/43
closes https://github.com/louislam/uptime-kuma/issues/50
2021-07-14 21:56:38 +02:00
Niyas 63c6e29e62
Added Slack Webhook support 2021-07-14 21:08:38 +05:30
Philipp Dormann 126f00e739
added Gotify Support 2021-07-14 11:25:10 +02:00
LouisLam 010ebea210 show version in the footer 2021-07-13 18:08:12 +08:00
LouisLam b3a5d868a7 catch timezone error if browser do not have 2021-07-13 17:46:39 +08:00
Louis Lam fef41b44a8
Revert "basic darkmode" 2021-07-13 12:16:11 +08:00
Louis Lam 6af65b688d
Merge pull request #32 from philippdormann/feature/darkmode
basic darkmode
2021-07-13 11:58:57 +08:00
LouisLam 3e4a98b6bc Merge branch 'dev'
# Conflicts:
#	server/notification.js
2021-07-13 11:42:51 +08:00
Louis Lam 622681470d
Merge pull request #22 from TheGuyDanish/master
Discord notification rework
2021-07-13 10:20:47 +08:00
Philipp Dormann d9e2c230bf
Merge branch 'master' of philippdormann/uptime-kuma into philippdormann/uptime-kuma->feature/darkmode
darkmode based on css variables. ref https://github.com/louislam/uptime-kuma/issues/21
2021-07-12 22:21:19 +02:00
jacr13 e053ee6573 fix bad pasting 2021-07-12 22:10:26 +02:00
jacr13 3e305b79b2 remove debub console log 2021-07-12 22:08:42 +02:00
jacr13 c6237277c0 add support for signal notifications 2021-07-12 22:06:03 +02:00
Philipp Dormann 900219deb1
Merge remote-tracking branch 'theguydanish/master'
# Conflicts:
#	package-lock.json
#	package.json
2021-07-12 21:58:13 +02:00
Philipp Dormann 789094a2ee
formatting socket.js + deal with broken windows ports - default :50013 2021-07-12 21:49:18 +02:00
Philipp Dormann dae92d0ae4
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	package.json
2021-07-12 21:40:35 +02:00
LouisLam 1259ff5368 smtp username/password is not required 2021-07-13 01:02:50 +08:00
LouisLam ad615d1a90 remove some timezones which may cause error 2021-07-12 23:28:56 +08:00
TheGuyDanish 613c42b6d8 Discord revamp! Changed from bot to webhook, removed discord.js dep 2021-07-12 14:13:36 +01:00
LouisLam 56fcfc9369 fix show N/A if the ping is 0ms 2021-07-12 11:20:18 +08:00
LouisLam a9d19ae06a support json for keyword type 2021-07-12 10:52:41 +08:00
Philipp Dormann e4f38d833d
🌑 darkmode support for nav link hover 2021-07-12 00:41:28 +02:00
Philipp Dormann 8b83266b00
🌑 add darkmode support for focused input elements 2021-07-12 00:37:08 +02:00
Philipp Dormann 6fb1b344f6
🌑 darkmode support on form elements 2021-07-12 00:33:52 +02:00
Philipp Dormann 66d991bd05
🐞 added missing v-bind:key to Dashboard 2021-07-12 00:27:29 +02:00
Philipp Dormann 673d3c124c
🚧 WIP on darkmode 🌑 2021-07-12 00:26:33 +02:00
LouisLam a1adfb95cc minor fix 2021-07-11 23:12:43 +08:00
LouisLam f9800a087e optimize for mobile 2021-07-11 15:23:28 +08:00
LouisLam ae07cd9c35 prepare for docker 2021-07-11 14:20:31 +08:00
LouisLam 5f89940ab6 add setup page 2021-07-11 13:47:57 +08:00
LouisLam 86492f6dad remove some debug msg 2021-07-10 12:04:40 +08:00
LouisLam 44bcd78f9a implement discord 2021-07-10 11:38:00 +08:00
LouisLam 072e86542a implement smtp 2021-07-10 01:08:08 +08:00
LouisLam 0ad04d1468 implement webhook 2021-07-09 19:33:22 +08:00
LouisLam d24a15410e send notification for important heartbeat 2021-07-09 17:55:48 +08:00
LouisLam 3bdf174e90 add telegram notification 2021-07-09 14:14:03 +08:00
LouisLam d4a651e211 implement remember me 2021-07-01 22:16:02 +08:00
LouisLam 55bd6b6d7a implement timezone 2021-07-01 21:47:14 +08:00
LouisLam 1d64f643b1 implement keyword monitor 2021-07-01 17:19:28 +08:00
LouisLam ef028794ac sort dashboard home event list 2021-07-01 17:05:02 +08:00
LouisLam a6b5986dd6 add ping and fix uptime 2021-07-01 17:00:23 +08:00
LouisLam 9c653c3d05 implement tcping 2021-07-01 14:03:06 +08:00
LouisLam 84c21b71c0 implement uptime 2021-07-01 13:11:16 +08:00
LouisLam 82afddcfd6 add duration to heartbeat, add timezone array 2021-07-01 02:02:54 +08:00
LouisLam 46f07fc17e many update again 2021-06-30 21:04:58 +08:00
Louis 9fa84a0a2b many update 2021-06-29 16:06:20 +08:00
LouisLam 932ebdb8d6 add a icon 2021-06-27 17:31:39 +08:00
LouisLam d02401b1c2 many update 2021-06-27 16:10:55 +08:00
LouisLam 6974f0f3ad finish heartbeat bar 2021-06-26 14:32:12 +08:00
LouisLam 497d63ef7d implementing heartbeat bar 2021-06-26 03:03:06 +08:00
LouisLam 0a4fb45a8c init 2021-06-25 21:55:49 +08:00