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

26632 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luna Nova
da6dedc508
feat: add new Dockerfile 
This `Dockerfile` is based on [Cutiekey's modified `Dockerfile`](aa52721a40/Dockerfile), which
itself is based on [Misskey's `Dockerfile`](13f5fafdbc/Dockerfile). Both of them are licensed
under the AGPL-3.0 license.
 2024-03-04 18:02:45 -05:00
Amelia Yukii
4c69cbcd2b merge: update list of project members (!452) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/452

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Leah <kevinlukej@gmail.com>
 2024-03-04 20:35:57 +00:00
dakkar
2a4e26c05f update list of project members 2024-03-04 20:35:57 +00:00
Amelia Yukii
1e658ee04d merge: fix repo + feedback URLs for Firefish / IceShrimp (!450) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/450

Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-03-04 20:22:49 +00:00
Amelia Yukii
5988c5fa70 merge: rough start of a Sharkey contributors' guide - #241 (!394) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/394

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-03-04 20:21:47 +00:00
dakkar
ad2a97f20f rough start of a Sharkey contributors' guide - #241 2024-03-04 20:21:46 +00:00
Amelia Yukii
061cc40384 merge: allow lookup / search for http URLs (!457) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/457

Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-03-04 20:20:53 +00:00
Amelia Yukii
5733190b37 merge: Fixed english translation for the "Delete File" button (!458) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/458

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-03-04 18:48:05 +00:00
Leah
e7c41927e2 Fixed english translation for the "Delete File" button 2024-03-04 18:48:04 +00:00
Amelia Yukii
421f1d46a2 merge: Fixed startup crash with seasonal effects (!459) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/459

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-03-04 18:47:47 +00:00
Leah
eba0c2cc61 Fixed startup crash with seasonal effects 2024-03-04 18:47:47 +00:00
dakkar
96d8432b85 allow lookup / search for http URLs 2024-03-03 14:45:34 +00:00
dakkar
7d00c4529b fix repo + feedback URLs for Firefish / IceShrimp 2024-03-03 11:12:58 +00:00
Amelia Yukii
2e55108b6b merge: put back the readme (!447) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/447

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-03-02 16:50:34 +00:00
dakkar
83fa276483 put back the readme 2024-03-02 16:49:02 +00:00
Amelia Yukii
46c664348e merge: merge upstream for 2024.2.1 (!446) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/446

Closes #434

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-03-02 16:36:49 +00:00
dakkar
af548d05ca merge upstream for 2024.2.1 2024-03-02 16:36:49 +00:00
Amelia Yukii
eab7d5bd27 merge: Fix Images in ReadMe (!445) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/445

Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-25 23:59:05 +00:00
Amelia Yukii
8e8a9d3835 Fix Images in ReadMe 2024-02-25 21:57:12 +00:00
Marie
2fa0e238b7 merge: Update index.vue - Also check enableMcaptcha for noBotProtection (!442) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/442

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-24 18:16:43 +00:00
Marie
1b65c06d60 merge: fix: delete old follow request (if exists) before creating new (!440) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-24 18:16:16 +00:00
Marie
d539dec8b1 merge: Merge upstream changes from 23rd of Feburary (!439) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/439

Closes #431

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-24 18:16:06 +00:00
Ashley Graves
17df852c33 Update index.vue - I'm dumb sorry 2024-02-24 17:15:24 +00:00
Ashley Graves
f3ca342318 Update index.vue - Also check enableMcaptcha for noBotProtection 2024-02-24 17:12:53 +00:00
Kaity A
def2e8dff0
Merge remote-tracking branch 'origin/develop' into fix/failed-follow 2024-02-24 05:05:25 +00:00
Kaity A
ea948ccadc
fix: delete old follow request (if exists) before creating new 2024-02-24 04:38:01 +00:00
Marie
d1b787192a
fix: align note edit errors with note create errors 2024-02-23 17:01:35 +01:00
Marie
15d2319011
merge: upstream 2024-02-23 13:42:52 +01:00
tamaina
c0156b740b
enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeDeletedStateを発行する (#13382) 2024-02-23 18:15:39 +09:00
かっこかり
d834232232
enhance(games): 抜けている翻訳を追加・スタイル共通化 (#13434) 
* enhance(games): 抜けている翻訳を追加・スタイル共通化

* frameDivider の使用箇所が見当たらなかったので削除

* ミス

* インナーでもcss変数を使う

* コロンを翻訳から外す

* 一部の翻訳を除去

* p

* revert some text

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-23 18:07:41 +09:00
tamaina
600d91beda
enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる (#13388) 
* enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる

* nanka meccha kaeta

* ブロックチェックの後にフォロー関係の存在チェックをする
 2024-02-23 18:04:30 +09:00
okayurisotto
a861f913a7
fix(backend): より多くの人に使われているハッシュタグが検索結果上位に来るように (#11498) (#13340) 2024-02-23 18:02:12 +09:00
tamaina
b8d8b359bc
fix: プッシュ通知の変更が1時間ほど反映されない問題を修正 (#13407) 
* fix: プッシュ通知の変更が1時間ほど反映されない問題を修正

* 410 to refresh

* refreshCache
 2024-02-23 17:19:08 +09:00
1Step621
a85fccaeea
Fix(frontend): 絵文字オートコンプリートの優先順位がおかしいのを修正 (#13423) 
* 絵文字オートコンプリートの優先順位がおかしいのを修正

* update CHANGELOG.md

* テストを追加

* lint fix
 2024-02-23 17:01:42 +09:00
かっこかり
30fe072606
fix(test): Chromaticが落ちているのを一部修正？ (#13435) 
* fix(test): Chromaticが落ちているのを修正？

* いらん変更をけす

* 未来過ぎた
 2024-02-23 14:13:46 +09:00
okayurisotto
64953fadc9
refactor(backend): Array.prototype.filterでの非null確認ではisNotNull関数を使うように (#13442) 
* `Array.prototype.filter`での非null確認では`isNotNull`関数を使うように

* `{}` -> `NonNullable<unknown>`
 2024-02-23 14:12:57 +09:00
かっこかり
080a3c20bd
fix: SSR時のmetaをエスケープするように (#13440) 
* fix: SSR時のmetaをエスケープするように

* エスケープ方法を変更
 2024-02-23 14:10:13 +09:00
かっこかり
d20542c495
enhance: metaをSSR HTMLに埋め込む (#13436) 
* enhance: `meta`をSSR HTMLに埋め込む

* HTML Metaの有効時間を指定

* １時間

* MetaEntityService

* JSONをPackするように

* ✌️

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-23 10:47:17 +09:00
Amelia Yukii
c2e02a4c61 merge: Reactions not working on child notes in detailed view (!438) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/438

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-22 21:16:08 +00:00
Marie
b0bc69aac8 Reactions not working on child notes in detailed view 2024-02-22 21:16:08 +00:00
Amelia Yukii
f26eb25a78 merge: some fixes for note edits (!437) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/437

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-22 18:23:46 +00:00
dakkar
4afbf3b91e some fixes for note edits 2024-02-22 18:23:46 +00:00
FineArchs
bf5952fd63
flash/update で部分的に変更できるようにする (#13396) 
* make flash/update params optional

* Update autogen files

pnpm run build-misskey-js-with-types

* Update update.ts

* Update CHANGELOG.md

* hasOwnProperty -> hasOwn

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

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-22 21:31:57 +09:00
tamaina
4d6fab06de
refactor: Refactor NoteReadService.read (#13429) 
* refactor: Refactor NoteReadService.read

* clean up

* Update packages/backend/src/core/NoteReadService.ts

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-22 21:10:28 +09:00
syuilo
2bd9f05a92 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-02-22 20:59:57 +09:00
syuilo
26c8b53f70 enhance: サーバーごとにモデレーションノートを残せるように 2024-02-22 20:59:52 +09:00
Amelia Yukii
8197148209 merge: Add fail safe for sponsors endpoint in case of not being able to connect (!436) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/436

Closes #428

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-21 18:59:31 +00:00
Marie
349f846f32 Add fail safe for sponsors endpoint in case of not being able to connect 2024-02-21 18:59:31 +00:00
Amelia Yukii
a1a3eec262 merge: Optimized pattern drawing in MkModPlayer (!410) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/410

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-21 16:17:13 +00:00
Vavency
897bc631f7 Optimized pattern drawing in MkModPlayer 2024-02-21 16:17:13 +00:00