ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
660005b143
cleaned up code
2022-06-14 08:49:36 -05:00
98f3c126e5
passed lint
2022-06-14 07:58:35 -05:00
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2022-06-14 07:42:53 -05:00
c690d1c3a1
fix timeout bypass for upside down push monitor
2022-06-13 22:05:58 -07:00
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2022-06-14 10:36:29 +08:00
54b9698a05
Update
2022-06-13 21:44:10 +08:00
6424fe77ab
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
2022-06-13 21:15:47 +08:00
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2022-06-13 20:56:14 +08:00
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:53:19 +08:00
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:50:43 +08:00
1c4ddaeddf
Update
2022-06-13 18:17:47 +08:00
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-06-13 17:06:12 +08:00
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-06-13 17:06:05 +08:00
404923b7c8
bugfix
2022-06-12 22:49:04 +08:00
a41023ca2a
Update
2022-06-12 22:41:24 +08:00
817c941489
Add Bark Notification Parameters
2022-06-12 22:30:42 +08:00
5f6347d277
pull request for adding alertnow notification
2022-06-12 04:02:44 +09:00
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-11 17:23:12 +01:00
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2022-06-11 20:59:58 +08:00
aa398948da
Merge branch 'louislam:master' into patch-1
2022-06-11 09:41:03 +10:00
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2022-06-09 19:33:10 +08:00
54548e34ed
Added label to status badge
2022-06-08 20:05:10 +10:00
2c0180f323
Fix: Fix error when status page desc. is null
2022-06-07 14:57:23 +08:00
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
2022-06-06 22:40:26 +08:00
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
2022-06-06 21:52:41 +08:00
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
2022-06-05 23:43:25 +08:00
091158cfe7
[Status Page] Preload data
2022-06-01 13:05:12 +08:00
e4ad8cbfc8
Remove unused variables
2022-05-31 23:06:43 +08:00
a674caa520
[Status Page] Add og meta tags
2022-05-31 22:53:48 +08:00
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:32:42 +02:00
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:32:19 +02:00
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:31:45 +02:00
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08:00
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
2022-05-30 14:00:39 +08:00
ea10d89f51
show correct down message for first tick
2022-05-28 19:57:45 -07:00
7f46223d68
Fix another log.debug call
2022-05-28 23:22:44 +08:00
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
ab4edf2092
Fix log.debug calls
2022-05-26 21:45:56 -07:00
5830f1e0b5
[feat] Adding PagerDuty notification
2022-05-25 14:10:31 +02:00
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2022-05-25 14:59:14 +08:00
f23baf9c22
Added Push Monitor to Discord Notifications
2022-05-24 23:14:27 +02:00
54184350a4
fix: missing semicolons
2022-05-23 21:13:57 +02:00
14dbe7c334
clean up + default ntfs.sh server url
2022-05-23 21:11:01 +02:00
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
2022-05-23 10:55:03 +02:00
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
2022-05-18 15:56:21 +02:00
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-18 15:55:36 +02:00
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2022-05-18 19:49:54 +08:00
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
2022-05-14 14:37:12 +08:00
cec0521834
[Discord] Fix ping type should no port, update better naming
2022-05-14 14:36:40 +08:00
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
2022-05-14 14:18:19 +08:00
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
44f6fca945
added finally to close connection pool
2022-05-13 09:34:31 -05:00
c346ea7864
updated name on export
2022-05-13 08:57:06 -05:00
f0ad32a252
merged
2022-05-13 08:41:31 -05:00
5720017fb4
updated name on import
2022-05-13 08:40:46 -05:00
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-12 19:54:12 -05:00
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-12 19:54:02 -05:00
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
2022-05-11 00:51:42 +08:00
59be9bb971
working
2022-05-11 00:51:11 +08:00
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
2022-05-11 00:47:50 +08:00
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
2022-05-10 22:53:55 +10:00
7da9f139c1
Bug fix
2022-05-09 21:10:12 +02:00
42f931f6cf
Merge branch 'master' into master
2022-05-09 10:28:14 +02:00
2fe5c090aa
small fixes
2022-05-08 20:50:08 +02:00
b680371746
Make apprise notification title configurable in UI
2022-05-07 11:00:57 -04:00
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
2022-05-07 13:26:47 +08:00
cd3fbc80b4
Add first parameter back to logging in api router
2022-05-06 16:05:24 -07:00
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-06 09:58:05 -07:00
9a35386841
Merge branch 'master' into master
2022-05-06 11:24:21 +02:00
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2022-05-06 14:41:34 +08:00
93050208bb
Merge database changes into single patch file
2022-05-05 16:01:19 +02:00
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-05 15:55:33 +02:00
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
2022-05-04 15:45:18 +09:30
4b9dc2890d
Convert let to const
2022-05-02 11:16:08 -04:00
f9004bcbed
Add optional title to apprise notification
2022-05-02 11:14:26 -04:00
bc174c3325
Extract child process args into variable
2022-05-02 11:00:14 -04:00
4c2753af46
Remove an unused variable
2022-05-02 13:36:35 +08:00
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
2022-05-02 13:32:19 +08:00
2b14bdae62
Merge branch 'master' into master
2022-05-01 12:40:34 +02:00
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
2022-05-01 17:03:11 +08:00
53b98ad3e4
Add more comment for aliyun-sms fix
2022-05-01 12:10:47 +08:00
d0546afe71
fix esm require: no ugly warnings
2022-05-01 10:22:16 +09:30
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
2022-04-30 17:17:22 +02:00
b4ffcc5555
Added JSDoc
2022-04-30 15:50:05 +02:00
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:07 +08:00
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:00 +08:00
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-30 21:08:35 +08:00
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
7532acc95d
Resolve conflicts
2022-04-30 14:33:54 +02:00
f4515ad8c5
add axios cached dns resolve to monitor
2022-04-30 21:40:47 +09:30
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
2022-04-30 13:40:34 +02:00
369477b4b9
Update aliyun-sms.js
2022-04-30 10:45:38 +08:00
2347a01f7c
Update aliyun-sms.js
...
Add comments for the changed code.
2022-04-30 10:42:59 +08:00
ae2c49a729
Update aliyun-sms.js
2022-04-30 06:28:16 +08:00
b9e72b9645
Update aliyun-sms.js
...
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
2022-04-30 05:56:10 +08:00
60538036c6
[ #1108 ] Change "true" to "up"
2022-04-28 23:44:08 +08:00
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
2022-04-28 23:34:51 +08:00
023db1450d
Fix #1577
2022-04-28 23:12:16 +08:00
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
2022-04-26 13:48:44 -07:00
1e595eaa76
Update linters
2022-04-26 01:26:57 +02:00
5fbfacf5ce
Fix ESlint warnings
2022-04-26 00:26:26 +02:00
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
587faecf87
Made value nullable in apicache JSDoc
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 19:42:42 +01:00
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 19:10:13 +01:00
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 18:42:47 +01:00
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-22 07:54:13 +02:00
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 20:02:18 +01:00
9996ba1636
Add JSDoc to server/modules/apicache/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 19:55:01 +01:00
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 18:53:07 +01:00
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 18:30:04 +01:00
7ed8ae9f7c
Fix trailing space warning
2022-04-21 18:23:32 +02:00
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:15:39 +01:00
068b920553
Add JSDoc to server/socket-handlers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:10:23 +01:00
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:45:58 +02:00
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 16:43:24 +01:00
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2022-04-21 13:01:22 +01:00
19933bbd99
Improve backwards compatibility
2022-04-21 12:18:15 +02:00
60f8ab7285
Use new logging mechanism
2022-04-21 12:09:59 +02:00
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-20 19:56:40 +01:00
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
2022-04-20 10:10:14 +02:00
10f6a3c4f5
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
...
Add #1209 : logout button in navbar
2022-04-19 19:59:52 +08:00
200fdfb808
Merge code manually since some code moved to another file
2022-04-19 16:46:45 +08:00
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
2022-04-19 16:43:13 +08:00
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
2022-04-19 15:38:59 +08:00
17d4003e5c
Add dropdown menu
2022-04-19 00:39:49 +08:00
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message
...
Feat: Allow MQTT successMessage to be optional
2022-04-18 19:06:39 +08:00
addf75daa7
Fix MQTT password do not save
2022-04-18 19:05:14 +08:00
359a490ae3
Fix #1510
2022-04-18 15:21:58 +08:00
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
2022-04-18 13:04:55 +08:00
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
e6a8a84278
Include only nessacary data in webhook
2022-04-17 19:30:58 +08:00
47c72192e1
[eslint] Enable yoda and eqeqeq
2022-04-17 15:43:03 +08:00
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2022-04-17 14:53:13 +08:00
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 21:11:45 +01:00
5a209c74e1
Add JSDoc to server/notification-providers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 20:24:53 +01:00
07c474db0b
Merge remote-tracking branch 'origin/master'
2022-04-17 01:40:05 +08:00
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2022-04-17 01:39:49 +08:00
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
2022-04-17 01:06:47 +08:00
60c63cc18e
Add JSDoc to server/jobs/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 11:10:51 +01:00
566133e350
Domain Name Expiry Notification for https monitor only
2022-04-16 15:01:53 +08:00
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
2022-04-16 14:50:48 +08:00
083e8355b7
Change debug to log.debug
2022-04-16 13:37:17 +08:00
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2022-04-16 13:28:39 +08:00
a680331dd7
Fixes issue with ::1 port 5300 requests
...
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-15 19:59:32 +01:00
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url
2022-04-15 14:13:44 +10:00
fb0064082e
Change Pushdeer to PushDeer
2022-04-14 14:34:30 +08:00
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 14:34:30 +08:00
fb059f5e91
Add support for Pushdeer notifications
2022-04-14 14:34:30 +08:00
d0b5f147e2
Fix spelling and merge mistake
2022-04-14 10:58:28 +08:00
ddf8a7a692
Fix camelCase
2022-04-14 10:58:28 +08:00
bd9df09f87
Apply suggestions from code review, fix style
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-14 10:58:28 +08:00
4656ab3d57
Add OneBot notification service
2022-04-14 10:58:28 +08:00
0a5db0cecb
Fix #1478
2022-04-14 10:12:31 +08:00
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-13 21:24:04 +01:00
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-13 21:02:19 +01:00
649f3106e1
Enforce semicolon, fix format globally
2022-04-14 01:20:54 +08:00
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
2022-04-13 23:47:08 +08:00
e9ce1433cd
Change log_info to log.info by making it into an object
2022-04-13 23:33:37 +08:00
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
4053b9db1f
Merge remote-tracking branch 'origin/master'
2022-04-12 17:46:24 +08:00
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
2022-04-12 17:44:04 +08:00
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
2022-04-12 17:15:33 +08:00
94770cf865
Resolve log message null reference
2022-04-12 16:57:22 +08:00
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
2022-04-12 16:32:14 +08:00
2638d68c97
Cover dns and steam types in Discord notifs
2022-04-12 09:52:07 +10:00
0961c6d9b3
Check for ping and port type in discord notifs
2022-04-10 21:45:07 +10:00
c9fa183712
Manage domain names
2022-04-10 00:25:27 +08:00
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2022-04-09 16:07:09 +08:00
6a30dbd71a
Fix Mattermost when channel is empty #1468
2022-04-09 15:44:50 +08:00
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
2022-04-08 00:56:56 +08:00
008dc27f52
Reload proxy settings for monitors in the monitorList
2022-04-07 23:03:45 +08:00
5027fcd320
Export server using an object class
2022-04-07 23:02:57 +08:00
d5e68f8453
Export monitor list
2022-04-07 22:53:32 +08:00
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
2022-04-07 14:45:37 +08:00
c4e74c9943
Render <StatusPage> if domain matched
2022-04-06 22:43:22 +08:00
fee88b32e3
Set PRAGMA synchronous = FULL
2022-04-06 20:48:13 +08:00
c9deea9fdf
Merge pull request #1456 from Arubinu/alerta
...
Fix "API key parameter 'undefined' is invalid"
2022-04-05 22:51:33 +08:00
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
4b99160b1f
Fix "Check Update" is not checked by default
2022-04-05 19:43:23 +08:00
48d679234a
Stop bree and cloudflared while the server shutting down
2022-04-05 19:41:29 +08:00
d3d1656625
Fix "API key parameter 'undefined' is invalid"
2022-04-05 08:47:35 +02:00
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-03 17:15:21 +02:00
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-01 15:26:50 +08:00
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
2022-04-01 14:57:35 +08:00
6674005e8b
Fix storing cloudflared token while start cloudflared
2022-03-31 15:58:39 +08:00
b72a2d350f
Set cloudflared token from env var or arg
2022-03-30 20:08:26 +08:00
Moritz R
Christopher Pickering
Aram Akhavan
Louis Lam
Super Manito
Daeho Ro
Matthew Nickson
Wooferz
Nelson Chan
Karel Krýda
Marc Hagen
DasCanard
Philipp Dormann
c0derMo
Sascha Kruse
Sascha Kruse
Christopher Pickering
Jordan Bertasso
Karel Krýda
Clemens Wolff
OidaTiftla
OidaTiftla
Greg Smith
GOGOsu
Adam Stachowicz
Jens Neuber
Jens Neuber
ngc7331
ColdThunder11
ColdThunder11
Alvin Pergens
Jimmy Huang