Karel Krýda
|
7532acc95d
|
Resolve conflicts
|
2022-04-30 14:33:54 +02:00 |
|
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
|
2022-04-30 13:40:34 +02:00 |
|
Adam Stachowicz
|
c114c053d6
|
Fix ESLint warnings and errors
|
2022-04-30 03:51:14 +02:00 |
|
AnnAngela
|
5a069b278d
|
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-04-29 21:42:54 +08:00 |
|
AnnAngela
|
65ea2e6aeb
|
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-04-29 21:42:48 +08:00 |
|
AnnAngela-work
|
e82fc1df61
|
Match up en lang file
|
2022-04-29 20:31:36 +08:00 |
|
AnnAngela-work
|
7dd5f5ea0d
|
Improve translation
|
2022-04-29 20:26:56 +08:00 |
|
AnnAngela-work
|
45da7c5431
|
Improve translation work
|
2022-04-29 20:17:15 +08:00 |
|
Louis Lam
|
6333231f1b
|
Merge pull request #1108 from trogper/push-status-param
Add status parameter to push monitor
|
2022-04-29 00:12:44 +08:00 |
|
Louis Lam
|
0ba5d031d0
|
Merge branch 'master' into push-status-param
# Conflicts:
# server/routers/api-router.js
|
2022-04-28 23:34:51 +08:00 |
|
Louis Lam
|
66e4c89897
|
Merge pull request #1560 from MrEddX/bulgarian
Update bg-BG.js
|
2022-04-28 23:23:09 +08:00 |
|
Louis Lam
|
d210548ae8
|
Merge pull request #1581 from NixNotCastey/update-pl
Update polish translation
|
2022-04-28 23:22:31 +08:00 |
|
Łukasz Szczepański
|
09fdef9bdc
|
Update polish translation
|
2022-04-28 11:14:02 +02:00 |
|
Dmitry Yaskovich
|
7078b06272
|
Fix typo in Russian localization
|
2022-04-27 21:22:42 +03:00 |
|
Matthew Nickson
|
3c01e8732c
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2022-04-27 18:26:11 +01:00 |
|
Phuong Nguyen Minh
|
a3baa3c149
|
Update language vi.js (#1572)
Update vi-VN.js
|
2022-04-27 15:07:42 +08:00 |
|
Louis Lam
|
2adb142ae2
|
Merge pull request #1571 from MarkusDick/update-german-translations
lang: update german translations
|
2022-04-27 15:04:04 +08:00 |
|
MrEddX
|
372bf57e9f
|
Update bg-BG.js
Translation fixes
|
2022-04-27 09:19:13 +03:00 |
|
MrEddX
|
03e6f0a6c8
|
Update bg-BG.js
Translation fixes.
|
2022-04-26 21:39:14 +03:00 |
|
Markus Dick
|
dcec53a755
|
lang: update german translations
|
2022-04-26 20:27:00 +02:00 |
|
Adam Stachowicz
|
1e595eaa76
|
Update linters
|
2022-04-26 01:26:57 +02:00 |
|
MrEddX
|
4c8da89c36
|
Update bg-BG.js
Translation fixes
|
2022-04-25 07:26:40 +03:00 |
|
Dick Tang
|
db3ef3805b
|
correct wordings for Certificate Expiry Notification (#1554)
|
2022-04-25 08:25:06 +08:00 |
|
Matthew Nickson
|
d1a3cd047a
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2022-04-24 01:06:45 +01:00 |
|
OidaTiftla
|
c7ec9a07e2
|
Add translation for text label
|
2022-04-21 17:59:38 +02:00 |
|
OidaTiftla
|
052fde5a24
|
Fix casing of text label
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 17:56:38 +02:00 |
|
OidaTiftla
|
b7e2489d22
|
Merge branch 'master' into introduce-resend-interval
|
2022-04-21 11:58:04 +02:00 |
|
MrEddX
|
4d4d04adbd
|
Update bg-BG.js
Some translation fixes
|
2022-04-20 22:01:57 +03:00 |
|
MrEddX
|
f8c9472ea2
|
Update bg-BG.js
- Updated and fixed
|
2022-04-20 21:54:57 +03:00 |
|
Louis Lam
|
4e28ad4ac2
|
Merge pull request #1524 from chakflying/fix/disable-auth-icon
Fix: Handle disabled auth in user dropdown
|
2022-04-20 23:50:33 +08:00 |
|
Louis Lam
|
07c0801ad5
|
Make logout button reactive, improve dropdown menu css
|
2022-04-20 22:39:07 +08:00 |
|
SiderealArt
|
8cefc96c78
|
Update Traditional Chinese (Taiwan) translation
|
2022-04-20 18:11:26 +08:00 |
|
Nelson Chan
|
a391576285
|
Chore: Add translation
|
2022-04-20 15:09:31 +08:00 |
|
Nelson Chan
|
e0966e55c8
|
Fix: Handle disabled auth in user dropdown
|
2022-04-20 15:01:13 +08:00 |
|
Koen Habets
|
59d9891105
|
Update nl-NL.js
|
2022-04-19 21:17:33 +02:00 |
|
Louis Lam
|
bdc23a3f57
|
Merge pull request #1519 from AnnAngela/1.15.0_zh-cn
Update en&zh-CN lang file with 1 new i18n entry
|
2022-04-19 23:48:07 +08:00 |
|
Louis Lam
|
cd7c2beca6
|
Update CSS for dropdown menu
|
2022-04-19 19:46:21 +08:00 |
|
Louis Lam
|
8ee99760ec
|
Minor lint
|
2022-04-19 19:41:52 +08:00 |
|
Louis Lam
|
cb55e23718
|
Add $root.username
|
2022-04-19 19:40:28 +08:00 |
|
AnnAngela-work
|
18925293fb
|
Update en&zh-CN lang file with 1 new i18n entry
|
2022-04-19 10:48:20 +08:00 |
|
Louis Lam
|
17d4003e5c
|
Add dropdown menu
|
2022-04-19 00:39:49 +08:00 |
|
Louis Lam
|
cefb5bb60a
|
Merge branch 'master' into #1209-Logout-button-in-navbar
|
2022-04-18 20:39:24 +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
|
d71c086447
|
Standardize array bracket spacing
|
2022-04-17 15:27:35 +08:00 |
|
Louis Lam
|
cd3dfd3146
|
Merge pull request #1083 from patrickhafner/customstatuspage
Custom status page
|
2022-04-17 15:04:02 +08:00 |
|
Louis Lam
|
572f2b9838
|
eslint
|
2022-04-17 14:57:31 +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
|
1bc01d1077
|
Merge branch 'master' into customstatuspage
# Conflicts:
# src/languages/de-DE.js
|
2022-04-17 13:21:41 +08:00 |
|
Louis Lam
|
4e6ddc8880
|
Merge pull request #1497 from MrEddX/bulgarian
Bulgarian
|
2022-04-17 01:40:43 +08:00 |
|