MrEddX
|
16b61dba27
|
Merge branch 'louislam:master' into bulgarian
|
2022-04-13 21:59:53 +03:00 |
|
Louis Lam
|
2b0c184a88
|
Update package-lock
|
2022-04-14 01:21:43 +08:00 |
|
Louis Lam
|
2642e70fc8
|
Fix auto test failed due to autocrlf
|
2022-04-14 01:20:54 +08:00 |
|
Louis Lam
|
8d0446dc38
|
Add lint as part of test
|
2022-04-14 01:20:54 +08:00 |
|
Louis Lam
|
3436e26ed4
|
Fix styleline, fix css format issues globally
|
2022-04-14 01:20:54 +08:00 |
|
Louis Lam
|
649f3106e1
|
Enforce semicolon, fix format globally
|
2022-04-14 01:20:54 +08:00 |
|
Louis Lam
|
6f72ca481f
|
Merge pull request #1479 from AnnAngela/1.14.0_translation
New translation for zh-CN
|
2022-04-14 00:05:07 +08:00 |
|
Louis Lam
|
670ea415b2
|
Merge pull request #1488 from c0derMo/update-german-translation
updating german translation
|
2022-04-14 00:03:53 +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 |
|
c0derMo
|
f5d006add8
|
updating german translation
|
2022-04-13 14:45:41 +00:00 |
|
Louis Lam
|
4df147786d
|
Merge pull request #1483 from Alexandre-Gliganic/master
Add automatic restart for docker-compose.yml
|
2022-04-12 22:39:29 +08:00 |
|
Alexandre Gliganic
|
27861f0d14
|
Add automatic restart docker-compose.yml
|
2022-04-12 16:09:01 +02:00 |
|
AnnAngela-work
|
5aa747a301
|
New translation
|
2022-04-12 20:41:25 +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 |
|
MrEddX
|
ae54d9c011
|
Merge branch 'louislam:master' into bulgarian
|
2022-04-12 12:37:52 +03:00 |
|
Louis Lam
|
5ca606fe99
|
Merge pull request #1141 from marcules/issue/1138
Issue/1138
|
2022-04-12 17:32:52 +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
|
9ec29c1bc4
|
Add back debug() for safe, but it is marked as deprecated
|
2022-04-12 16:37:05 +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
|
1ba92d803e
|
Update to 1.14.0
|
2022-04-12 14:17:13 +08:00 |
|
Louis Lam
|
45ca3085b2
|
Update CONTRIBUTING.md
|
2022-04-12 13:53:52 +08:00 |
|
Louis Lam
|
a0d1ae2cce
|
Better alignment of monitor list item
|
2022-04-11 18:02:18 +08:00 |
|
Louis Lam
|
f030487f7d
|
Fix theme color that do not apply to status page with a custom domain
|
2022-04-10 13:46:00 +08:00 |
|
Louis Lam
|
316e65d35a
|
Update to 1.14.0-beta.2
|
2022-04-10 00:46:34 +08:00 |
|
Louis Lam
|
df5ba02f3f
|
Merge pull request #1415 from louislam/status-page-domain
[Status Page] Map domain names to status pages
|
2022-04-10 00:42:31 +08:00 |
|
Louis Lam
|
c9fa183712
|
Manage domain names
|
2022-04-10 00:25:27 +08:00 |
|
Louis Lam
|
0b9b5102ec
|
Minor
|
2022-04-09 17:23:22 +08:00 |
|
Louis Lam
|
c399984b7f
|
Improve status page sidebar
|
2022-04-09 17:03:10 +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
|
a2d9474e85
|
Copy some keys from zh-TW to zh-HK
|
2022-04-09 14:51:26 +08:00 |
|
Louis Lam
|
8479e772cd
|
Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation
Update zh-TW translation
|
2022-04-09 14:44:44 +08:00 |
|
Louis Lam
|
2e50ef0e8f
|
Merge pull request #1450 from AnnAngela/1.14.0-zh_cn
1.14.0 translation improvement
|
2022-04-09 14:40:38 +08:00 |
|
Louis Lam
|
4fb2c69dd1
|
Merge pull request #1461 from louislam/proxy-improvement
Proxy Improvements
|
2022-04-09 13:54:28 +08:00 |
|
Louis Lam
|
c08910a65c
|
Update README.md
|
2022-04-08 19:45:39 +08:00 |
|
Louis Lam
|
943c904256
|
Update docker-compose.yml
|
2022-04-08 19:43:51 +08:00 |
|
JohnnyChiang
|
25b5edea7f
|
Update zh-TW translation
|
2022-04-08 01:47:01 +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
|
fcb577097b
|
[Proxy] Change to radio button
|
2022-04-07 15:26:00 +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
|
e89356b283
|
Show proxy option for http monitor only
|
2022-04-07 14:37:33 +08:00 |
|
Louis Lam
|
6014b9534f
|
Merge remote-tracking branch 'origin/master'
|
2022-04-06 23:20:40 +08:00 |
|
Louis Lam
|
8b45a95cc3
|
Merge branch '1.13.X'
# Conflicts:
# package.json
|
2022-04-06 23:20:22 +08:00 |
|
Louis Lam
|
02becfd113
|
Update to 1.13.2
|
2022-04-06 22:54:03 +08:00 |
|