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

26713 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marie
e7b86090e1
fix: relashionship to relationship in docker exmaple 2024-02-03 20:22:02 +01:00
Marie
11628e4b6a
merge: upstream 2024-02-03 20:19:44 +01:00
Marie
f93a8e2d38 merge: Fix sfm-js linkage (!399) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/399

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-03 18:28:47 +00:00
Marie
d3d0e510d8 merge: DeepLX-JS support (!396) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/396

Closes #324

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-03 17:54:59 +00:00
Marie
65a1bc2199
upd: add i18n 2024-02-03 18:49:41 +01:00
Marie
469c3f3f1a
upd: remove https 2024-02-03 18:41:47 +01:00
Marie
75bce2228f merge: some fixes to NoteEdit and muting (!376) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/376

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-03 17:25:17 +00:00
Marie
65a7623944 merge: follow-up to !390 (!397) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/397

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-03 17:05:21 +00:00
Amelia Yukii
b2d520369f merge: Temp redirect until Join Sharkey dot Org is up. (!400) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/400

Closes #392

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-03 16:32:47 +00:00
Leah
441523b6d4 merge: Added lines and line numbers to syntax errors (!395) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/395

Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-03 16:05:33 +00:00
Adam Howard
fc06494908 Temp redirect until Join Sharkey dot Org is up. 2024-02-03 16:03:09 +00:00
Marie
f091b84c6e
chore: change sfm registry and name 2024-02-03 15:01:09 +01:00
dakkar
4bc517ca89 import fs/promises the right way 
thanks Marie
 2024-02-03 12:55:56 +00:00
dakkar
bb3694bfed lint 2024-02-03 12:55:46 +00:00
dakkar
1bb5021c54 decode entity references from tweets 
apparently *some* tweets have those ☹
 2024-02-03 12:05:08 +00:00
dakkar
a981bca7a3 simpler logic 
thanks Alina
 2024-02-03 11:37:20 +00:00
dakkar
3a3a051bb5 make almost all fs ops async 
there's no `fs.promises.exists`
 2024-02-03 11:33:42 +00:00
dakkar
7684f45a5e simpler mapping 
thanks Alina
 2024-02-03 11:30:39 +00:00
dakkar
25948c9232 simpler json-isation 
thanks Alina for the suggestion
 2024-02-03 11:29:46 +00:00
Marie
83f1c596b0
upd: add caption to deeplx url input 2024-02-03 09:19:00 +01:00
KevinWh0
93bd4dc8fe added lines and lines to errors 2024-02-02 21:32:08 +01:00
Amelia Yukii
990e53fee4 Merge branch 'chore/updateMarkdownAndTemplates' into 'develop' 
chore: update CI, Markdown and some Templates

See merge request TransFem-org/Sharkey!392
 2024-02-02 16:46:24 +00:00
syuilo
66714d94fc
2024.2.0-beta.9 2024-02-02 21:38:15 +09:00
syuilo
580cec33a9
New Crowdin updates (#13090) 
* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean (Gyeongsang))

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

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (French)
 2024-02-02 21:37:21 +09:00
Amelia Yukii
ea44895b6b Merge branch 'oneko' into 'develop' 
feat: oneko

See merge request TransFem-org/Sharkey!387
 2024-02-02 11:59:43 +00:00
ShittyKopper
2e0557c90c upd: lazy load SkOneko on demand 2024-02-02 14:56:58 +03:00
Amelia Yukii
aabf168d05 Merge branch 'fix/image-csp' into 'develop' 
fix: Add default error image domain to dev mode CSP

See merge request TransFem-org/Sharkey!391
 2024-02-02 11:35:03 +00:00
syuilo
6c67b2e40e fix(frontend): チャートのlegendがクリックに反応しない問題を修正 
これにより発生 https://github.com/misskey-dev/misskey/pull/12926
 2024-02-02 18:15:25 +09:00
かっこかり
430290c084
fix(frontend): selectUserのパラメータを調整 (#13142) 
* fix(frontend): selectUserのパラメータを調整

* ついでに軽微なスタイルの修正
 2024-02-02 16:49:09 +09:00
Amelia Yukii
6516370251 Update 13 files 
- /.forgejo/workflows/docker-develop.yml
- /.forgejo/workflows/docker.yml
- /.forgejo/workflows/lint.yml
- /.gitea/ISSUE_TEMPLATE/01_bug-report.yml
- /.gitea/ISSUE_TEMPLATE/02_feature-request.yml
- /.gitea/ISSUE_TEMPLATE/config.yml
- /.gitea/pull_request_template.md
- /.gitlab-ci.yml
- /.old/workflows/lint.yml
- /.gitlab/issue_templates/feature.md
- /.gitlab/issue_templates/bug.md
- /.gitlab/merge_request_templates/default.md
- /SECURITY.md
 2024-02-02 07:48:35 +00:00
かっこかり
c38f5ee528
fix(frontend): アバターデコレーションのアニメーションが止まらない (#13139) 
* fix(frontend): アバターデコレーションのアニメーションが止まらない

* Update Changelog

* i -> index

* key

* revert lint fixes
 2024-02-02 15:19:23 +09:00
かっこかり
9e1145df81
enhance(frontend): shiki v1に移行 (#13138) 
* enhance(frontend): shiki v1に移行

* optimize chunks, エラーを握りつぶす

* wasmを分離

* バンドルサイズの警告の最小値を650kBに引き上げ

* optimize
 2024-02-02 15:05:18 +09:00
zyoshoka
e5876440cb
refactor(frontend): os.popup()のpropsの型チェックを有効化 (#13140) 
* refactor(frontend): `os.popup()`の`props`の型チェックを有効化

* refactor: `ComponentProps`に書き換え

* refacor: `import type`
 2024-02-02 15:04:42 +09:00
yukineko
d8bdbd53ed
fix: api-docが開けない問題を修正 (#13132) 
* refactor: 自己参照を使用している箇所に`selfRef`を持たせるように

* feat: スキーマ生成時に自己参照を含むかどうかを指定できるように

* fix: api.jsonにselfRefが含まれているのを修正

* refactor: 他の箇所と同様にselfRefの除去を行うように

* remove: 不要なimportを削除
 2024-02-02 12:47:07 +09:00
Srgr0
3499814498
Update deploy-test-environment.yml (#13136) 2024-02-02 11:58:43 +09:00
おさむのひと
85809a240e
fix(backend): "誰でも新規登録できるようにする"の初期値をOFFにする (#13130) 
* fix(backend): "誰でも新規登録できるようにする"の初期値をOFFにする

* fix CHANGELOG.md

* fix
 2024-02-02 11:24:45 +09:00
tamaina
07dc99d197
「見たことのあるリノートを省略して表示」が効いていない問題を修正 (#13133) 
* fix: 「見たことのあるリノートを省略して表示」が効いていない問題を修正
fix #13131

* add a comment
 2024-02-02 11:24:20 +09:00
Essem
e3f25a84df
fix: Add default error image domain to CSP 2024-02-01 17:29:13 -06:00
Amelia Yukii
848e1f9a56 version is better 
(cherry picked from commit fb455e4fd9)
 2024-02-01 16:11:48 +00:00
Amelia Yukii
9c4353ee79 Update .gitlab-ci.yml 
(cherry picked from commit 8c5818acf0)
 2024-02-01 16:10:47 +00:00
Amelia Yukii
fb455e4fd9 version is better 2024-02-01 15:59:14 +00:00
Amelia Yukii
8c5818acf0 Update .gitlab-ci.yml 2024-02-01 15:45:42 +00:00
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