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

26721 commits

This branch
This branch
All branches
Author SHA1 Message Date
Amelia Yukii
a6e257f502 Merge branch 'feture/code-injection-fix' into 'develop' 
CVE: Fixed code injection from twitter import

See merge request TransFem-org/Sharkey!390

(cherry picked from commit 127f8556d4)

2a8e93e4 Fixed code injection from twitter import
 2024-02-01 15:07:35 +00:00
Amelia Yukii
127f8556d4 Merge branch 'feture/code-injection-fix' into 'develop' 
CVE: Fixed code injection from twitter import

See merge request TransFem-org/Sharkey!390
 2024-02-01 15:06:21 +00:00
KevinWh0
2a8e93e4be Fixed code injection from twitter import 2024-02-01 15:58:50 +01:00
Amelia Yukii
310e1a1262 Merge branch 'Amelia-stable-patch-29368' into 'stable' 
Update docker-compose_example.yml

See merge request TransFem-org/Sharkey!389
 2024-02-01 14:44:14 +00:00
Amelia Yukii
15f3c046d1 Update docker-compose_example.yml 2024-02-01 14:42:19 +00:00
Amelia Yukii
fbd1156426 Merge branch 'update-compose' into 'develop' 
update images

See merge request TransFem-org/Sharkey!388
 2024-02-01 14:38:56 +00:00
Amelia Yukii
282118e597 update images 2024-02-01 14:36:48 +00:00
ShittyKopper
132bf2d200 feat: oneko 2024-02-01 17:31:04 +03:00
Amelia Yukii
01d695428a Revert "build stable with stable tag" 
This reverts commit acf3e3460f
 2024-02-01 14:15:10 +00:00
Amelia Yukii
acf3e3460f build stable with stable tag 2024-02-01 14:00:56 +00:00
Amelia Yukii
4c8116859c Revert "Merge branch 'cherry-pick-3b2d47b1' into 'stable'" 
This reverts merge request !386
 2024-02-01 13:55:44 +00:00
Amelia Yukii
0e13397db7 Merge branch 'cherry-pick-3b2d47b1' into 'stable' 
build stable with stable tag

See merge request TransFem-org/Sharkey!386
 2024-02-01 13:41:34 +00:00
Amelia Yukii
ad8818508f Update file .gitlab-ci.yml 
(cherry picked from commit 3b2d47b1e3)
 2024-02-01 13:38:19 +00:00
Amelia Yukii
2811f4cca5 Merge branch 'ci-branch' into 'develop' 
Run testCommit on Merge requests

See merge request TransFem-org/Sharkey!384
 2024-02-01 12:51:52 +00:00
Amelia Yukii
3af7583159 Update file .gitlab-ci.yml 2024-02-01 12:49:02 +00:00
dependabot[bot]
30b48df9d9
chore(deps): bump peter-evans/slash-command-dispatch from 3 to 4 (#13124) 
Bumps [peter-evans/slash-command-dispatch](https://github.com/peter-evans/slash-command-dispatch) from 3 to 4.
- [Release notes](https://github.com/peter-evans/slash-command-dispatch/releases)
- [Commits](https://github.com/peter-evans/slash-command-dispatch/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peter-evans/slash-command-dispatch
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-01 21:45:44 +09:00
tamaina
b0a38c0cae
fix: Hide reactions of all remote users / feat: moderators can see reactions of all users (#13128) 
* fix: Hide reactions of all remote users
https://github.com/misskey-dev/misskey/issues/12964

* feat: Moderators can see reactions of all users
https://github.com/misskey-dev/misskey/issues/13127

* modify CHANGELOG.md

* fix iAmModerator
 2024-02-01 20:05:45 +09:00
dependabot[bot]
ada2c69c7d
chore(deps): bump codecov/codecov-action from 3 to 4 (#13125) 
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-01 20:04:46 +09:00
Amelia Yukii
d444ee662f Merge branch 'cherry-pick-522ab39d' into 'stable' 
Merge branch 'gitlab-ci' into 'develop'

See merge request TransFem-org/Sharkey!383
 2024-02-01 10:23:23 +00:00
Amelia Yukii
4c354fff2d Merge branch 'gitlab-ci' into 'develop' 2024-02-01 10:23:23 +00:00
Amelia Yukii
522ab39db8 Merge branch 'gitlab-ci' into 'develop' 
Gitlab CI

See merge request TransFem-org/Sharkey!382
 2024-02-01 10:09:57 +00:00
Amelia Yukii
c203ef7a44 Gitlab CI 2024-02-01 10:09:57 +00:00
syuilo
6915fde1cf enhance(frontend): 🌸 2024-02-01 15:07:29 +09:00
1Step621
0641454c23
Fix(frontend): リバーシで自分自信を招待できるのを修正 & os.selectUser()のincludeSelfが機能していないのを修正 (#13117) 
* リバーシで自分自信を招待できるのを修正 & os.selectUser()のincludeSelfが機能していないのを修正

* lint fix
 2024-02-01 09:43:23 +09:00
zyoshoka
5079a4b7dd
fix(ci): misskey-js のバージョンチェックをトリガーする条件の修正 (#13116) 
* fix(misskey-js): バージョンチェックのトリガー条件を修正

* chore(misskey-js): 2024.2.0-beta.8
 2024-02-01 09:42:55 +09:00
Amelia Yukii
5ea0ef8587 Update README.md 2024-01-31 14:57:57 +00:00
おさむのひと
d5860d0685
fix(frontend): styleの指定方法を変更 (#13120) 2024-01-31 20:35:07 +09:00
zyoshoka
2db5b61616
refactor(backend): User関連のスキーマ/型の指定を強くする (#12808) 
* refactor(backend): User関連のスキーマ/型の指定を強くする

* refactor(backend): `pack()`の引数にスキーマを指定するように

* chore: fix ci

* fix: 変更漏れ

* fix ci

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-31 15:45:35 +09:00
syuilo
8aea3603a6 refactor(frontend): global/router -> router 2024-01-30 21:07:34 +09:00
syuilo
eb078d67ab Revert "Revert "Create deploy-test-environment.yml (#13079)"" 
This reverts commit 4553d6426b.
 2024-01-30 21:02:58 +09:00
syuilo
eef46ed3c9 2024.2.0-beta.8 2024-01-30 21:00:17 +09:00
syuilo
e90dea4be9 update deps 2024-01-30 20:59:44 +09:00
かっこかり
6a41afaaee
fix/refactor(reversi): 既存のバグを修正・型定義を強化 (#13105) 
* 既存のバグを修正

* fix types

* fix misskey-js autogen

* Update index.d.ts

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-30 20:54:30 +09:00
yukineko
a6a91fec3a
refactor: frontendのcomponentsの型エラーを改善 (#12926) 
* add: safeFloatParserを追加

* fix: 欠けていた型を追加

* refactor: pageBlockTypesをjson-schemaに移植

* refactor: components/global内の型エラーが出ている箇所を修正

* lint: fix null check style

* refactor: fix type error

* refactor: fix some type errors

* fix: 翻訳が抜けていた箇所を修正

* refactor: getJsonSchemaで正しいスキーマが返されるように修正

* fix: MkChartの型エラーとbytesオプションが機能していない問題を修正

* fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正

* refactor: fix some type errors

* change: Captcha読み込み中の文言をLoadingに変更

* refactor(backend/misskey-js): MainEventの型を改善

* refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正

* update: misskey-js.api.md

* refactor: fix some type errors

* fix: backendのtypecheckが落ちていたのを修正

* update: misskey-js.api.md

* add: json-schemaのnoteにpollの型定義を追加

* refactor: noteのjson-schemaの型を改善

* refactor: MkPoll

* refactor: fix some type errors

* change: UserLiteにisLockedを持たせるように

* fix: notificationスキーマにroleが含まれていないのを修正

* Revert "change: UserLiteにisLockedを持たせるように"

This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5.

* fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正

* refactor: noteスキーマのvisibilityにenumを追加

* change: deepCloneのCloneableTypeにundefinedを追加

* refactor: fix some type errors

* refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え

* enhance: API 'retension' のresponseの型を追加

* fix: Chart関連のtooltipが正しい位置に表示されない問題を修正

* refactor: fix some type errors

* fix: 型情報が不足していたのを修正

* enhance: announcementスキーマにenumを追加

* enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植

* refactor: policiesを`ref: RolePolicies`に統一

* fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正

* refactor: fix some type errors

* fix: backendのlintが落ちているのを修正

* fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正

* fix: backendのtypecheckが落ちているのを修正

* update: run build-misskey-js-with-types

* fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正

* update: CHANGELOG.md

* refactor: MkUserSelectDialogの型を改善

* fix: deepCloneでundefinedはcloneしないように (#9207)

* change: frontendのcloneをbackend側にも反映

* update: CHANGELOG.md

* fix: RoleServiceからPackを通して型RolePoliciesに依存させないように

* Update packages/frontend/src/scripts/get-note-summary.ts

* revert RoleService.ts changes

* change:  optional chaining -> non-null assertion

* remove: unused import

* fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正

* change: fix null check style

* refactor: fix type error

* change: fix null check style

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

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* refactor: css moduleでglobalを使わないように

* refactor: roleのiconUrlは必ず存在するものとして扱うように

* enhance: MenuButtonのactiveにcomputedを受け付けられるように

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

* Update MkWindow.vue

* refactor: notification.noteは必ず存在するものとして扱うように

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

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正

* Update packages/frontend/src/scripts/clone.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* refactor: 不要な返り値の型を削除

* refactor: 不要なnullチェックを削除

* update: misskey-js-autogen

* update: clone.ts

* refactor

* Update MkNotification.vue

* Update MkNotification.vue

* ✌️

* Update MkNotification.vue

* Update MkNotification.vue

* Update MkNotification.vue

* Update MkNotifications.vue

* Update MkUserSetupDialog.Profile.vue

* Update MkUserCardMini.vue

* ✌️

* Update MkMenu.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-30 19:53:53 +09:00
tamaina
9ac2c36d76
iOSで大きな画像を変換してアップロードできない問題を修正 (#13109) 
Fix https://github.com/misskey-dev/misskey/issues/12026
 2024-01-30 15:01:24 +09:00
Kagami Sascha Rosylight
e21cecefa1
test(frontend): load default config to start vite (#12867) 
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
 2024-01-29 21:39:34 +09:00
かっこかり
4535f9b41b
fix(i18n): ストック情報とフロー情報の文言をわかりやすく変更 (#13085) 
* fix(i18n): ストック情報とフロー情報をわかりやすく書き直す

* Update ja-JP.yml

* Update ja-JP.yml
 2024-01-29 21:33:42 +09:00
dakkar
b77c025245 link twitter names to twitter, not nitter #382 
nitter seems very dead
 2024-01-28 16:06:16 +00:00
かっこかり
b62d9f3920
feat(frontend/nirax): リダイレクトを設定できるように (#13030) 
* feat(frontend/nirax): リダイレクトを設定できるように

* revert demonstrative changes

* fix

* revert unrelated changes

* リダイレクトの際にパスが変わらない問題を修正

* リダイレクトが必要なrouteを設定

* fix lint

* router向けe2eテストの追加

* fix

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: samunohito <46447427+samunohito@users.noreply.github.com>
 2024-01-28 19:22:38 +09:00
syuilo
fe7036a1a8
Update CHANGELOG.md 2024-01-28 15:09:32 +09:00
woxtu
cdac3988b5
fix(backend): Fix typos in job configurations (#13086) 
* Fix typos

* Update CHANGELOG
 2024-01-28 15:08:45 +09:00
かっこかり
9753cce4aa
enhance(frontend): リモートのユーザーはメニューから直接リモートで表示できるように (#13087) 
* enhance(frontend): リモートのユーザーはメニューから直接リモートで表示できるように

* change changelog

* Apply suggestions from code review

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2024-01-27 18:25:15 +09:00
かっこかり
30f4023c36
refactor(frontend/MediaPlayer): cssの重複を削除 (#13094) 
* Update MkMediaAudio.vue

* Update MkMediaVideo.vue
 2024-01-27 16:33:30 +09:00
かっこかり
15727088be
fix misskey-js version 2024-01-27 10:34:07 +09:00
おさむのひと
b7270c6238
fix(dev): pnpm devで依存関係更新が一部反映されない (#13091) 2024-01-27 09:18:09 +09:00
Marie
074c47fdf8
upd: misskey-js api definitions 2024-01-26 21:31:14 +01:00
Marie
c6e3ec07d1
add: DeepLX-JS support 
Closes #324
 2024-01-26 21:29:38 +01:00
dakkar
e93e73673a probably more correct muting logic 
we want to notify if neither the thread nor the user are muted;
otherwise, for example, notes in a muted thread from a non-muted user
would get notified
 2024-01-26 18:09:25 +00:00
dakkar
b0fcc11d9e null-ify text after trimming 
this comes from upstream, it's already present in the "import"
section, I think it was missed in a merge
 2024-01-26 18:07:49 +00:00
dakkar
83e9057b27 apply to NoteEditService all recent changes from NoteCreateService 2024-01-26 18:07:34 +00:00