Louis Lam
|
200fdfb808
|
Merge code manually since some code moved to another file
|
2022-04-19 16:46:45 +08:00 |
|
Louis Lam
|
29d2d95c71
|
Merge branch '1.14.X'
# Conflicts:
# package.json
# server/server.js
|
2022-04-19 16:43:13 +08:00 |
|
Louis Lam
|
919393cac9
|
Partially change the server core into a class, remove all require("./server") #1520
|
2022-04-19 15:38:59 +08:00 |
|
Louis Lam
|
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 |
|
Louis Lam
|
addf75daa7
|
Fix MQTT password do not save
|
2022-04-18 19:05:14 +08:00 |
|
Louis Lam
|
359a490ae3
|
Fix #1510
|
2022-04-18 15:21:58 +08:00 |
|
Nelson Chan
|
cd38dd3f68
|
Feat: Allow MQTT successMessage to be optional
|
2022-04-18 13:04:55 +08:00 |
|
Louis Lam
|
5fa62a888c
|
Merge branch 'master' into mqtt2
# Conflicts:
# server/database.js
# server/util-server.js
|
2022-04-17 19:46:33 +08:00 |
|
Louis Lam
|
e6a8a84278
|
Include only nessacary data in webhook
|
2022-04-17 19:30:58 +08:00 |
|
Louis Lam
|
47c72192e1
|
[eslint] Enable yoda and eqeqeq
|
2022-04-17 15:43:03 +08:00 |
|
Louis Lam
|
d71c086447
|
Standardize array bracket spacing
|
2022-04-17 15:27:35 +08:00 |
|
Louis Lam
|
8eb83394f7
|
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
|
2022-04-17 14:53:13 +08:00 |
|
Louis Lam
|
07c474db0b
|
Merge remote-tracking branch 'origin/master'
|
2022-04-17 01:40:05 +08:00 |
|
Louis Lam
|
8d8c38b1a8
|
Allow unused vars in args and fix more eslint issues
|
2022-04-17 01:39:49 +08:00 |
|
Louis Lam
|
e34420368b
|
Remove try-catch and fix username/password/port not working for mqtt
|
2022-04-17 01:06:47 +08:00 |
|
Louis Lam
|
566133e350
|
Domain Name Expiry Notification for https monitor only
|
2022-04-16 15:01:53 +08:00 |
|
Louis Lam
|
30e113755e
|
Add HIDE_LOG and catch error if cannot subscribe topic
|
2022-04-16 14:50:48 +08:00 |
|
Louis Lam
|
083e8355b7
|
Change debug to log.debug
|
2022-04-16 13:37:17 +08:00 |
|
Louis Lam
|
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 |
|
Louis Lam
|
fb0064082e
|
Change Pushdeer to PushDeer
|
2022-04-14 14:34:30 +08:00 |
|
ngc7331
|
93c51504f9
|
fixes: formatting and security issues
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-14 14:34:30 +08:00 |
|
ngc7331
|
fb059f5e91
|
Add support for Pushdeer notifications
|
2022-04-14 14:34:30 +08:00 |
|
Louis Lam
|
d0b5f147e2
|
Fix spelling and merge mistake
|
2022-04-14 10:58:28 +08:00 |
|
Louis Lam
|
ddf8a7a692
|
Fix camelCase
|
2022-04-14 10:58:28 +08:00 |
|
ColdThunder11
|
bd9df09f87
|
Apply suggestions from code review, fix style
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-04-14 10:58:28 +08:00 |
|
ColdThunder11
|
4656ab3d57
|
Add OneBot notification service
|
2022-04-14 10:58:28 +08:00 |
|
Louis Lam
|
0a5db0cecb
|
Fix #1478
|
2022-04-14 10:12:31 +08:00 |
|
Louis Lam
|
649f3106e1
|
Enforce semicolon, fix format globally
|
2022-04-14 01:20:54 +08:00 |
|
Louis Lam
|
17dcf6d3a2
|
Merge pull request #910 from andreasbrett/logging
introduce consistent logging
|
2022-04-13 23:47:08 +08:00 |
|
Louis Lam
|
e9ce1433cd
|
Change log_info to log.info by making it into an object
|
2022-04-13 23:33:37 +08:00 |
|
Louis Lam
|
4053b9db1f
|
Merge remote-tracking branch 'origin/master'
|
2022-04-12 17:46:24 +08:00 |
|
Louis Lam
|
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 |
|
Louis Lam
|
6179f6c982
|
Merge branch 'master' into issue/1138
# Conflicts:
# server/server.js
|
2022-04-12 17:15:33 +08:00 |
|
Louis Lam
|
94770cf865
|
Resolve log message null reference
|
2022-04-12 16:57:22 +08:00 |
|
Louis Lam
|
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 |
|
Louis Lam
|
c9fa183712
|
Manage domain names
|
2022-04-10 00:25:27 +08:00 |
|
Louis Lam
|
0afa0be5c2
|
Merge branch 'master' into status-page-domain
# Conflicts:
# server/database.js
|
2022-04-09 16:07:09 +08:00 |
|
Louis Lam
|
6a30dbd71a
|
Fix Mattermost when channel is empty #1468
|
2022-04-09 15:44:50 +08:00 |
|
Louis Lam
|
7bbaeffd3e
|
Fix reset-password (issue caused by 5027fcd320)
|
2022-04-08 00:56:56 +08:00 |
|
Louis Lam
|
008dc27f52
|
Reload proxy settings for monitors in the monitorList
|
2022-04-07 23:03:45 +08:00 |
|
Louis Lam
|
5027fcd320
|
Export server using an object class
|
2022-04-07 23:02:57 +08:00 |
|
Louis Lam
|
d5e68f8453
|
Export monitor list
|
2022-04-07 22:53:32 +08:00 |
|
Louis Lam
|
082c2dd32d
|
Remove restartMonitors() and move proxy socket events to a socket handler file
|
2022-04-07 14:45:37 +08:00 |
|
Louis Lam
|
c4e74c9943
|
Render <StatusPage> if domain matched
|
2022-04-06 22:43:22 +08:00 |
|
Louis Lam
|
fee88b32e3
|
Set PRAGMA synchronous = FULL
|
2022-04-06 20:48:13 +08:00 |
|
Louis Lam
|
c9deea9fdf
|
Merge pull request #1456 from Arubinu/alerta
Fix "API key parameter 'undefined' is invalid"
|
2022-04-05 22:51:33 +08:00 |
|
Louis Lam
|
70311f7a5a
|
Add an option to enable/disable the domain name expiry notification #1364
|
2022-04-05 21:27:50 +08:00 |
|
Louis Lam
|
4b99160b1f
|
Fix "Check Update" is not checked by default
|
2022-04-05 19:43:23 +08:00 |
|
Louis Lam
|
48d679234a
|
Stop bree and cloudflared while the server shutting down
|
2022-04-05 19:41:29 +08:00 |
|
Alvin Pergens
|
d3d1656625
|
Fix "API key parameter 'undefined' is invalid"
|
2022-04-05 08:47:35 +02:00 |
|