Commit graph

264 commits

Author SHA1 Message Date
Ponkhy 91d4c15b4d
Merge branch 'louislam:master' into master 2021-08-15 20:28:30 +02:00
Louis Lam 80eadcb236
Merge pull request #214 from ChrisTheBaron/pushbullet
Add Pushbullet notification service
2021-08-16 01:06:27 +08:00
LouisLam 7e5a8c896b Merge remote-tracking branch 'chakflying/ping-graph' 2021-08-16 01:00:18 +08:00
Chris Taylor efe75bde75 Add Pushbullet notification service 2021-08-13 21:18:43 +01:00
Louis Lam 2ae2022e62
Merge pull request #211 from AlexandreGagner/master
Add Octopush Notification Service
2021-08-13 00:26:35 +08:00
LouisLam 37f1d60f82 also change meta tag theme-color 2021-08-13 00:23:40 +08:00
Louis Lam 7ca80fc086
fix auto theme 2021-08-12 22:17:20 +08:00
Alexandre Gagner ed93aae1c2 add octopush notification service 2021-08-12 00:15:53 +02:00
Nelson Chan 8f150aaeb9 Feat: Use Async Component 2021-08-12 00:47:58 +08:00
Nelson Chan 6ed1d8cb2f Feat: Use selective import, improve tooltip UI 2021-08-12 00:31:21 +08:00
Nelson Chan 71bec74081 Feat: Add down-ed bars, improve UI 2021-08-11 23:40:56 +08:00
Nelson Chan 2bd735035c Misc: Show graph by default 2021-08-11 23:40:56 +08:00
Nelson Chan 48c6d8f19f Feat: Display recent ping chart 2021-08-11 23:40:51 +08:00
Ponkhy 45c162583b Added more space over the badge on mobile screens 2021-08-11 11:16:53 +02:00
Ponkhy 1d0b332b42 Fixed function buttons for smaller screens 2021-08-10 18:29:47 +02:00
LouisLam f099e4270d change to Accept: */* to better support all websites 2021-08-10 20:23:15 +08:00
LouisLam 8979311653 Merge remote-tracking branch 'origin/master' 2021-08-10 15:04:15 +08:00
LouisLam 4f058c5b47 do not fix height for h1 2021-08-10 15:04:01 +08:00
LouisLam 9ba1743900 split mobile mixin from socket mixin 2021-08-10 15:02:46 +08:00
Nelson Chan 113899e278
Fix: unify styling of theme switch with UI 2021-08-10 12:20:06 +08:00
LouisLam d1d000bd74 remove red circle around the btn-close while focus 2021-08-10 00:16:13 +08:00
Ponkhy e39c46ff9b Fixed Close Button Color in Dark Mode 2021-08-09 17:56:44 +02:00
LouisLam 116d803592 minor 2021-08-09 21:03:22 +08:00
LouisLam 550c9703a6 fix radio button not checked 2021-08-09 18:46:57 +08:00
LouisLam b69185ee9e control search engine visibility 2021-08-09 18:16:27 +08:00
LouisLam bf33f97c9e code re-use and eslint 2021-08-09 13:49:37 +08:00
LouisLam 6f489e7e0f Accepted Status Codes / Max Redirects for http/keyword only 2021-08-09 02:01:08 +08:00
LouisLam f9cb8293f3 improve a bit ux 2021-08-09 01:58:56 +08:00
LouisLam 11b8c61079 wip: add search engine control in setting 2021-08-09 01:58:24 +08:00
LouisLam 6ca7ca4e7e improve alignment and font size 2021-08-08 21:42:37 +08:00
LouisLam 9fa8d5c1fa improve multiselect 2021-08-08 21:14:29 +08:00
LouisLam 3265c3cbc3 improve multiselect 2021-08-08 21:03:10 +08:00
LouisLam a79e6aa338 dark theme for multiselect 2021-08-08 15:02:33 +08:00
LouisLam 3005585c0f Merge branch 'master' into redirects&status 2021-08-08 14:48:00 +08:00
Philipp Dormann 123fca43a1
FEAT: darkmode (#155)
* darkmode fixes

* fix: darkmode: empty beats in active/ hovered state

* fix: color for empty beats

* fix: navbar background color

* Update src/assets/vars.scss

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>

* Update src/assets/app.scss

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>

* wip, split dark theme style by .dark and store light theme to normal

* add back missing css

* working switch theme button and tuning dark theme

* finish dark theme

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Co-authored-by: LouisLam <louislam@users.noreply.github.com>
2021-08-08 13:47:29 +08:00
LouisLam d5b40dfebf better code reuse and "Username" to "Bot Display Name" 2021-08-08 11:03:22 +08:00
Niyas 4469b3a19b
Added discord username field 2021-08-07 11:13:25 +05:30
Niyas 91fce75a93
Removed UptimeKuma url field 2021-08-06 17:38:16 +05:30
LouisLam 5a6e5b7948 change multiselect color 2021-08-06 19:48:51 +08:00
LouisLam adcd251076 Merge branch 'master' into redirects&status 2021-08-06 19:26:44 +08:00
Niyas 908176c910
Discord enhancements 2021-08-05 21:42:45 +05:30
Nelson Chan 93ea2c277a
Update src/pages/EditMonitor.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-08-05 21:06:47 +08:00
LouisLam 6251f47050 fix the min height of monitor list 2021-08-05 19:56:20 +08:00
Nelson Chan 8f7885e58a Feat: Implement MaxRedirects & StatusCodes 2021-08-05 19:04:38 +08:00
Philipp Dormann e34a8e2e4a
FEAT: PUSHY Notifier (#154)
FEAT: PUSHY Notifier (#154)
2021-08-03 23:14:27 +08:00
LouisLam 4d71e03039 improve #39 2021-08-03 15:14:26 +08:00
LouisLam 2740f096c0 Merge remote-tracking branch 'origin/master' 2021-08-03 13:07:37 +08:00
LouisLam 8ebaca4c5c improve disableAuth handling 2021-08-03 13:07:20 +08:00
Nelson Chan 5b9d3357aa
Fix: Increase width of status pill 2021-08-03 10:57:56 +08:00
LouisLam 6f868c9ec3 implement no auth 2021-07-31 23:41:24 +08:00
LouisLam c6a66fad79 add setting for disable auth 2021-07-31 21:57:58 +08:00
LouisLam 9f0be5f531 improve the connection error msg 2021-07-31 21:13:32 +08:00
LouisLam 642a711bcd Confirm Dialog: allow changing the button text 2021-07-31 18:58:12 +08:00
LouisLam b7fbc2c0e6 add LinaSea option in select box 2021-07-31 13:37:42 +08:00
LouisLam 2ebd79d037 run eslint for lunasea change 2021-07-31 13:35:18 +08:00
Niyas 67a4e949a2
LunaSea Support 2021-07-31 10:31:41 +05:30
LouisLam 63f0a36811 implement upside down mode and ignore tls error 2021-07-31 00:01:04 +08:00
LouisLam 60aa67892d store ignoreTls and upsideDown into db 2021-07-30 19:18:26 +08:00
LouisLam 081abcb6a1 add util.ts for sharing common functions between frontend and backend 2021-07-30 11:23:04 +08:00
LouisLam 71af902a4e add fields to EditMonitor.vue 2021-07-30 01:09:14 +08:00
LouisLam 4b86c84c36 fix icon for "Resume" 2021-07-30 01:02:41 +08:00
LouisLam e6915d8964 unexpected space add to router-link due vue/singleline-html-element-content-newline, set it to off 2021-07-29 01:01:55 +08:00
LouisLam 133c7230bc fix resize problem 2021-07-28 23:03:37 +08:00
Adam Stachowicz d54bc866b4 Fix block-no-empty error from Stylelint 2021-07-27 22:23:46 +02:00
Adam Stachowicz be1fc0c2b6 Missing this part 2 2021-07-27 20:03:53 +02:00
Adam Stachowicz 4c8fdd07d9 Manual fixes 2021-07-27 19:53:59 +02:00
Adam Stachowicz 9648d700d7 Autofix on save 2021-07-27 19:47:13 +02:00
LouisLam cafd2c7388 add vue-fontawesone 2021-07-27 16:52:44 +08:00
LouisLam bf3e9dccd2 improve the ui of cert info 2021-07-26 22:53:07 +08:00
LouisLam 5b18a6a518 Merge branch 'master' into tls-expiry
# Conflicts:
#	server/model/monitor.js
2021-07-26 20:35:50 +08:00
Louis Lam 0dbecca10f
Merge pull request #102 from NiNiyas/pushover-enhancements
Pushover enhancements
2021-07-23 12:32:36 +08:00
rezzorix 2450b3d082
Small grammar updates to Settings.vue
Just small grammar corrections.
2021-07-23 11:48:39 +08:00
Niyas 77fbfc23be
Pushover enhancements 2021-07-22 19:28:25 +05:30
LouisLam 5a219554b3 grammar 2021-07-22 19:49:46 +08:00
LouisLam 70b1f197c1 rename "Retry Pings" to "Retries" 2021-07-22 19:02:44 +08:00
LouisLam 32a5e838ba add patch3.sql and fix duplicate id in EditMonitor.vue 2021-07-22 17:44:59 +08:00
LouisLam 86e18ac11d Merge branch 'master' into Spiritreader_master
# Conflicts:
#	src/pages/EditMonitor.vue
2021-07-22 17:34:41 +08:00
Nelson Chan f20ab4b0e3 Fix: use Optional chaining 2021-07-22 16:13:58 +08:00
Nelson Chan 96c60dd94a Feat: Add database storage for TLS info 2021-07-22 16:04:32 +08:00
Nelson Chan ccda6f05f5 Feat: Add Barebones certificate info display 2021-07-22 14:26:43 +08:00
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