graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-08 22:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity
26570 commits 62 branches 916 tags 154 MiB
Commit graph

5372 commits

Author SHA1 Message Date
Amelia Yukii
ff8cfeb05c merge: avoid look-behind in nyaize - fixes 419 (!433) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/433

Approved-by: Julia Johannesen <julia@insertdomain.name>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-20 20:00:22 +00:00
dakkar
b02ded29dd avoid look-behind in nyaize - fixes 419 2024-02-20 20:00:22 +00:00
Marie
4a13508da0 Note Edited notification type 2024-02-20 15:10:41 +00:00
Marie
15665d1533 merge: Warn when missing alt text (!423) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/423

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-20 04:45:31 +00:00
KevinWh0
3c4f3cb81d updated to use .some 2024-02-19 20:53:13 +01:00
Marie
6931f50af5 merge: check prohibited words when editing note (!429) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/429

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:19:27 +00:00
Marie
3912436f4f merge: hide blocked&c instances when not logged in - fixes #422 (!430) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/430

Closes #422

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:09:11 +00:00
Marie
e248e41287 fix: merge conflict 2024-02-19 19:06:30 +00:00
Marie
d182402cfa
fix: icons and update urls 2024-02-19 18:46:42 +01:00
dakkar
bf82942245 hide blocked&c instances when not logged in - fixes 422 2024-02-19 14:53:24 +00:00
dakkar
9c1437bdf9 check prohibited words when editing note 2024-02-19 14:27:10 +00:00
dakkar
d1c174ea60 rename to get it applied after upstream changes 
upstream `1708266695091-repositoryUrl-from-syuilo-to-misskey-dev.js`
changes `repositoryUrl` to one of the values this patch recognise, so
let's do ours after theirs
 2024-02-19 11:41:35 +00:00
Marie
70f7f976fb
fix: url in new component 2024-02-19 10:51:25 +01:00
Marie
10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
Marie
764bbcf05b merge: Bridged error message for when you try search for a post and it fails (!421) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/421

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-19 08:33:10 +00:00
Marie
6ef2d471e9 merge: fix: keep alt text of file if present (!418) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/418

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-19 01:27:08 +00:00
1Step621
034f47205e
Fix(frontend): オートコンプリートが出るべき状況で出ないことがあるのを修正 (#13376) 
* オートコンプリートが出るべき状況で出ないことがあるのを修正

* update CHANGELOG.md
 2024-02-19 08:36:06 +09:00
anatawa12
1b1046bcdb
fix: syuilo/misskey時代から使用してるサーバーが改変したバージョンだと誤判定される問題 (DB migrationで修正) (#13389) 2024-02-19 08:34:31 +09:00
anatawa12
0b636d1bf9
fix: nodeinfoにenableMcaptchaとenableTurnstileが無い (#13387) 2024-02-19 08:33:36 +09:00
Amelia Yukii
ec8a7b28a8 merge: rework boost visibility #388 (!420) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/420

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-18 16:26:07 +00:00
Moe Poi
eedd8fd698 Add missing turnstile-response 2024-02-17 19:14:38 +00:00
syuilo
7562d233c5 fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 13:09:16 +00:00
tamaina
0a8ffd9cfa Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 13:09:08 +00:00
KevinWh0
2024030ebb Added break so it doesnt prompt you per image 2024-02-17 12:55:27 +01:00
Cocoa Hoto
b0030d148d
fix: allow moderators see role assigned users; fix #13301 (#13315) 2024-02-17 14:41:18 +09:00
anatawa12
b3aa793f42
chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように (#13348) 
* chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

* docs(changelog): 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 14:28:34 +09:00
syuilo
01de1519dd fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 14:26:48 +09:00
syuilo
875069c6b0 Update package.json 2024-02-17 13:43:04 +09:00
Acid Chicken (硫酸鶏)
acba96c1d3
feat: license violation protection (#13285) 
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる

Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438

* feat: license violation protection

* build: fix typo

* build: fix typo

* fix: farewell to the static type land

* fix: key typo

* fix: import typo

* fix: properly interpret `prominently`

* docs: add disclaimer

* docs: update CHANGELOG

* chore: add gap

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 13:34:50 +09:00
anatawa12
fa243276c5
feat: add link to local note in initial comment of abuse note (#13347) 
* feat: add link to local note in initial comment of abuse note

* docs(changelog): ノートの通報時にリモートのノートであっても自インスタンスにおけるノートのリンクを含むように
 2024-02-17 12:43:39 +09:00
tamaina
9a70ce8f5e
Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 12:41:19 +09:00
KevinWh0
c6e29f6882 Cleaned up some code 2024-02-17 01:28:55 +01:00
KevinWh0
11cb134d4d It works, Just figuring out some ts errors hopefully 2024-02-16 21:53:27 +01:00
KevinWh0
6240f78c83 Seemed to have fixed it 2024-02-16 19:01:54 +01:00
tamaina
8c1a582348 2024.2.0-beta.13 2024-02-16 15:04:12 +00:00
dakkar
aa72db76c4 rework boost visibility #388 
* only show allowed visibilities
* "local only" is a switch

notice that the backend will limit the visibility, too
 2024-02-16 13:26:13 +00:00
zyoshoka
37959bab1d
refactor(backend): remove/replace deprecated type deps (#13252) 2024-02-16 20:09:07 +09:00
dakkar
b5cfd92e2b point default repo/feedback URLs to our repos 
the migration will update instances that have the old defaults, too
 2024-02-16 10:54:33 +00:00
かっこかり
5e317eac8c
fix misskey-js version 2024-02-16 19:17:37 +09:00
taiy
860e8bb5d8
fix(frontend/pageMetadata): ページタイトルが更新されない問題 (#13289) 
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-16 16:17:09 +09:00
かっこかり
f5459a25df
fix(frontend): vue v3.4.16以降でタイムラインが正常に表示できない問題を修正 (#13248) 
* fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正

* type

* Revert "fix: downgrade vue to 3.4.15"

This reverts commit e12369ac13.

* Update pnpm-lock.yaml

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-16 15:39:48 +09:00
syuilo
f8ac072bc3 fix type 2024-02-16 15:19:55 +09:00
syuilo
7cfe7da73d fix 2024-02-16 15:09:05 +09:00
syuilo
f55e1ee138 refactor(backend): misc/cacheをシンプルな実装に戻した 2024-02-16 15:07:12 +09:00
MeiMei
cfa573a3a1
リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273 (#13275) 
* リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273

* CHAGELOG

* Use Redis event

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-16 14:30:53 +09:00
zyoshoka
40bbae3d6c
fix(backend): add missing schemas and fix incorrect schemas (#13295) 
* fix(backend): add missing schemas and fix incorrect schemas

* fix: ci

* fix: ci (本命)

* fix: run `pnpm build-misskey-js-with-types`

* fix: typos

* fix: role-condition-formula-value contains `id`

* fix: incorrect schema
 2024-02-16 14:27:33 +09:00
Kisaragi
147e8f1e3e
feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える (#13299) 
* feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える

close #13298

* Update ReactionService.ts

* chore(backend): prefer single quote for string literal
 2024-02-16 14:25:48 +09:00
Amelia Yukii
be36a793cd merge: Fix Note Edits being federated incorrectly (!417) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/417

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-15 22:18:58 +00:00
Acid Chicken (硫酸鶏)
b8800b8b95
build: upgrade Storybook to 8 beta (#13297) 
* chore: upgrade Storybook to 8

* ci: restore Storybook workflow

* build: createRequire

* ci: TurboSnap life extension
 2024-02-14 18:48:25 +09:00
Acid Chicken (硫酸鶏)
19e3753202
fix: TypeAssertionExpression breaks Storybook builds 2024-02-14 13:56:13 +09:00