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

26764 commits

This branch
This branch
All branches
Author SHA1 Message Date
syuilo
dbc4fd3e93 Update about-misskey.vue 2024-03-09 15:40:21 +09:00
syuilo
db29680e74 chore(dev): remove deprecated vscode plugins 2024-03-09 15:31:21 +09:00
tamaina
45d1af23bb Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-03-09 04:10:21 +00:00
tamaina
1b064d7e30 chore(backend): validateNoteの結果Errorはそのままthrowする 
理由がわからないため
 2024-03-09 04:10:17 +00:00
Amelia Yukii
d1f0fc6d5d merge: Feature/maybe nicer dockerfile (!463) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/463

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-03-08 16:13:47 +00:00
dakkar
ff7375c331 Feature/maybe nicer dockerfile 2024-03-08 16:13:47 +00:00
dakkar
760df9ebf0 copy changes to SkNote* 2024-03-08 16:10:52 +00:00
dakkar
15c78d1a01 Merge remote-tracking branch 'misskey/develop' into future 2024-03-08 16:09:56 +00:00
かっこかり
27f823e882
enhance(frontend): リアクションの総数を表示するか設定で選べるように (#13539) 
* enhance(frontend): リプライ・リノート・リアクションの総数を表示するか設定で選べるように (MisskeyIO#512)

(cherry picked from commit 3c8475e5ac217f055eab0f6d0aedcbbcb2a2f27c)

* fix: いいねのみの場合は強制的にカウント表示

* make `showReactionsCount` default false

* リアクションだけ

* けしわすれ

* けしわすれ２

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-03-08 18:13:09 +09:00
dakkar
8ab3f3aad6 copy changes to SkNote* 2024-03-07 16:20:43 +00:00
dakkar
dfff4d2073 Merge remote-tracking branch 'misskey/develop' into future 2024-03-07 16:09:36 +00:00
dakkar
5ba9a3f200 merge: check prohibited words when creating notes (!461) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/461

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Luna <her@mint.lgbt>
 2024-03-07 15:45:28 +00:00
かっこかり
f4a5740412
fix(frontend): 周年の実績が閏年を考慮するように (#13525) 
* fix(frontend): 周年の実績が閏年を考慮するように

* まちがえた

* Update Changelog

* 変数の定義回数を減らす
 2024-03-07 17:21:57 +09:00
かっこかり
c680e35aa0
enhance(frontend): 広告が同一ドメインの場合はRouterで遷移するように (#13510) 
* enhance(frontend): 広告が同一ドメインの場合はRouterで遷移するように

* Update Changelog

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-07 16:36:06 +09:00
zyoshoka
412e9f284d
test(backend): enable typecheck by workflow (#13526) 2024-03-07 09:51:57 +09:00
かっこかり
7ead98cbe5
enhance(frontend): リアクションの総数を表示するように (#13532) 
* enhance(frontend): リアクションの総数を表示するように

* Update Changelog

* リアクション選択済の色をaccentに
 2024-03-06 21:08:42 +09:00
tamaina
62922352b3 Revert "perf: boot.jsの調整" 
This reverts commit 00c1e4eb55.
 2024-03-06 09:49:01 +00:00
tamaina
00c1e4eb55 perf: boot.jsの調整 2024-03-06 09:40:47 +00:00
tamaina
4457b02db2 fix(frontend)?: importAppScriptはimportをawaitするように 2024-03-06 08:08:32 +00:00
dakkar
29eea64d46 update notes to make sure we remember to check import/create problems 2024-03-05 16:54:31 +00:00
dakkar
ff0117a1a5 check prohibited words when creating notes 
some small differences (between Misskey and us) inside the `create`
method made `git` put all the changes inside the `import` method… I
thought I had copied them all, but I had missed one, and it's a pretty
important one: prohibited words were not being checked!
 2024-03-05 16:52:05 +00:00
かっこかり
08d618bb8b
enhance(frontend): 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるようにする (#13520) 
* enhance(frontend): 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるようにする

* 他のファイルタイプにも対応

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-05 18:06:57 +09:00
かっこかり
45672a70f9
fix(frontend): router遷移時にmatchAllに入った場合一度location.hrefを経由するように (#13509) 
* fix(frontend): router遷移時にmatchAllに入った場合一度`location.href`を経由するように

* Update Changelog

* Update CHANGELOG.md

* remove unnecessary args
 2024-03-05 17:27:33 +09:00
tamaina
83a5bc0ecd
doc: Nestで循環依存がある場合のCONTRIBUTING.mdに書く (#13522) 
* doc: Nestモジュールテストの例をCONTRIBUTING.mdに書く

* rm normal test

* forwardRef
 2024-03-05 14:26:16 +09: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
tamaina
13f5fafdbc remove template txt 2024-03-04 10:39:43 +00:00
かっこかり
96ab1af03b
Update CHANGELOG.md 2024-03-04 16:09:24 +09:00
tamaina
9542cb8d62
fix(backend): リモートサーバーの情報が更新できなくなっていた問題を修正 (#13507) 
* fix(backend): fetchInstanceMetadataのLockが永遠に解除されない問題を修正

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

* fix test

* fix

* comment

* comment

* improve test

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-03-04 13:48:57 +09:00
tamaina
983480131b
chore: Automated release (#13075) 
* chore: Automated release

* follow
 2024-03-04 12:54:13 +09:00
dakkar
96d8432b85 allow lookup / search for http URLs 2024-03-03 14:45:34 +00:00
dakkar
03464cc379 always align code to the left - fixes #436 
"featured notes" on the welcome page's right-hand column are shown
with the text right-aligned; code should not be affected by that. This
makes sure it isn't
 2024-03-03 12:06:22 +00:00
zyoshoka
38837bd388
test(backend): refactor tests (#13499) 
* test(backend): refactor tests

* fix: failed test
 2024-03-03 20:15:35 +09: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
syuilo
efda2e9baa
Update README.md 2024-03-02 18:34:49 +09:00
syuilo
3afdafed61 2024.3.1 2024-03-02 17:06:01 +09:00
tamaina
2744cbd310 fix(frontend): MkCustomEmojiでフォールバックをテキストか画像か選べるように 
fix of #13487
 2024-03-02 07:05:17 +00:00
おさむのひと
b83cbc6d4d
Update CHANGELOG.md 2024-03-02 13:39:49 +09:00