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

26646 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marie
20a2c17882 merge: Add missing turnstile-response (!427) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/427

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-18 14:05:25 +00:00
Moe Poi
eedd8fd698 Add missing turnstile-response 2024-02-17 19:14:38 +00:00
Amelia Yukii
7b7de4cdb3 merge: ssrf fix for our develop (!426) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/426

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-17 13:15:50 +00:00
syuilo
7562d233c5 fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 13:09:16 +00:00
tamaina
0a8ffd9cfa Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 13:09:08 +00:00
KevinWh0
0c28bfdb63 Added Japanese Translations 2024-02-17 13:31:03 +01:00
KevinWh0
2024030ebb Added break so it doesnt prompt you per image 2024-02-17 12:55:27 +01:00
Cocoa Hoto
b0030d148d
fix: allow moderators see role assigned users; fix #13301 (#13315) 2024-02-17 14:41:18 +09:00
anatawa12
b3aa793f42
chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように (#13348) 
* chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

* docs(changelog): 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 14:28:34 +09:00
syuilo
d4a5e31c8d
New Crowdin updates (#13341) 
* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)
 2024-02-17 14:27:42 +09:00
syuilo
01de1519dd fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 14:26:48 +09:00
syuilo
875069c6b0 Update package.json 2024-02-17 13:43:04 +09:00
syuilo
0b5d3315bc 2024.2.0 2024-02-17 13:41:24 +09:00
syuilo
b6ae12b622 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-02-17 13:41:08 +09:00
syuilo
d961ed830f Update CHANGELOG.md 2024-02-17 13:36:39 +09:00
Acid Chicken (硫酸鶏)
acba96c1d3
feat: license violation protection (#13285) 
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる

Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438

* feat: license violation protection

* build: fix typo

* build: fix typo

* fix: farewell to the static type land

* fix: key typo

* fix: import typo

* fix: properly interpret `prominently`

* docs: add disclaimer

* docs: update CHANGELOG

* chore: add gap

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 13:34:50 +09:00
anatawa12
fa243276c5
feat: add link to local note in initial comment of abuse note (#13347) 
* feat: add link to local note in initial comment of abuse note

* docs(changelog): ノートの通報時にリモートのノートであっても自インスタンスにおけるノートのリンクを含むように
 2024-02-17 12:43:39 +09:00
tamaina
9a70ce8f5e
Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 12:41:19 +09:00
KevinWh0
c6e29f6882 Cleaned up some code 2024-02-17 01:28:55 +01:00
KevinWh0
11cb134d4d It works, Just figuring out some ts errors hopefully 2024-02-16 21:53:27 +01:00
KevinWh0
6240f78c83 Seemed to have fixed it 2024-02-16 19:01:54 +01:00
tamaina
8c1a582348 2024.2.0-beta.13 2024-02-16 15:04:12 +00:00
dakkar
aa72db76c4 rework boost visibility #388 
* only show allowed visibilities
* "local only" is a switch

notice that the backend will limit the visibility, too
 2024-02-16 13:26:13 +00:00
かっこかり
7a35f13381
Update CHANGELOG.md 2024-02-16 22:18:31 +09:00
zyoshoka
37959bab1d
refactor(backend): remove/replace deprecated type deps (#13252) 2024-02-16 20:09:07 +09:00
dakkar
b5cfd92e2b point default repo/feedback URLs to our repos 
the migration will update instances that have the old defaults, too
 2024-02-16 10:54:33 +00:00
かっこかり
5e317eac8c
fix misskey-js version 2024-02-16 19:17:37 +09:00
かっこかり
a49e8a1a3c
fix(dev): devコマンドの実装を修正 (#13336) 2024-02-16 19:17:16 +09:00
anatawa12
40c201407d
fix of #13330 (#13330) 
* build: docker buildのpnpm i実行時にNODE_ENV=productionが指定されるようにする

* build: 消す行間違ってたのを修正
 2024-02-16 16:49:12 +09:00
anatawa12
f41c78a6e3
build: docker buildのpnpm i実行時にNODE_ENV=productionが指定されるようにする (#13329) 2024-02-16 16:44:37 +09:00
dependabot[bot]
5779f439ad
chore(deps): bump actions/setup-node from 3.8.1 to 4.0.2 (#13307) 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.1 to 4.0.2.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.8.1...v4.0.2)

---
updated-dependencies:
- dependency-name: actions/setup-node
  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-16 16:33:01 +09:00
dependabot[bot]
062ba50037
chore(deps): bump actions/upload-artifact from 3 to 4 (#13308) 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  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-16 16:32:55 +09:00
dependabot[bot]
7fdf5ffea2
chore(deps): bump actions/checkout from 3.6.0 to 4.1.1 (#13309) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.6.0...v4.1.1)

---
updated-dependencies:
- dependency-name: actions/checkout
  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-16 16:32:49 +09:00
dependabot[bot]
e3a5a998d4
chore(deps): bump pnpm/action-setup from 2 to 3 (#13310) 
Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 2 to 3.
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](https://github.com/pnpm/action-setup/compare/v2.0.0...v3)

---
updated-dependencies:
- dependency-name: pnpm/action-setup
  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-16 16:32:39 +09:00
dependabot[bot]
0ab4b8a294
chore(deps): bump actions/github-script from 6.4.0 to 7.0.1 (#13311) 
Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.0 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6.4.0...v7.0.1)

---
updated-dependencies:
- dependency-name: actions/github-script
  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-16 16:32:30 +09:00
taiy
860e8bb5d8
fix(frontend/pageMetadata): ページタイトルが更新されない問題 (#13289) 
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-16 16:17:09 +09:00
zyoshoka
bb83ee844e
fix(ci): publish docker image fails (3) (#13327) 
* fix(ci): publish docker image fails (3)

* fix: set `tags`
 2024-02-16 15:58:54 +09:00
syuilo
b7a12fbc2b 2024.2.0-beta.12 2024-02-16 15:40:10 +09:00
かっこかり
f5459a25df
fix(frontend): vue v3.4.16以降でタイムラインが正常に表示できない問題を修正 (#13248) 
* fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正

* type

* Revert "fix: downgrade vue to 3.4.15"

This reverts commit e12369ac13.

* Update pnpm-lock.yaml

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-16 15:39:48 +09:00
syuilo
efc67f7ab5
New Crowdin updates (#13267) 
* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)
 2024-02-16 15:23:43 +09:00
syuilo
29d5135302 Update CHANGELOG.md 2024-02-16 15:23:23 +09:00
syuilo
f8ac072bc3 fix type 2024-02-16 15:19:55 +09:00
syuilo
7cfe7da73d fix 2024-02-16 15:09:05 +09:00
syuilo
f55e1ee138 refactor(backend): misc/cacheをシンプルな実装に戻した 2024-02-16 15:07:12 +09:00
MeiMei
cfa573a3a1
リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273 (#13275) 
* リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273

* CHAGELOG

* Use Redis event

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-16 14:30:53 +09:00
zyoshoka
40bbae3d6c
fix(backend): add missing schemas and fix incorrect schemas (#13295) 
* fix(backend): add missing schemas and fix incorrect schemas

* fix: ci

* fix: ci (本命)

* fix: run `pnpm build-misskey-js-with-types`

* fix: typos

* fix: role-condition-formula-value contains `id`

* fix: incorrect schema
 2024-02-16 14:27:33 +09:00
Kisaragi
147e8f1e3e
feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える (#13299) 
* feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える

close #13298

* Update ReactionService.ts

* chore(backend): prefer single quote for string literal
 2024-02-16 14:25:48 +09:00
zyoshoka
0c10d2aa64
fix(ci): publish docker image fails (#13325) 
* fix(ci): publish docker image fails

* fix: `docker.yml`

* refactor: remove inaccurate name

* fix: match version
 2024-02-16 14:20:17 +09:00
Amelia Yukii
be36a793cd merge: Fix Note Edits being federated incorrectly (!417) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/417

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-15 22:18:58 +00:00
Srgr0
536105a1b7
dev: Update misskey-tga (#13223) 
* Update deploy-test-environment.yml

* Update .github/workflows/deploy-test-environment.yml

Co-authored-by: anatawa12 <anatawa12@icloud.com>

* Update deploy-test-environment.yml

* Update deploy-test-environment.yml

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
 2024-02-15 14:58:11 +09:00