Louis Lam
|
7a46b44d25
|
Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
# src/components/HeartbeatBar.vue
|
3 years ago |
Alexis Lefebvre
|
175556f9fc
|
s/cros/CORS
|
3 years ago |
|
Louis Lam
|
7a50f0e3f3
|
Merge pull request #1589 from AnnAngela/1.15.1_zh-CN
Improve translation work
|
3 years ago |
AnnAngela
|
4178b003a2
|
fix `value`
|
3 years ago |
|
Louis Lam
|
92a43e1f30
|
Make the sibling beats a bit smaller
|
3 years ago |
|
Louis Lam
|
0cf395dfc3
|
Fix merge issue
|
3 years ago |
|
Louis Lam
|
749ca6f4a8
|
Merge remote-tracking branch 'origin/master' into feature-improve-status-styling
# Conflicts:
# src/components/HeartbeatBar.vue
# src/components/PublicGroupList.vue
|
3 years ago |
|
Louis Lam
|
8077744c60
|
Merge pull request #1604 from c-w/fix-apprise-zulip
Fix apprise integration for Zulip Streams
|
3 years ago |
Karel Krýda
|
42f931f6cf
|
Merge branch 'master' into master
|
3 years ago |
|
Louis Lam
|
5bf58cc6c4
|
Merge pull request #1595 from Saibamen/fix_eslint
Fix ESLint warnings and errors
|
3 years ago |
Karel Krýda
|
2fe5c090aa
|
small fixes
|
3 years ago |
|
Karel Krýda
|
ed218e73bb
|
UI improvements
|
3 years ago |
Clemens Wolff
|
b680371746
|
Make apprise notification title configurable in UI
|
3 years ago |
MrEddX
|
aa8ea6d398
|
Update bg-BG.js (#1617)
Translation Fixes
|
3 years ago |
|
Karel Krýda
|
9a35386841
|
Merge branch 'master' into master
|
3 years ago |
|
Louis Lam
|
8b0813ceff
|
Fix #1596 hopefully
|
3 years ago |
Adam Stachowicz
|
069d3765f0
|
Revert change for StatusPage
|
3 years ago |
|
Karel Krýda
|
2b14bdae62
|
Merge branch 'master' into master
|
3 years ago |
|
Louis Lam
|
39aa0a7f07
|
Merge branch 'fix/chart-error'
|
3 years ago |
|
Louis Lam
|
a12dffd1bc
|
Fallback to eqeq for PingChart.vue
|
3 years ago |
|
Louis Lam
|
410805052e
|
Log this.chartPeriodHrs
|
3 years ago |
|
Louis Lam
|
02a8147f22
|
Remove undefined variable forceShowContent
|
3 years ago |
Nelson Chan
|
272956025c
|
Fix: Fix chart error on switch back to recent
|
3 years ago |
|
Karel Krýda
|
31b90d12a4
|
Added the ability to choose on which status pages maintenance information should be displayed
|
3 years ago |
|
Louis Lam
|
db50ba91cc
|
Fix #1593
|
3 years ago |
|
Karel Krýda
|
57368c8c6c
|
More modern look of maintenance information on status page (same design as for the new incident system)
|
3 years ago |
|
Karel Krýda
|
11ef22edec
|
Fixed remaining lint errors
|
3 years ago |
|
Karel Krýda
|
f78d01d770
|
Resolve lint errors
|
3 years ago |
|
Karel Krýda
|
7532acc95d
|
Resolve conflicts
|
3 years ago |
|
Karel Krýda
|
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
|
3 years ago |
|
Adam Stachowicz
|
c114c053d6
|
Fix ESLint warnings and errors
|
3 years ago |
|
AnnAngela
|
5a069b278d
|
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
AnnAngela
|
65ea2e6aeb
|
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
AnnAngela-work
|
e82fc1df61
|
Match up en lang file
|
3 years ago |
|
AnnAngela-work
|
7dd5f5ea0d
|
Improve translation
|
3 years ago |
|
AnnAngela-work
|
45da7c5431
|
Improve translation work
|
3 years ago |
|
Louis Lam
|
6333231f1b
|
Merge pull request #1108 from trogper/push-status-param
Add status parameter to push monitor
|
3 years ago |
|
Louis Lam
|
0ba5d031d0
|
Merge branch 'master' into push-status-param
# Conflicts:
# server/routers/api-router.js
|
3 years ago |
|
Louis Lam
|
66e4c89897
|
Merge pull request #1560 from MrEddX/bulgarian
Update bg-BG.js
|
3 years ago |
|
Louis Lam
|
d210548ae8
|
Merge pull request #1581 from NixNotCastey/update-pl
Update polish translation
|
3 years ago |
Łukasz Szczepański
|
09fdef9bdc
|
Update polish translation
|
3 years ago |
Dmitry Yaskovich
|
7078b06272
|
Fix typo in Russian localization
|
3 years ago |
Phuong Nguyen Minh
|
a3baa3c149
|
Update language vi.js (#1572)
Update vi-VN.js
|
3 years ago |
|
Louis Lam
|
2adb142ae2
|
Merge pull request #1571 from MarkusDick/update-german-translations
lang: update german translations
|
3 years ago |
|
MrEddX
|
372bf57e9f
|
Update bg-BG.js
Translation fixes
|
3 years ago |
|
MrEddX
|
03e6f0a6c8
|
Update bg-BG.js
Translation fixes.
|
3 years ago |
Markus Dick
|
dcec53a755
|
lang: update german translations
|
3 years ago |
|
Adam Stachowicz
|
1e595eaa76
|
Update linters
|
3 years ago |
|
MrEddX
|
4c8da89c36
|
Update bg-BG.js
Translation fixes
|
3 years ago |
Dick Tang
|
db3ef3805b
|
correct wordings for Certificate Expiry Notification (#1554)
|
3 years ago |
