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

4416 commits

Author SHA1 Message Date
Mar0xy
7c480424a6
merge: upstream 2023-11-03 15:35:12 +01:00
Mar0xy
11e7cfc7a0
Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop 2023-11-03 13:25:12 +01:00
Mar0xy
33f4e2eefa
fix: subnote content not being nyaized 2023-11-03 13:25:00 +01:00
syuilo
e893494b48 Revert "fix: URLプレビューが表示されないのを修正 (#12222)" 
This reverts commit 8366984b2b.
 2023-11-03 19:50:27 +09:00
ikasoba
8366984b2b
fix: URLプレビューが表示されないのを修正 (#12222) 
* プレビューが表示されないのを修正

* 修正

* Update packages/frontend/src/components/MkUrlPreview.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-03 19:44:17 +09:00
Srgr0
8ddbe91462
11以上されているリアクションにおいてツールチップで示されるリアクション数が本来よりも1多い問題を修正 (#12219) 
* Update MkReactionsViewer.reaction.vue

* Update CHANGELOG.md

* Update MkReactionsViewer.details.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-03 17:55:39 +09:00
ozelot
c31d2e2563
fix(frontend): サイレンス状態で公開範囲のパブリックを選択できてしまう問題を修正 (#12224) (#12225) 
* fix(frontend): サイレンス状態で公開範囲のパブリックを選択できてしまう問題を修正 (#12224)

* docs: update changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-03 17:52:31 +09:00
Caipira
470a1c30e8
enhance(frontend): federated instance icon with proxy (welcome entrance) (#12213) 2023-11-03 17:38:33 +09:00
おさむのひと
39a3f4ae98
feat: チャンネル内→チャンネル外へのリノート制限機能追加 (#12230) 
* チャンネル内→チャンネル外へのリノート制限機能追加

* fix CHANGELOG.md

* コメント対応（canRenoteSwitch→allowRenoteToExternal）

* コメント対応（別チャンネルへのリノート対策）

* コメント対応（canRenote->allowRenoteToExternal）

* fix comment

* Update misskey-js.api.md

* ✌️

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-03 17:34:23 +09:00
syuilo
4631e6cd4a fix(frontend): In deck layout, replies option is not saved after refresh 
Fix #12228
 2023-11-03 17:18:30 +09:00
syuilo
ee191169f5 enhance(frontend): tweak announcement manage ui 2023-11-03 17:14:35 +09:00
かっこかり
24e629ca5c
enhance: 初期設定とチュートリアルを統合 (#12141) 
* better onboarding experience

* enhance: iroiro

* (add) title

* (enhance) 戻る・次へボタンを全ページでstickyに

* fix merging

* (add) iroiro

* remove unnecessary file

* Update CHANGELOG.md

* tweak texts

* (fix) reactionViewer mock

* change strings

* Update MkTutorialDialog.Note.vue

* Update ja-JP.yml

* (fix) reactionViewer error

* (fix) path

* refactor

* fix

* Update MkPostForm.vue

* Update ja-JP.yml

* Update ja-JP.yml

* tweak text

* Update ja-JP.yml

* Update ja-JP.yml

* Update ja-JP.yml

* (add) achivement

* (add) もう一度見れますよメッセージを追加

* Revert "feat: レジストリAPIをサードパーティから利用可能に (#12229)"

This reverts commit 79346272f8.

* Revert "(add) もう一度見れますよメッセージを追加"

This reverts commit 6123b35215133f0d5e5db356bb43f4acbafab8fa.

* Revert "Revert "feat: レジストリAPIをサードパーティから利用可能に (#12229)""

This reverts commit bae684e484ef99308d7ac816a822047117efe1c6.

* tweak

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-03 15:35:07 +09:00
yukineko
025ae436b5
enhance: アカウント登録時のメールアドレス認証に30分の有効期限を設定 (#12221) 
* add: metaにemailVerificationExpiresInを追加

* enhance: 招待コード使用時, メアド認証時に認証期限を確認するように

* add: クライアント側に実装

* update: CHANGELOG.md

* add: コメントを追加

* Revert "add: metaにemailVerificationExpiresInを追加"

This reverts commit ceb6ccff51a406bfd87b4da6c59401ce5551dd95.

* Revert "add: コメントを追加"

This reverts commit 7ee301c3eed4ded295490a6614650a3720317772.

* change(client): メール認証の有効期限を30分で固定するように変更

* change(backend): メール認証の有効期限を30分で固定するように変更

* update: CHANGELOG.md
 2023-11-03 14:54:28 +09:00
syuilo
1729307fcf update deps 2023-11-03 14:41:21 +09:00
anatawa12
3e00b32fae
build: port vite port configuration (#12223) 2023-11-03 13:34:57 +09:00
syuilo
0efacdfcf0 fix cw test 2023-11-03 13:26:48 +09:00
syuilo
79346272f8
feat: レジストリAPIをサードパーティから利用可能に (#12229) 
* wip

* wip

* Update remove.ts

* refactor
 2023-11-03 13:23:03 +09:00
Marie
d3d456cca3
chore: remove console.log 2023-11-03 00:47:36 +01:00
Mar0xy
118e1e027e
upd: revert back to original, keep some modifications 2023-11-03 00:34:53 +01:00
Mar0xy
335de75b66
upd: use computed on permissions 2023-11-03 00:27:27 +01:00
Mar0xy
4856699bd6
upd: change the way miauth redirects 2023-11-03 00:21:06 +01:00
syuilo
82526ad4f3 CWを使用する場合、注釈を空にすることを許可しない 
Resolve #12217
 2023-11-03 08:17:35 +09:00
Mar0xy
4da9d94a16
fix: replies showing if not set to show replies 2023-11-03 00:12:54 +01:00
syuilo
7f5ad5badb enhance(frontend): tweak drive file component 
Resolve #12220
 2023-11-03 08:01:22 +09:00
syuilo
5f888809e9 clean up 2023-11-03 08:00:26 +09:00
Mar0xy
579a13899c
fix: nyaize missing on OldNoteWindow 2023-11-02 23:56:12 +01:00
Mar0xy
87d7dee620
chore: lint 2023-11-02 23:32:43 +01:00
Mar0xy
c7e4bc6303
fix: broken icon 2023-11-02 23:19:04 +01:00
Mar0xy
a8b4689501
upd: add modplayer 2023-11-02 23:14:36 +01:00
Amelia Yukii
3a95c5b18d
fix: blur on warnings/info 2023-11-02 22:44:35 +01:00
Mar0xy
6a7bea912e
revert: fix profile margin in navbar 
Reverts 933c29f704
 2023-11-02 22:26:49 +01:00
Marie
469b464f69
merge: preserve old text when editing a note (#128) 2023-11-02 22:24:25 +01:00
Amelia Yukii
d612a12fbc
fix: profile margin in navbar 2023-11-02 19:36:49 +01:00
dakkar
219c7fa6ec always preserve old text when editing a note 
before this change:

* create a note, with text
  * `note` has a row with the text
	* `note_edit` doesn't have any matching row
* edit the note, removing all the text
  * the row in `note` has the new, empty, text
	* `note_edit` has a matching row, but its `oldText` is NULL

so the original text is lost

after this change, the row in `note_edit` always keeps the previous
text
 2023-11-02 14:28:23 +00:00
Srgr0
f1903b26a5
fix 絵文字ピッカーでバッテリーの絵文字が複数表示される問題を修正 (#12212) 
* Update emojilist.json

* Update CHANGELOG.md
 2023-11-02 20:02:00 +09:00
syuilo
3739b87537 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-11-02 19:59:27 +09:00
syuilo
d20f778bd0 enhance(frontend): tweak MkNotification 2023-11-02 19:59:18 +09:00
Tom Anderson
e333e7ced8
docs: Remove forum references and use Github Discussions (#12158) 
* docs: Replace forum with Github Discussions

* Remove outdated forum link from CONTRIBUTING.md

* Remove outdated forum link from misskey-js/CONTRIBUTING.md

* Remove outdated forum link from misskey-js/docs/CONTRIBUTING.en.md

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2023-11-02 19:57:43 +09:00
syuilo
ed699b4aed Revert "enhance(frontend): 「内容を隠す」でリアクションも隠れるように" 
This reverts commit e85b8217c0.
 2023-11-02 18:12:01 +09:00
syuilo
d0d32e8846 enhance(frontend): improve pull to refresh 2023-11-02 18:07:42 +09:00
syuilo
f62ad3ed3e feat: notification grouping 
Resolve #12211
 2023-11-02 15:57:55 +09:00
Camilla Ett
c7129d5190
fix(frontend): /about の連合タブのレイアウトが一部崩れているのを修正 (#12215) 2023-11-02 09:12:09 +09:00
Mar0xy
9a73e98551
upd: remove footerspacer from settings 2023-11-02 00:46:46 +01:00
ShittyKopper
4f0bc185af fix: fix: notification count position 
:has is not yet supported by firefox stable. can be reverted with the
release of firefox 121 (assuming we don't want to keep supporting older
versions)

reverts commit fb3a2bef67
 2023-11-02 02:10:53 +03:00
ShittyKopper
e583cf0f62 fix: notification indicator styling 
the width change does not feel like the correct solution but it works
surprisingly well
 2023-11-02 01:35:07 +03:00
Marie
a8e46163a5
merge: ui tweaks 2023-11-01 23:01:23 +01:00
Mar0xy
fb3a2bef67
fix: notification count position 2023-11-01 22:54:54 +01:00
Mar0xy
9f35ca2bd0
fix: avatar decorations management being open to everyone 2023-11-01 22:11:01 +01:00
ShittyKopper
6ee6ed6f73 fix: square avatars 2023-11-01 23:57:59 +03:00
ShittyKopper
5145af8ac5 fix: use drop-shadow instead of box-shadow for correct shadows on transparent avatars 2023-11-01 23:57:37 +03:00
ShittyKopper
a796c8663b upd: pointer on clickToOpen-able parts of notes 2023-11-01 23:57:37 +03:00
ShittyKopper
4af8bbb5c0 fix: round timeline corners on noGap 2023-11-01 23:57:37 +03:00
Amelia Yukii
77c49eacc1
Merge pull request #124 from ShittyKopper/corner-radius 
Quick-and-dirty corner roundness toggle
 2023-11-01 21:44:10 +01:00
ShittyKopper
5ac10730ae upd: replace more hardcoded radius values 2023-11-01 23:00:55 +03:00
Mar0xy
c490c7558f
fix: use computed instead of watch 2023-11-01 19:52:13 +01:00
Mar0xy
2b1bcdabd5
Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop 2023-11-01 19:49:24 +01:00
Mar0xy
44a6b0dce2
fix: note text updates not showing up directly 2023-11-01 19:49:13 +01:00
ShittyKopper
d4d2f6f871 fix: square avatar setting 2023-11-01 21:43:26 +03:00
ShittyKopper
ae5d052274 upd: implement radius setting 
to keep things manageable i merged a lot of one off values into just a
handful of common sizes, so some parts of the ui will look different than
upstream even with the "Misskey" rounding mode
 2023-11-01 21:43:26 +03:00
ShittyKopper
e33a4d1295 Revert "fix: Admin menu css" 
This reverts commit 74a07c3882.
 2023-11-01 21:43:26 +03:00
ShittyKopper
11d4c2412e Revert "fix: css rounding in nav" 
This reverts commit 86734353b8.
 2023-11-01 21:43:26 +03:00
ShittyKopper
45cb1d7709 Revert "test: change buttons and avatar" 
This reverts commit 9c8aaf3945.
 2023-11-01 21:43:26 +03:00
ShittyKopper
17c6efe116 Revert "fix: css rounding" 
This reverts commit e0fd136bcc.
 2023-11-01 21:43:26 +03:00
ShittyKopper
72204d9294 Revert "prototype: decreased rounding" 
This reverts commit 7a51e2d404.
 2023-11-01 21:43:26 +03:00
ShittyKopper
e1844db11b upd: add corner roundness setting 2023-11-01 21:43:26 +03:00
Amelia Yukii
5ab8dcf2be
Merge pull request #125 from transfem-org/fix/blur 
fix: add blur to MkDonation
 2023-11-01 18:01:10 +01:00
Mar0xy
d252dc3d93
upd: apply same changes to featured 2023-11-01 15:00:24 +01:00
Mar0xy
61c66b3825
upd: move TTL after pipeline execution 2023-11-01 14:51:50 +01:00
Mar0xy
4fbd9dcfbf
upd: make hashtagservice compatible with redis 6.3 2023-11-01 14:47:36 +01:00
Mar0xy
a5efe11350
fix: approval warning showing incorrectly on admin panel 2023-11-01 13:56:14 +01:00
Mar0xy
8388b18df9
merge: upstream 2023-11-01 12:39:07 +01:00
syuilo
6a73f7c108 i/updateのレートリミットを緩和 2023-11-01 20:29:58 +09:00
Mar0xy
dc0043c965
upd: remove tools from more 2023-11-01 12:20:03 +01:00
syuilo
e88dbad3cf tweak test 2023-11-01 15:56:57 +09:00
syuilo
5772de2a62 fix vitest 2023-11-01 15:40:10 +09:00
syuilo
821633f878 🎨 2023-11-01 15:36:15 +09:00
syuilo
9b073e5fe6 fix 2023-11-01 15:32:35 +09:00
syuilo
77db652bff update deps 2023-11-01 14:06:54 +09:00
syuilo
e632a84431 tweak default configuration 2023-11-01 14:00:31 +09:00
syuilo
7ed2a5fc1b perf(backend): remove needless query 
#12206
 2023-11-01 13:55:19 +09:00
かっこかり
5fb6847419
Feat: 未読通知数を表示できるように (#11982) 
* 未読通知数を表示できるように

* Update Changelog

* オプトインにする

* Fix lint

* (add) テスト通知のプッシュ通知を追加

* add test

* フロントエンドの表示上限を99に変更

* Make it default on

* 共通スタイルをくくりだす

* Update Changelog

* tweak

* Update UserEntityService.ts

* rename

* Update navbar-for-mobile.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-01 13:34:05 +09:00
syuilo
e85b8217c0 enhance(frontend): 「内容を隠す」でリアクションも隠れるように 
Resolve #12199
 2023-11-01 11:23:23 +09:00
syuilo
d6fe897923 perf(frontend): ノート表示時のMFMパース処理を減らす 2023-11-01 10:23:20 +09:00
Mar0xy
b02a977606
revert: previous commit 2023-11-01 01:43:01 +01:00
Mar0xy
629c605b67
upd: renderUpdate on attachments 2023-11-01 01:38:03 +01:00
Mar0xy
86623697d5
upd: provide files from note if existing 2023-11-01 01:22:08 +01:00
Mar0xy
4781e542ff
upd: increase thumbnail size 
Closes transfem-org/Sharkey#110
 2023-11-01 01:10:26 +01:00
Mar0xy
d49cc29923
chore: add attribution 2023-11-01 00:55:53 +01:00
Mar0xy
a2161ccb53
chore: remove debug line, change example.yml 
Set the default meilisearch scope to global
 2023-11-01 00:42:08 +01:00
Mar0xy
e9fafe9b51
test: debug meilisearch not being found 2023-11-01 00:33:29 +01:00
Mar0xy
86db03cdd6
test: update debug lines 2023-11-01 00:26:21 +01:00
Mar0xy
232ac0d94e
test: debug meilisearch 2023-11-01 00:14:59 +01:00
Mar0xy
826e172746
chore: blank line lint 2023-10-31 20:08:01 +01:00
Mar0xy
cca9ea3126
chore: lint 2023-10-31 19:57:52 +01:00
Mar0xy
4dd23a3793
merge: upstream 2023-10-31 19:33:24 +01:00
dakkar
044d3d76e7 actually fix #118 
`note.fileIds` is an array, it's always going to be truthy; we need to
check the length, like a similar `if` does just a few lines above
 2023-10-31 16:16:39 +00:00
dakkar
111863b396 try to fix #118 
when fetching notes from Redis, we need to re-check the criteria from
the API request, because `userTimelineWithFiles`,
`userTimelineWithReplies`, `userTimelineWithChannel` all get merged
together, so `noteIds` may well contain notes without attachments…
 2023-10-31 15:18:37 +00:00
syuilo
bf01c1ee64 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-10-31 20:14:39 +09:00
syuilo
7d3721dded Update .eslintrc.js 2023-10-31 20:14:36 +09:00
Mar0xy
b57b644ec6
chore: remove console log on verify_credentials 2023-10-31 12:13:37 +01:00