7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-11-04 21:56:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,910 Commits 15 Branches 125 Tags
aea128a85b3cb3a41de40cac7ebf1992bdfb434e
Commit Graph

914 Commits

Author SHA1 Message Date
LouisLam
e96121f69a fix merging mistake 2021-10-08 01:39:14 +08:00
LouisLam
5b4af550fb Merge branch 'master' into DeeJayPee_master 2021-10-08 01:27:06 +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
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
adfe640f42 show fewer beat on mobile 2021-10-07 22:53:13 +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
2c19aef4dc minor 2021-10-07 18:06:43 +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
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
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
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
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
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
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
52102d72a0 Merge pull request #572 from Brainpitcher/patch-1 
Update ru-RU.js
 2021-10-06 15:28:29 +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
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
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
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
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
73bf1216d1 [wip] more test 2021-10-05 20:27:43 +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
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
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
Adam Stachowicz
707e05c330 Fix after merge 2021-10-04 23:39:56 +02:00