HidemaruOwO/puyoskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
29312 commits 2 branches 1 tag 333 MiB
Commit graph

3401 commits

Author SHA1 Message Date
かっこかり
d2f1d45ea3
fix(frontend): クライアント上での時間ベースの実績獲得動作が実績獲得後も発動している問題を修正 (#14717) 
* Check if time-based achievements are unlocked before initializing them in main-boot

(cherry picked from commit c0702fd92f)

* Update Changelog

---------

Co-authored-by: Evan Paterakis <evan@geopjr.dev>
 2024-10-07 09:07:02 +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
PrivateGER
941a200f35 Move button into button group 2024-10-06 19:53:10 +02:00
Marie
939f07fa55
upd: fix returns 2024-10-06 19:08:32 +02: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
60d0e3df7b preserve refresh button on mobile UI 2024-10-06 12:20:06 -04:00
Hazel K
01fb606fee fix weird left-alignment 2024-10-06 12:18:15 -04:00
Hazel K
d016ef7675 fix display size reactivity 2024-10-06 12:02:56 -04:00
Marie
6d7c7357ab merge: Warn when a domain is implicitly blocked because a base domain is blocked (resolves #564) (!661) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/661

Closes #564

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 15:54:46 +00:00
Hazelnoot
702bb9e5e0 merge: Set visitor dashboard's menu button z-index to 50 (!656) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656

Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 15:44:57 +00:00
Hazel K
4ca27692ac Merge branch 'develop' into hazelnoot/following-timeline 2024-10-06 11:16:43 -04:00
Hazel K
eec4a5082d fix OpenAPI definition for admin/meta.silencedHosts 2024-10-06 11:03:28 -04:00
Hazel K
605c22b55e add lockout for isMediaSilenced 2024-10-06 10:58:27 -04:00
Hazel K
008ac89672 fix translation string 2024-10-06 10:58:06 -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
2bc9ce93b8 add missing import 2024-10-06 10:47:55 -04:00
Marie
5f7730bd5c merge: Show yes/no options instead of ok/cancel when pasting long text (resolves #584) (!658) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/658

Closes #584

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 10:51:22 +00:00
Marie
88f3f0c7eb merge: Indicate that a user is blocked / muted (resolves #557) (!659) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659

Closes #557

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:48:48 +00:00
Marie
f77eb34225 merge: Check if time-based achievements are unlocked before initializing them in main-boot (!657) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/657

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:38:51 +00: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
Hazel K
c635992616 restore primary highlighting 2024-10-05 18:47:50 -04:00
Hazel K
ca98107eee respect following privacy settings 2024-10-05 18:25:13 -04:00
Evan Paterakis
c0702fd92f
Check if time-based achievements are unlocked before initializing them in main-boot 2024-10-05 22:58:43 +03:00
Evan Paterakis
5cd44433a0
Set visitor dashboard's menu button z-index to 50 2024-10-05 21:10:33 +03: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
Evan Paterakis
d633fe41bc
Don't depend on launcher.moe for status assets 2024-10-05 14:49:29 +03:00
syuilo
a594d9f26b make animatedMfm enable by default 2024-10-05 19:47:45 +09:00
syuilo
7933b6662e 🎨 2024-10-05 18:57:23 +09:00
syuilo
057a6d731d 🎨 2024-10-05 18:24:04 +09: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
043fef9fdf 🎨 2024-10-05 15:19:07 +09:00
おさむのひと
0d7d1091c8
enhance: 人気のPlayを10件以上表示できるように (#14443) 
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
 2024-10-05 14:37:52 +09:00
かっこかり
d8bf1ff7e9
#14675 レビューの修正 (#14705) 2024-10-05 13:47:50 +09:00
かっこかり
ae3c155490
fix: signin の資格情報が足りないだけの場合はエラーにせず200を返すように (#14700) 
* fix: signin の資格情報が足りないだけの場合はエラーにせず200を返すように

* run api extractor

* fix

* fix

* fix test

* /signin -> /signin-flow

* fix

* fix lint

* rename

* fix

* fix
 2024-10-05 12:03:47 +09:00
Hazel K
fb7bc2ff01 preserve scroll positions when navigating 2024-10-04 08:58:32 -04:00
Hazel K
4273640530 fix extra scroll bar on mobile 2024-10-04 08:31:25 -04:00
syuilo
fa06c59eae 🎨 2024-10-04 19:09:46 +09:00
かっこかり
b36d13d90c
fix(frontend): ログイン画面でキャプチャが表示されない問題を修正 (#14694) 
* fix(frontend): ログイン画面でキャプチャが表示されない問題を修正

* rename
 2024-10-04 18:45:03 +09:00
syuilo
708ffaef5c 🎨 2024-10-04 17:29:10 +09:00
syuilo
2639e92e18 🎨 2024-10-04 17:07:27 +09:00
syuilo
ea2675eaab fix(frontend): リンク動作のオーバーライドが動作していないのを修正 2024-10-04 16:41:08 +09:00
Marie
4b31004c2b
upd: apply suggestions 2024-10-04 08:41:23 +02: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