Commit graph

5159 commits

Author SHA1 Message Date
Gero Gerke
704d63b49f
Merge branch 'master' into feature/matrix-notifications 2021-10-06 13:36:28 +02:00
zsxeee
7002a778f0
Rollback vue-i18n version to 9.1.7 2021-10-06 19:12:23 +08:00
zsxeee
54d2fbcc02
Fix i18n
Prevent use esm-bundler build vue-i18n
Escape keyword:  '@'
2021-10-06 18:21:31 +08:00
Gero Gerke
fbd4d54812
Update src/components/notifications/Matrix.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-06 10:55:21 +02:00
LouisLam
c8706b9aa1 Merge branch 'master' into notification_form_i18n
# Conflicts:
#	src/components/notifications/SMTP.vue
#	src/languages/en.js
2021-10-06 16:48:14 +08:00
Louis Lam
54d7830813
Update CONTRIBUTING.md 2021-10-06 15:36:45 +08:00
LouisLam
fef26f3d5e Merge remote-tracking branch 'origin/master' 2021-10-06 15:35:39 +08:00
LouisLam
cb263f2a08 [test] wait for #language 2021-10-06 15:34:57 +08:00
Louis Lam
52102d72a0
Merge pull request #572 from Brainpitcher/patch-1
Update ru-RU.js
2021-10-06 15:28:29 +08:00
LouisLam
2b00e59c7a [test] update 2021-10-06 15:25:00 +08:00
Louis Lam
8ea7a693a1
Merge pull request #499 from Saibamen/fix_pl_i18n
Fix Polish language, add missing `Status Page` i18n
2021-10-06 13:29:02 +08:00
LouisLam
4ded0c073a [test] fix timeout issue 2021-10-06 13:26:43 +08:00
Brainpitcher
7a8b6a03e0
Update ru-RU.js
"Cert Exp.": "Сертификат истекает" now it sounds in russian
2021-10-06 09:49:44 +05:00
Gero Gerke
6bebc623f9 UI polish 2021-10-05 21:59:58 +02:00
Gero Gerke
34b86352f2 remove double spaces 2021-10-05 21:40:59 +02:00
Gero Gerke
99e8a33118 escape room characters 2021-10-05 21:36:01 +02:00
Gero Gerke
d7cc585101
Update server/notification-providers/matrix.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-05 20:42:44 +02:00
Gero Gerke
8c357a04bf
Update src/components/notifications/index.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-05 20:42:36 +02:00
DeeJayPee
044c78aa2d Typo \o/ 2021-10-05 20:16:16 +02:00
DeeJayPee
49eaa1a166 Typo fix 2021-10-05 20:13:24 +02:00
DeeJayPee
215cc07907 Rename versions 2021-10-05 20:12:36 +02:00
LouisLam
22227be408 update version in wiki too 2021-10-06 02:06:59 +08:00
Gero Gerke
5decfb9fad Matrix Notifications 2021-10-05 20:03:56 +02:00
DeeJayPee
f9d7b99367 Add legacy version back on refactored master branch 2021-10-05 20:01:07 +02:00
DeeJayPee
359fe52c2e Merge branch 'louislam-master' 2021-10-05 19:59:20 +02:00
DeeJayPee
bc4db6c692 Merge branch 'master' of https://github.com/louislam/uptime-kuma into louislam-master 2021-10-05 19:57:27 +02:00
DeeJayPee
f14a798b2c Fix indentation + typo 2021-10-05 19:43:04 +02:00
Bert Verhelst
a0ffa42b42 fix(translations): add translations for method body and headers to dutch 2021-10-05 18:21:31 +02:00
Bert Verhelst
550825927c Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-05 18:19:07 +02:00
LouisLam
c1501742f5 test github secret 2021-10-05 21:15:30 +08:00
LouisLam
7c98fe603e test github secret 2021-10-05 21:11:11 +08:00
LouisLam
b7ae49c644 update github action 2021-10-05 20:42:15 +08:00
LouisLam
edad2caf8e return the correct exit code from jest 2021-10-05 20:40:40 +08:00
LouisLam
2bf6a04f81 fix preparing test 2021-10-05 20:37:32 +08:00
Louis Lam
f0670dde20
Update auto-test.yml 2021-10-05 20:33:47 +08:00
Louis Lam
73068763c0
Create auto-test.yml 2021-10-05 20:32:48 +08:00
LouisLam
73bf1216d1 [wip] more test 2021-10-05 20:27:43 +08:00
LouisLam
98436f91b5 Merge remote-tracking branch 'origin/master' 2021-10-05 19:14:41 +08:00
LouisLam
49720c709c improve the test with a single command only "npm test" 2021-10-05 19:13:57 +08:00
Louis Lam
842d359ad3
Update CONTRIBUTING.md 2021-10-05 18:17:54 +08:00
LouisLam
e71f5bf314 update dependencies 2021-10-05 17:53:17 +08:00
LouisLam
79e0c9e1f1 setup unit test for setup 2021-10-05 17:39:44 +08:00
LouisLam
e6ff957d9d Merge remote-tracking branch 'origin/master' 2021-10-05 16:12:44 +08:00
Louis Lam
865b721b79
Merge pull request #519 from chakflying/improve-certInfo
Feat: Improve Certificate Info Display
2021-10-05 16:09:08 +08:00
LouisLam
b5d987863d Merge remote-tracking branch 'origin/master' 2021-10-05 16:04:50 +08:00
Louis Lam
911690bea8
Merge pull request #521 from bertyhell/bugfix/heartbeat-bar-cleanup
fix(heartbeat-bar): cleanup css styling and minor syntax issues
2021-10-05 16:04:33 +08:00
LouisLam
d25603e629 update jest test 2021-10-05 16:03:35 +08:00
LouisLam
259bcf9426 [SMTP] "To Email" is not required if CC/BCC is set. (#461) 2021-10-05 15:57:13 +08:00
Bert Verhelst
afeb424dc0 fix(edit-monitor): add translations to en.js 2021-10-05 09:20:24 +02:00
Bert Verhelst
6b44116245 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-05 08:54:40 +02:00