Commit graph

148 commits

Author SHA1 Message Date
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
Philipp Dormann
8c3ec93af1
add Pushy notification service 2021-07-17 00:55:30 +02:00
Philipp Dormann
dbe4ac210a
fix accessibility of notification form for slack notifier 2021-07-17 00:42:37 +02:00
Philipp Dormann
6394c9b137
🐞 html fix 2021-07-17 00:41:38 +02:00
Philipp Dormann
da8e15a90b
🚧 WIP: Pushover integration 2021-07-17 00:39:36 +02:00
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
3ce82503a6
Merge branch 'feature/gotify-upstream-merge'
# Conflicts:
#	src/components/NotificationDialog.vue
2021-07-14 22:05:47 +02: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
Philipp Dormann
f09abaf9a0
Merge remote-tracking branch 'NiNiyas/slack-webhook'
# Conflicts:
#	README.md
#	dockerfile
#	package.json
#	server/notification.js
#	src/components/NotificationDialog.vue
2021-07-14 21:45:51 +02:00
Niyas
63c6e29e62
Added Slack Webhook support 2021-07-14 21:08:38 +05:30
Philipp Dormann
77b83ddc44
🐞 fix for EditMonitor value binding 2021-07-14 11:43:15 +02:00
Philipp Dormann
3d5be4c07f
add missing v-bind:key in EditMonitor 2021-07-14 11:33:08 +02:00
Philipp Dormann
49be12cad6
don't enforce 20s interval, but default to 20s 2021-07-14 11:32:52 +02:00
Philipp Dormann
126f00e739
added Gotify Support 2021-07-14 11:25:10 +02:00
Philipp Dormann
ccf9d2ad5c
add support for Gotify 2021-07-14 11:00:09 +02:00
Philipp Dormann
deea889e8d
several css color fixes 2021-07-13 12:51:46 +02:00
Philipp Dormann
35a996454a
🌑 darkmode fixes 2021-07-13 12:49:34 +02:00
Philipp Dormann
7cabafebaf
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	docker-compose.yml
#	dockerfile
#	package-lock.json
#	package.json
#	server/notification.js
#	server/server.js
#	src/assets/vars.scss
2021-07-13 12:35:38 +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