Commit graph

1602 commits

Author SHA1 Message Date
LouisLam
5b4af550fb Merge branch 'master' into DeeJayPee_master 2021-10-08 01:27:06 +08:00
Louis Lam
dd183e2ec2
Merge pull request #567 from Empty2k12/feature/matrix-notifications
Matrix Notifications
2021-10-08 01:21:52 +08:00
LouisLam
0fcb310b97 Merge remote-tracking branch 'Empty2k12/feature/matrix-notifications' into feature/matrix-notifications
# Conflicts:
#	src/languages/en.js
2021-10-08 01:13:09 +08:00
LouisLam
3a0143ac46 [matrix] use encodeURIComponent to handle the url encode 2021-10-08 01:11:33 +08:00
LouisLam
2ce5c28ed4 Merge branch 'master' into feature/matrix-notifications
# Conflicts:
#	src/languages/en.js
2021-10-08 00:59:39 +08:00
Bert Verhelst
ec4b7e4064 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 18:22:59 +02:00
Kevin Petit
5b758a4e98 Better locale default for status page. 2021-10-07 18:07:24 +02:00
LouisLam
7907c07034 Merge remote-tracking branch 'origin/master' 2021-10-07 23:07:16 +08:00
LouisLam
adfe640f42 show fewer beat on mobile 2021-10-07 22:53:13 +08:00
Louis Lam
469f7a3e32
Update README.md 2021-10-07 22:33:39 +08:00
LouisLam
9f1e7b0a88 Revert "fix(heartbeat-bar): cleanup css styling and minor syntax issues"
This reverts commit 3d6c8b7f
2021-10-07 21:47:11 +08:00
LouisLam
cdf81a36d3 fix broken animation caused by #521 2021-10-07 21:42:36 +08:00
LouisLam
bf4ac0cf17 fix dockerfile issue on arm 2021-10-07 21:24:10 +08:00
LouisLam
c0846124c2 update vite to 1.6.4, since it fixed the issue 2021-10-07 21:23:28 +08:00
LouisLam
3d30ed3d3b update security policy 2021-10-07 20:16:15 +08:00
LouisLam
deec15c09e [test] better job name 2021-10-07 20:14:24 +08:00
LouisLam
3423cb5d8e [test] try to auto test Windows and MacOS 2021-10-07 20:05:12 +08:00
LouisLam
20af179a82 [test] try to auto test Windows and MacOS 2021-10-07 20:01:33 +08:00
LouisLam
3c60800eab [test] github action please ok🙏🏻🙏🏻🙏🏻 2021-10-07 18:47:44 +08:00
LouisLam
34586d7b8f [test] github action please ok 2021-10-07 18:10:35 +08:00
LouisLam
2c19aef4dc minor 2021-10-07 18:06:43 +08:00
LouisLam
67a623be18 e2e testing, it's hard 2021-10-07 17:48:13 +08:00
LouisLam
e5f6d7f047 slack and rocket.chat use the primary base url
env var to show time logger
2021-10-07 17:39:58 +08:00
LouisLam
b69550f5b9 Improve the test 2021-10-07 17:01:17 +08:00
LouisLam
d08a71ab49 Set primary base url in settings page 2021-10-07 16:30:16 +08:00
LouisLam
ed67803af8 improve minor style 2021-10-07 16:10:21 +08:00
Louis Lam
a6c839709c
Merge pull request #589 from MrEddX/bulgarian
Updated Bulgarian language
2021-10-07 15:15:54 +08:00
Louis Lam
5eb3c6b194
Merge branch 'master' into bulgarian 2021-10-07 15:12:53 +08:00
LouisLam
8233f3b875 try to standardize the language name list 2021-10-07 15:06:16 +08:00
Bert Verhelst
8be4bf0e16 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 08:56:29 +02:00
LouisLam
cccf393ee5 update zh-HK.js 2021-10-07 14:55:32 +08:00
MrEddX
9f5bf37a96
Update Settings.vue 2021-10-07 09:37:13 +03:00
LouisLam
18e4702375 ignore .env 2021-10-07 14:34:30 +08:00
MrEddX
1eb3f63a82
Update bg-BG.js 2021-10-07 09:27:05 +03:00
Louis Lam
8c63536eb8
Merge pull request #451 from zsxeee/notification_form_i18n
Notification form i18n
2021-10-07 14:13:08 +08:00
LouisLam
3e1788983e Merge remote-tracking branch 'origin/master' 2021-10-07 14:10:15 +08:00
LouisLam
a8badb027d update modded node-sqlite3 to 6.0.0 2021-10-07 14:09:50 +08:00
MrEddX
0c6b434d79
Moved Bulgarian to the Cyrillic family languages 2021-10-07 08:00:53 +03:00
Louis Lam
b5bd92ce78
Merge pull request #578 from jtagcat/et5
l10n: update et
2021-10-07 11:31:02 +08:00
Louis Lam
3f80cf5e54
Merge pull request #581 from chakflying/patch-2
Fix: Allow underscore in hostname
2021-10-07 11:30:33 +08:00
Bert Verhelst
162ef04c41 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-06 21:56:28 +02:00
Nelson Chan
a87595a849
Fix: Allow underscore in hostname 2021-10-07 03:29:42 +08:00
jtagcat
7626e1f2e4 l10n: update et 2021-10-06 21:02:34 +03:00
zsxeee
7f1edb49bc
Fix i18n
Upgrade vue-i18n to 9.1.9.
Fix wrong tag name.
2021-10-07 00:04:13 +08:00
Gero Gerke
d184733af9 update text 2021-10-06 13:44:36 +02:00
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