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

26349 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marie
b20425b736 merge: emoji search show closest match first (#351) 
Fixes #338
 2024-01-12 20:27:01 +01:00
dakkar
d2d75b25bf emoji search: show closest match first #338 2024-01-12 16:58:21 +00:00
Etone Sabasappugawa
812da64e06 Merge branch 'develop' into develop 2024-01-12 14:20:26 +01:00
syuilo
87ffc672dd enhance(drop-and-fusion): yenモードで生涯で稼いだ額を記録するように 2024-01-12 21:01:38 +09:00
syuilo
5672ead957 Update 10000yen.png 2024-01-12 20:45:57 +09:00
syuilo
0aefebf02a enhance(drop-and-fusion): some tweaks 2024-01-12 20:38:04 +09:00
syuilo
271407312e chore(drop-and-fusion): tweak sounds 2024-01-12 17:55:27 +09:00
syuilo
c2a9a7b69e enhance(drop-and-fusion): tweak sounds 2024-01-12 17:34:24 +09:00
syuilo
b920435068 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-01-12 15:29:22 +09:00
zyoshoka
1aeede97f5
refactor(frontend): activity.heatmap.vueをコンポーネントに置換 (#12967) 2024-01-12 15:29:06 +09:00
syuilo
a5ea7c976b chore(drop-and-fusion): bump version 2024-01-12 15:28:41 +09:00
syuilo
d2063df78d enhance(drop-and-fusion): add new mode, some tweaks 2024-01-12 14:48:44 +09:00
かっこかり
be57ff4985
run pnpm build-misskey-js-with-types (#12972) 2024-01-11 23:41:22 +09:00
Marie
bbdc4e7789
merge: upstream 2024-01-11 11:43:20 +01:00
syuilo
cf54c2ba47 feat: ranking system of bubble game 
Resolve #12961
 2024-01-11 18:13:39 +09:00
syuilo
762fa6a8d8 enhance(drop-and-fusion): make game engine headless for server-side running 2024-01-11 12:34:03 +09:00
Marie
4df3145993
merge: upstream 2024-01-11 00:57:57 +01:00
syuilo
36fd7d17cf enhance(drop-and-fusion): some tweaks 2024-01-10 19:54:59 +09:00
morotesovtannu
a62898bcb7 chore: fix ja-KS locale 2024-01-10 18:54:22 +09:00
morotesovtannu
9c52e67490 chore: fix ja-JP locale 2024-01-10 18:46:32 +09:00
syuilo
5c786cace8 enhance(drop-and-fusion): add game description 2024-01-10 17:31:59 +09:00
Etone Sabasappugawa
59f00a87cf Merge pull request 'develop' (#1) from Sharkey/Sharkey:develop into develop 
Reviewed-on: https://git.joinsharkey.org/morotesovtannu/Sharkey/pulls/1
 2024-01-10 09:30:37 +01:00
1Step621
c1c363bf08
Enhance(frontend): 絵文字ピッカー/オートコンプリートで完全一致の絵文字を優先するように (#12928) 
* 絵文字ピッカー/オートコンプリートで完全一致の絵文字を優先するように

* update CHANGELOG.md

* improve performance
 2024-01-10 15:06:04 +09:00
syuilo
4bd9f664d7 enhance(drop-and-fusion): some tweaks 2024-01-10 13:44:00 +09:00
syuilo
3d9e42efca enhance(drop-and-fusion): リプレイの倍速再生対応 2024-01-10 11:38:49 +09:00
まっちゃとーにゅ
138a248a6c
fix(drop-and-fusion): バブルゲームのリトライボタンでリトライができない問題を修正 (#12957) 
ゲーム中なら諦める、ゲームオーバー画面の表示中はリスタートになるように
 2024-01-10 10:40:09 +09:00
FineArchs
6bae440f39
bump aiscript version to 0.17.0 (#12955) 
* bump aiscript version to 0.17.0

* Update CHANGELOG.md
 2024-01-10 09:47:47 +09:00
Marie
91969623bd
merge: upstream 2024-01-10 00:25:19 +01:00
syuilo
f5b864df7b
fix(frontend): fix game replay 2024-01-10 07:26:16 +09:00
Marie
3877b74858 merge: Implement Donation URL (#343) 
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/343
Reviewed-by: dakkar <dakkar@noreply.git.joinshakrey.org>
Reviewed-by: Amelia Yukii <admin@transfem.org>
Reviewed-by: Marie <marie@kaifa.ch>
 2024-01-09 22:59:24 +01:00
Nila The Dragon
f3aeb4c351
Add missing quotes in ja-JP 2024-01-09 22:27:15 +01:00
Nila The Dragon
e0e5236864
Revert auto-formatted change in NodeinfoServerService 2024-01-09 22:25:46 +01:00
Nila The Dragon
e74cd2f6ee
Move donation link on about page 2024-01-09 22:02:28 +01:00
Nila The Dragon
9ceb74b98d
feat: Implement Donation URL 2024-01-09 21:32:47 +01:00
FineArchs
7e52ea4818
Update CHANGELOG.md (#12953) 2024-01-10 00:44:13 +09:00
Camilla Ett
358dc6289b
Enhance(frontend): 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように (#12944) 
* Enhance(frontend): 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように

* update CHANGELOG.md

* tweak style

* (refactor) remove unnecessary imports

* fix lint

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <daisho7308+f@gmail.com>
 2024-01-09 21:18:09 +09:00
syuilo
1063d39de8 enhnace(frontend): tweak game 2024-01-09 21:15:56 +09:00
Marie
d974b30e56
merge: upstream 2024-01-09 10:35:10 +01:00
Marie
fbddcc559a
fix: icons 2024-01-09 10:32:42 +01:00
syuilo
14aedc17ae update sound 2024-01-09 16:06:22 +09:00
かっこかり
0d7f9308cc
enhance(frontend): バブルゲームの諸々を修正・改良2 (#12948) 
* (fix) ゲームが正常に終了するように

* (enhance) 効果音の音量を設定可能に

* (add) store

* (add) スクショにロゴの透かしを入れる

* Update packages/frontend/src/pages/drop-and-fusion.vue

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

* tweak

* tweak

* tweak

* tweak

* Update drop-and-fusion.vue

* tweak

* tweak

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-01-09 13:25:33 +09:00
Marie
3c2c72539a
chore: update sfm dep 2024-01-09 04:11:41 +01:00
Marie
8009e73741
chore: typecheck 2024-01-09 04:10:31 +01:00
Marie
7552cea69a
merge: upstream 2024-01-09 02:57:57 +01:00
おさむのひと
34088ecd27
feat(ci): api.jsonのバリデーションチェックCIを追加 (#12950) 
* feat(ci): api.jsonのバリデーションチェックCIを追加

* fix name
 2024-01-09 08:34:23 +09:00
Marie
94fee180b9 merge: additional authorised fetch logging (#328) 2024-01-08 22:25:46 +01:00
Marie
9d9ca6d67a merge: hide preview for quote renote 2024-01-08 22:02:28 +01:00
dakkar
9d939bcc49 authorised fetch: log more details 
this will help debugging problems in the implementation; thanks to
@ShittyKopper for the suggestion
 2024-01-08 18:54:01 +00:00
おさむのひと
0f9e3bccef
refactor(CI): 修正範囲と関係ないActionsが走るのを抑止する (#12918) 
* refactor?: 修正範囲と関係ないActionsが走るのを抑止する

* fix

* バックエンドの対象にmisskey-jsを追加＆フロントエンドの対象にmisskey-jsとbackendを追加
 2024-01-08 23:51:31 +09:00
dakkar
3b75e93706 remove extraneous renoteUr[il] filters 2024-01-08 13:59:15 +00:00