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
|
3 years ago |
PhyxionNL
|
2e3414135f
|
Update src/components/PingChart.vue
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
PhyxionNL
|
e44699216e
|
Fix readability of chart hover
|
3 years ago |
DX37
|
fd8cba1dad
|
nudge nodemailer strings; translate new ones
|
3 years ago |
sovushik
|
03dd02fd38
|
Update ru-RU.js
Add RU for 1.14 version
|
3 years ago |
|
Louis Lam
|
d0b5f147e2
|
Fix spelling and merge mistake
|
3 years ago |
|
Louis Lam
|
ddf8a7a692
|
Fix camelCase
|
3 years ago |
ColdThunder11
|
bd9df09f87
|
Apply suggestions from code review, fix style
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
ColdThunder11
|
4656ab3d57
|
Add OneBot notification service
|
3 years ago |
|
Louis Lam
|
0a5db0cecb
|
Fix #1478
|
3 years ago |
MrEddX
|
60b44c2cdd
|
Update bg-BG.js
Fixed translation.
|
3 years ago |
|
Louis Lam
|
2b0c184a88
|
Update package-lock
|
3 years ago |
|
Louis Lam
|
2642e70fc8
|
Fix auto test failed due to autocrlf
|
3 years ago |
|
Louis Lam
|
8d0446dc38
|
Add lint as part of test
|
3 years ago |
|
Louis Lam
|
3436e26ed4
|
Fix styleline, fix css format issues globally
|
3 years ago |
|
Louis Lam
|
649f3106e1
|
Enforce semicolon, fix format globally
|
3 years ago |
|
Louis Lam
|
6f72ca481f
|
Merge pull request #1479 from AnnAngela/1.14.0_translation
New translation for zh-CN
|
3 years ago |
|
Louis Lam
|
670ea415b2
|
Merge pull request #1488 from c0derMo/update-german-translation
updating german translation
|
3 years ago |
|
Louis Lam
|
17dcf6d3a2
|
Merge pull request #910 from andreasbrett/logging
introduce consistent logging
|
3 years ago |
|
Louis Lam
|
e9ce1433cd
|
Change log_info to log.info by making it into an object
|
3 years ago |
c0derMo
|
f5d006add8
|
updating german translation
|
3 years ago |
|
Louis Lam
|
4df147786d
|
Merge pull request #1483 from Alexandre-Gliganic/master
Add automatic restart for docker-compose.yml
|
3 years ago |
Alexandre Gliganic
|
27861f0d14
|
Add automatic restart docker-compose.yml
|
3 years ago |
AnnAngela-work
|
5aa747a301
|
New translation
|
3 years ago |
|
Louis Lam
|
4053b9db1f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
Louis Lam
|
772d009f43
|
Merge branch 'master' into fluencydoc_master
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
|
3 years ago |
|
Louis Lam
|
5ca606fe99
|
Merge pull request #1141 from marcules/issue/1138
Issue/1138
|
3 years ago |
|
Louis Lam
|
6179f6c982
|
Merge branch 'master' into issue/1138
# Conflicts:
# server/server.js
|
3 years ago |
|
Louis Lam
|
94770cf865
|
Resolve log message null reference
|
3 years ago |
|
Louis Lam
|
9ec29c1bc4
|
Add back debug() for safe, but it is marked as deprecated
|
3 years ago |
|
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
|
3 years ago |
|
Louis Lam
|
1ba92d803e
|
Update to 1.14.0
|
3 years ago |
|
Louis Lam
|
45ca3085b2
|
Update CONTRIBUTING.md
|
3 years ago |
|
Louis Lam
|
a0d1ae2cce
|
Better alignment of monitor list item
|
3 years ago |
|
Louis Lam
|
f030487f7d
|
Fix theme color that do not apply to status page with a custom domain
|
3 years ago |
|
Louis Lam
|
316e65d35a
|
Update to 1.14.0-beta.2
|
3 years ago |
|
Louis Lam
|
df5ba02f3f
|
Merge pull request #1415 from louislam/status-page-domain
[Status Page] Map domain names to status pages
|
3 years ago |
|
Louis Lam
|
c9fa183712
|
Manage domain names
|
3 years ago |
|
Louis Lam
|
0b9b5102ec
|
Minor
|
3 years ago |
|
Louis Lam
|
c399984b7f
|
Improve status page sidebar
|
3 years ago |
|
Louis Lam
|
0afa0be5c2
|
Merge branch 'master' into status-page-domain
# Conflicts:
# server/database.js
|
3 years ago |
|
Louis Lam
|
6a30dbd71a
|
Fix Mattermost when channel is empty #1468
|
3 years ago |
|
Louis Lam
|
a2d9474e85
|
Copy some keys from zh-TW to zh-HK
|
3 years ago |
|
Louis Lam
|
8479e772cd
|
Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation
Update zh-TW translation
|
3 years ago |
|
Louis Lam
|
2e50ef0e8f
|
Merge pull request #1450 from AnnAngela/1.14.0-zh_cn
1.14.0 translation improvement
|
3 years ago |
|
Louis Lam
|
4fb2c69dd1
|
Merge pull request #1461 from louislam/proxy-improvement
Proxy Improvements
|
3 years ago |
|
Louis Lam
|
c08910a65c
|
Update README.md
|
3 years ago |
|
Louis Lam
|
943c904256
|
Update docker-compose.yml
|
3 years ago |
JohnnyChiang
|
25b5edea7f
|
Update zh-TW translation
|
3 years ago |
|
Louis Lam
|
7bbaeffd3e
|
Fix reset-password (issue caused by 5027fcd320)
|
3 years ago |
