1
0
Commit Graph

6504 Commits

Author SHA1 Message Date
piuvas 38fbf58943 use en-US to generate types 2024-10-08 15:16:58 -03:00
piuvas 6447167bc5 update upstream locales 2024-10-08 11:13:48 -03:00
syuilo 9858e12078 New Crowdin updates (#14723)
* New translations ja-jp.yml (English)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Chinese Simplified)
2024-10-08 18:50:09 +09:00
syuilo 993d3fbe55 New Crowdin updates (#14722)
* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)
2024-10-08 09:22:58 +09:00
piuvas 6f7c0c2de3 merge translations (based part) 2024-10-07 20:38:42 -03:00
piuvas 5145afb625 fix pt-BR thing (i also changed this for misskey dw) 2024-10-07 20:38:08 -03:00
piuvas 819b1b324a reverted to misskey locales 2024-10-07 19:44:23 -03:00
Hazel K 60ec877d3c on user profiles, move pinned notes down with the other notes 2024-10-07 16:20:40 -04:00
Hazel K cd9bce3072 prevent login and password reset for system accounts 2024-10-07 14:58:39 -04:00
Hazel K 0da7f9b3f6 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-07 10:45:16 -04:00
syuilo 03fb688073 New Crowdin updates (#14695)
* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)
2024-10-07 09:44:35 +09:00
PrivateGER fadae347ff Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui 2024-10-06 23:13:10 +02:00
Marie 28bfd87537 merge: Add option to reject reports from an instance (Resolves #579, #715, #716) (!662)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662

Closes #579, #715, and #716

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 19:39:38 +00:00
PrivateGER f028795483 Move text into translation files 2024-10-06 20:31:41 +02:00
Hazelnoot 42dbe999e1 merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO (!648)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2024-10-06 17:56:36 +00:00
Hazel K 047563bdde Merge branch 'develop' into hazelnoot/579-reject-reports
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
2024-10-06 12:26:25 -04:00
Hazel K 4ca27692ac Merge branch 'develop' into hazelnoot/following-timeline 2024-10-06 11:16:43 -04:00
Hazel K b9e89edbc7 add missing translation 2024-10-06 11:16:18 -04:00
Hazel K 9b11aead5a Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked 2024-10-06 10:48:20 -04:00
Hazel K 7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K 4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
Hazel K b23d650a15 warn when a domain is hard-blocked by a base domain 2024-10-05 20:42:31 -04:00
Hazel K e622ab7cc7 indicate if a user is blocked / muted by the current user 2024-10-05 19:13:09 -04:00
PrivateGER b3f925c426 Fix breaking follow relationships + add warning counts to dialogue 2024-10-05 19:06:05 +02:00
PrivateGER 99a0f756ff Expose instance-moderation endpoints in UI 2024-10-05 19:06:05 +02:00
syuilo d8cb7305ef feat: 通報の強化 (#14704)
* wip

* Update CHANGELOG.md

* lint

* Update types.ts

* wip

* ✌️

* Update MkAbuseReport.vue

* tweak
2024-10-05 16:20:15 +09:00
syuilo 2340de035b New Crowdin updates (#14677)
* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)
2024-10-04 17:32:36 +09:00
かっこかり 975c2e7bc5 enhance(frontend): サインイン画面の改善 (#14658)
* wip

* Update MkSignin.vue

* Update MkSignin.vue

* wip

* Update CHANGELOG.md

* enhance(frontend): サインイン画面の改善

* Update Changelog

* 14655の変更取り込み

* spdx

* fix

* fix

* fix

* 🎨

* 🎨

* 🎨

* 🎨

* Captchaがリセットされない問題を修正

* 次の処理をsignin apiから読み取るように

* Add Comments

* fix

* fix test

* attempt to fix test

* fix test

* fix test

* fix test

* fix

* fix test

* fix: 一部のエラーがちゃんと出るように

* Update Changelog

* 🎨

* 🎨

* remove border

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-10-04 15:23:33 +09:00
Marie b0568e2baa chore: remove unused locale 2024-10-04 02:33:02 +02:00
Marie d5b372f7a9 upd&merge: Merge Cherrypick/MisskeyIO's external url popup, delete old popup warning and modify script to handle undefined domains 2024-10-04 02:31:22 +02:00
Marie ac1e5a0fb5 merge: Feat: Implement "Show Below Avatar" for Avatar Decorations (!645)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/645

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 20:40:34 +00:00
Marie aedc5fba81 merge: Disabling cat speak on the client (!609)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/609

Closes #604

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 19:51:35 +00:00
Hazel K 97a16c2ebc Merge branch 'develop' into hazelnoot/following-timeline 2024-10-03 14:00:06 -04:00
Marie 85b0dad84e merge: missing bubble timeline translations (!605)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/605

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:30:01 +00:00
CenTdemeern1 25e90f9c07 Add JP localization for Show Below Avatar 2024-10-03 19:29:38 +02:00
dakkar c85913d4b0 nicer wordinc 2024-10-03 16:59:37 +01:00
Leah 4281f08a75 moved translation 2024-10-03 16:59:07 +01:00
Leah d8474ceda5 Fixed grammar 2024-10-03 16:58:50 +01:00
Leah d55c86548d You can now disable cat speak in settings (client side) 2024-10-03 16:58:49 +01:00
fEmber e2beec33f8 merge: Minor issue fixes on the frontend (!625)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/625

Closes #659, #656, #651, #661, #632, and #710

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-10-03 15:52:00 +00:00
かっこかり 2c1a7470d3 feat: サーバー初期設定時に初期パスワードを要求できるように (#14626)
* feat: サーバー初期設定時専用の初期パスワードを設定できるように

* 無いのに入力された場合もエラーにする

* 🎨

* 🎨

* cypress-devcontainerにもpassを設定(テストが失敗するため)

* [ci skip] 🎨

* ✌️

* test: please revert this commit before merge

* Revert "test: please revert this commit before merge"

This reverts commit 66b2b48f66830d2450d8cda03955c143feba76c7.

* Update locales/ja-JP.yml

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* build assets

* Update Changelog

* fix condition

* fix condition

* add comment

* change error code

* 他のエラーコードと合わせる

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-10-03 18:18:00 +09:00
syuilo 1e9813e19e New Crowdin updates (#14649)
* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Greek)

* New translations ja-jp.yml (Hungarian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Dutch)

* New translations ja-jp.yml (Norwegian)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uyghur)

* New translations ja-jp.yml (Sinhala)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Kannada)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))
2024-10-03 16:16:09 +09:00
syuilo 83db116c46 enhance(backend): notify new login (#14673)
* wip

* Update CHANGELOG.md

* wip

* fix

* Update index.d.ts

* Update SigninService.ts

* Update MkNotification.vue
2024-10-03 15:06:04 +09:00
Hazel K 72d59b459a respect word mutes 2024-10-03 00:45:49 -04:00
CenTdemeern1 28aa99b273 Implement "Show Below Avatar" for Avatar Decorations 2024-10-02 23:49:30 +02:00
Hazel K 705ae79eb1 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 11:45:09 -04:00
Hazel K 58080ad14f add locale string "mutuals" 2024-09-30 12:04:09 -04:00
かっこかり ca8cc015b0 enhance(frontend): フォロワーへのメッセージ欄を改良 (#14656)
* enhance(frontend): フォロワーへのメッセージ欄を改良

* Update Changelog
2024-09-30 20:05:34 +09:00
piuvas de33ade423 fix wording for the branding setting 2024-09-29 11:45:35 -03:00
syuilo 0871156780 New Crowdin updates (#14629)
* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)
2024-09-29 18:24:58 +09:00