OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-13 21:40:45 +01:00
Code Issues Projects Releases Packages Wiki Activity
26661 commits 56 branches 924 tags 271 MiB
Commit graph

26661 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marie
4246b6434d merge: Merge upstream from 19th Feburary (!428) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/428

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:05:15 +00:00
Marie
d182402cfa
fix: icons and update urls 2024-02-19 18:46:42 +01:00
dakkar
bf82942245 hide blocked&c instances when not logged in - fixes 422 2024-02-19 14:53:24 +00:00
dakkar
9c1437bdf9 check prohibited words when editing note 2024-02-19 14:27:10 +00:00
dakkar
d1c174ea60 rename to get it applied after upstream changes 
upstream `1708266695091-repositoryUrl-from-syuilo-to-misskey-dev.js`
changes `repositoryUrl` to one of the values this patch recognise, so
let's do ours after theirs
 2024-02-19 11:41:35 +00:00
Marie
70f7f976fb
fix: url in new component 2024-02-19 10:51:25 +01:00
Marie
faaad229af
chore: add new note in example to docker example 2024-02-19 10:48:34 +01:00
Marie
10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
かっこかり
9be3890827
Fix Changelog 2024-02-19 17:52:55 +09:00
Marie
764bbcf05b merge: Bridged error message for when you try search for a post and it fails (!421) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/421

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-19 08:33:10 +00:00
Marie
6ef2d471e9 merge: fix: keep alt text of file if present (!418) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/418

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-19 01:27:08 +00:00
1Step621
034f47205e
Fix(frontend): オートコンプリートが出るべき状況で出ないことがあるのを修正 (#13376) 
* オートコンプリートが出るべき状況で出ないことがあるのを修正

* update CHANGELOG.md
 2024-02-19 08:36:06 +09:00
anatawa12
1b1046bcdb
fix: syuilo/misskey時代から使用してるサーバーが改変したバージョンだと誤判定される問題 (DB migrationで修正) (#13389) 2024-02-19 08:34:31 +09:00
anatawa12
0b636d1bf9
fix: nodeinfoにenableMcaptchaとenableTurnstileが無い (#13387) 2024-02-19 08:33:36 +09:00
Amelia Yukii
ec8a7b28a8 merge: rework boost visibility #388 (!420) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/420

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-18 16:26:07 +00:00
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