Commit graph

26328 commits

Author SHA1 Message Date
Adam Howard
fc06494908 Temp redirect until Join Sharkey dot Org is up. 2024-02-03 16:03:09 +00: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
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
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
Essem
e3f25a84df
fix: Add default error image domain to CSP 2024-02-01 17:29:13 -06: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
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
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
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
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
Amelia Yukii
5ea0ef8587 Update README.md 2024-01-31 14:57:57 +00:00
dakkar
b77c025245 link twitter names to twitter, not nitter #382
nitter seems very dead
2024-01-28 16:06:16 +00:00
Marie
e5c060eecf
fix: don't show mentions and boosts towards muted user posts in timeline
Closes #336
2024-01-26 01:59:19 +01:00
Marie
c8c505fb92
fix: allow viewing of muted users posts
This would allow admins and mods to see muted users posts as well as normal users to view them if they ever get a link sent to them.
2024-01-26 01:39:53 +01:00
Marie
47cf7f6822
fix: don't show replies to muted users in timelines
Closes #337
2024-01-26 01:39:01 +01:00
Marie
6c6ccdc1e0
fix: properly mute notifications when mentioned by muted users
Closes #339
2024-01-26 01:24:26 +01:00
Marie
1bec69df16
fix: reactions being shown on muted/blocked users
Closes #342
2024-01-26 01:00:12 +01:00
Marie
4be70a8d98
fix: boost being available on DMs on detailed view
Closes #346
2024-01-26 00:56:09 +01:00
Marie
e89f4ff3c8
fix: boosts not being muted when muting thread
Closes #347
2024-01-25 19:39:41 +01:00
Marie
c1d38b02d7 fix(ci): lint failing to build bubble game 2024-01-25 19:26:22 +01:00
Marie
610f208c57
fix: don't let user invite themself to reversi game 2024-01-25 14:23:51 +01:00
Marie
913dd581ef
merge: upstream 2024-01-25 14:21:42 +01:00
Marie
92ee0a5863
fix: notes/versions not checking visibility
Issue reported by fEmber
2024-01-25 14:17:57 +01:00
Marie
b68c358688
fix: reversi allowing you to search globally instead of just locally
Misskey used a local option in the select section but os nor userselectdialog supported this.
2024-01-25 14:11:41 +01:00
syuilo
5342692b1e 2024.2.0-beta.7 2024-01-24 20:31:05 +09:00
syuilo
ef8eaf8e89
New Crowdin updates (#13080)
* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)
2024-01-24 20:29:05 +09:00
syuilo
4553d6426b Revert "Create deploy-test-environment.yml (#13079)"
This reverts commit 4de14fb5cf.
2024-01-24 17:31:34 +09:00
syuilo
b33cfc2876 test 2024-01-24 17:13:58 +09:00
Srgr0
4de14fb5cf
Create deploy-test-environment.yml (#13079) 2024-01-24 17:11:52 +09:00
syuilo
60156a40b2 fix(reversi/backend): refactor and fixes 2024-01-24 16:44:12 +09:00
syuilo
5719a929ad enhance(reversi): 変則なしマッチングを可能に 2024-01-24 16:37:06 +09:00
syuilo
2b6bf074c6 2024.2.0-beta.6 2024-01-24 15:20:12 +09:00
syuilo
37d87854c2
New translations ja-jp.yml (Japanese, Kansai) (#13077) 2024-01-24 15:19:14 +09:00
syuilo
d27b3525cd enhance(reversi): improve matching system 2024-01-24 15:18:50 +09:00
syuilo
7beb4ed131 fix(frontend/reversi): fix game preview 2024-01-24 14:52:19 +09:00
かっこかり
177c35e321
fix(frontend/pizzax): オブジェクトにnullがある場合に正しくマージされないのを修正 (#13073)
* fix(frontend/pizzax): オブジェクトにnullがある場合に正しくマージされない

* fix types

* マージを内製
2024-01-24 14:45:27 +09:00
syuilo
ca9be872a8 2024.2.0-beta.5 2024-01-24 13:55:57 +09:00
syuilo
a97d4fa4ef fix(reversi): wait redis operation to improve stability 2024-01-24 13:53:55 +09:00
syuilo
908e0f3b8b perf(reversi): set expire matchSpecific and matchAny 2024-01-24 13:51:16 +09:00
syuilo
b68446b289 enhance(reversi): tweak MATCHING_TIMEOUT_MS 2024-01-24 13:32:08 +09:00
syuilo
608e7c1546 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-01-24 13:17:36 +09:00
syuilo
a3ba315dc6 enhance(reversi): improve game setting flow 2024-01-24 13:17:34 +09:00