DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,581 Commits 55 Branches 924 Tags 263 MiB
Commit Graph

26581 Commits

Author SHA1 Message Date
Ashley Graves f3ca342318 Update index.vue - Also check enableMcaptcha for noBotProtection 2024-02-24 17:12:53 +00:00
Amelia Yukii c2e02a4c61 merge: Reactions not working on child notes in detailed view (!438) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/438

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-22 21:16:08 +00:00
Marie b0bc69aac8 Reactions not working on child notes in detailed view 2024-02-22 21:16:08 +00:00
Amelia Yukii f26eb25a78 merge: some fixes for note edits (!437) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/437

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-22 18:23:46 +00:00
dakkar 4afbf3b91e some fixes for note edits 2024-02-22 18:23:46 +00:00
Amelia Yukii 8197148209 merge: Add fail safe for sponsors endpoint in case of not being able to connect (!436) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/436

Closes #428

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-21 18:59:31 +00:00
Marie 349f846f32 Add fail safe for sponsors endpoint in case of not being able to connect 2024-02-21 18:59:31 +00:00
Amelia Yukii a1a3eec262 merge: Optimized pattern drawing in MkModPlayer (!410) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/410

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-21 16:17:13 +00:00
Vavency 897bc631f7 Optimized pattern drawing in MkModPlayer 2024-02-21 16:17:13 +00:00
Amelia Yukii 78975ddcc8 merge: Switch source code bits (!435) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/435

Approved-by: Julia Johannesen <julia@insertdomain.name>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-20 20:01:31 +00:00
dakkar c9940b7359 Switch source code bits 2024-02-20 20:01:31 +00:00
Amelia Yukii ff8cfeb05c merge: avoid look-behind in nyaize - fixes 419 (!433) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/433

Approved-by: Julia Johannesen <julia@insertdomain.name>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-20 20:00:22 +00:00
dakkar b02ded29dd avoid look-behind in nyaize - fixes 419 2024-02-20 20:00:22 +00:00
Amelia Yukii 27ea1b7133 merge: Note Edited notification type (!432) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/432

Closes #403

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-20 15:10:41 +00:00
Marie 4a13508da0 Note Edited notification type 2024-02-20 15:10:41 +00:00
Marie 15665d1533 merge: Warn when missing alt text (!423) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/423

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-20 04:45:31 +00:00
KevinWh0 3c4f3cb81d updated to use .some 2024-02-19 20:53:13 +01:00
Marie 6931f50af5 merge: check prohibited words when editing note (!429) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/429

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:19:27 +00:00
Marie 3912436f4f merge: hide blocked&c instances when not logged in - fixes #422 (!430) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/430

Closes #422

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:09:11 +00:00
Amelia Yukii 2fb1061f29 merge: point default repo/feedback URLs to our repos #414 (!419) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/419

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:08:15 +00:00
Marie e248e41287 fix: merge conflict 2024-02-19 19:06:30 +00:00
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
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