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
|
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 |
|
Louis Lam
|
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 |
|
Louis Lam
|
6674005e8b
|
Fix storing cloudflared token while start cloudflared
|
2022-03-31 15:58:39 +08:00 |
|
Louis Lam
|
b72a2d350f
|
Set cloudflared token from env var or arg
|
2022-03-30 20:08:26 +08:00 |
|
Louis Lam
|
82ea896bbc
|
Improve the workflow of cloudflared
|
2022-03-30 11:59:49 +08:00 |
|
Louis Lam
|
f1f4b3b377
|
Add reverse proxy setting page for controlling cloudflared
|
2022-03-30 01:49:45 +08:00 |
|
Louis Lam
|
a6b52b7ba6
|
Merge branch 'master' into cloudflared
|
2022-03-29 17:42:55 +08:00 |
|
Louis Lam
|
b8dea3a823
|
Merge remote-tracking branch 'origin/master'
|
2022-03-29 17:39:12 +08:00 |
|
Louis Lam
|
0da6e6b1fb
|
Some improvements
|
2022-03-29 17:38:48 +08:00 |
|
Louis Lam
|
44fb2a88f2
|
Add cloudflared socket handler
|
2022-03-29 14:48:02 +08:00 |
|
Louis Lam
|
be88351eb3
|
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
Fix: Remove prometheus metrics on delete [Test needed]
|
2022-03-27 11:05:50 +08:00 |
|
Louis Lam
|
28d72fcd08
|
Fix #1409, slug cannot be empty
|
2022-03-24 23:43:07 +08:00 |
|
Louis Lam
|
71af08189e
|
Clear useless code
|
2022-03-24 18:03:31 +08:00 |
|
Louis Lam
|
d32ba7cadd
|
Fix #1318, basic auth is completely disabled if the auth is disabled
|
2022-03-24 18:02:34 +08:00 |
|
Louis Lam
|
775d1696fa
|
Fix pushover device not working #1114
|
2022-03-24 12:14:17 +08:00 |
|
Louis Lam
|
ad2130b7b5
|
[Status Page] Fix monitors are deleted unexpectedly #1399
|
2022-03-22 00:06:29 +08:00 |
|
Louis Lam
|
3adda48f3a
|
Load the status page list earlier
|
2022-03-21 15:28:59 +08:00 |
|
Louis Lam
|
d7a839aa52
|
[Status Page] Fix reset entry page
|
2022-03-18 17:57:08 +08:00 |
|
Louis Lam
|
aef0a66205
|
[Status Page] Simplify show tags logic
|
2022-03-18 17:56:46 +08:00 |
|
Louis Lam
|
37be7df9b0
|
[Status Page] Delete status page
|
2022-03-18 15:19:52 +08:00 |
|
Louis Lam
|
8d981c8f0b
|
[Status Page] Fix migration and unpin incident
|
2022-03-18 14:14:22 +08:00 |
|
Louis Lam
|
27bfae67af
|
[Status Page] Add a new status page
|
2022-03-17 23:38:43 +08:00 |
|