b87e210941
Add boobdog friend
2024-03-23 13:55:23 -07:00
44bb5db301
Bump version
2024-03-17 21:50:32 -07:00
9120ef9e09
Merge pull request 'Add note auto delete feature' ( #1 ) from wip-self-destruct into main
...
Reviewed-on: #1
2024-03-18 04:46:57 +00:00
cfff11f0c0
Improve description of autodelete feature
2024-03-17 21:42:39 -07:00
d60344dfac
Add AutoDeleteNotesProcessorService
2024-03-17 21:35:49 -07:00
fc1727870c
Add noteAutoDelete form to privacy page
2024-03-17 21:35:49 -07:00
d2db36d0ee
Add month and years to locale file
2024-03-09 14:49:56 -08:00
83c971b1a8
Add noteAutoDelete to user_profile
2024-03-09 14:48:29 -08:00
4af3b96746
Increase bio char limit
2024-03-06 17:26:35 -08:00
bd11dabf89
Reject DMs where recipients don't match mentions
2024-03-03 21:09:39 -08:00
3f92fcb96e
bump version
2024-03-03 20:35:07 -08:00
45e5f5fa1e
Add warning when a cwed post has insensitive attachments
2024-03-03 20:34:49 -08:00
aa0c98adcf
Hide reversi games in secureApiMode
2024-03-03 17:12:20 -08:00
27e6714827
Create requireCredentialSecureMode
...
`requireCredentialSecureMode` is a replacement for `requireCredential` as
a three-valued enum. Keeping `requireCredential` as a boolean makes future
merges easier, and whether the endpoint should be allowed in secure mode
is determined by `requireCredentialSecureMode`. This implies that
`requireCredential: true, requireCredentialSecureMode: false` is an invalid
value.
2024-03-03 16:51:39 -08:00
2e8420d2e9
Merge tag 'tags/2024.3.1'
2024-03-03 13:16:27 -08:00
dakkar
2cad97c1ab
merge: release 2024.3.1 ( !449 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/449
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 17:43:24 +00:00
dakkar
6ecfe7c7c3
remove duplicate method
2024-03-02 17:34:31 +00:00
dakkar
23f476dbf3
Merge branch 'develop' into release/2024.3.1
2024-03-02 17:28:34 +00:00
Amelia Yukii
2e55108b6b
merge: put back the readme ( !447 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/447
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 16:50:34 +00:00
dakkar
83fa276483
put back the readme
2024-03-02 16:49:02 +00:00
Amelia Yukii
46c664348e
merge: merge upstream for 2024.2.1 ( !446 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/446
Closes #434
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 16:36:49 +00:00
dakkar
af548d05ca
merge upstream for 2024.2.1
2024-03-02 16:36:49 +00:00
241d123fc4
bump version
2024-02-27 14:59:25 -08:00
1c50079f7b
Allow pinning/unpinning other users posts
2024-02-27 14:57:27 -08:00
401376d668
Fix restriction on excludeReplies and excludeNoFiles
2024-02-27 14:50:13 -08:00
6e0f7195b3
Remove withReplies NAND withFiles check
2024-02-27 14:13:48 -08:00
86a77a9dba
bump version
2024-02-26 21:38:22 -08:00
3ae5cfd720
Change icons for like and favorite
...
"Like" will now use a star emoji, like mastodon's faves
"Favorite" will now use a bookmark emoji, since it functions as a bookmark
2024-02-26 21:36:53 -08:00
6ecb0dcacf
bump version
2024-02-26 11:33:57 -08:00
b75006ff10
Change default reaction emoji
2024-02-26 11:33:50 -08:00
Amelia Yukii
eab7d5bd27
merge: Fix Images in ReadMe ( !445 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/445
Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-25 23:59:05 +00:00
Amelia Yukii
8e8a9d3835
Fix Images in ReadMe
2024-02-25 21:57:12 +00:00
b9764e5a73
bump version
2024-02-25 13:40:37 -08:00
74a62c2107
Merge branch 'feature-allowlist' into egirls-sharkey
2024-02-24 14:33:24 -08:00
9dcc7645ea
Allowlist implementation
2024-02-24 14:33:12 -08:00
Amelia Yukii
7a1251423f
merge: Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey ( !443 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/443
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-24 18:20:48 +00:00
Marie
7f5492a395
Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey
2024-02-24 18:20:48 +00:00
Marie
2fa0e238b7
merge: Update index.vue - Also check enableMcaptcha for noBotProtection ( !442 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/442
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-02-24 18:16:43 +00:00
Marie
1b65c06d60
merge: fix: delete old follow request (if exists) before creating new ( !440 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-02-24 18:16:16 +00:00
Marie
d539dec8b1
merge: Merge upstream changes from 23rd of Feburary ( !439 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/439
Closes #431
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-24 18:16:06 +00:00
Ashley Graves
17df852c33
Update index.vue - I'm dumb sorry
2024-02-24 17:15:24 +00:00
Ashley Graves
f3ca342318
Update index.vue - Also check enableMcaptcha for noBotProtection
2024-02-24 17:12:53 +00:00
Kaity A
def2e8dff0
Merge remote-tracking branch 'origin/develop' into fix/failed-follow
2024-02-24 05:05:25 +00:00
Kaity A
ea948ccadc
fix: delete old follow request (if exists) before creating new
2024-02-24 04:38:01 +00:00
83880096b2
Lock off public HTML
2024-02-23 12:27:13 -08:00
acec9de658
Allow securing public api
2024-02-23 12:04:47 -08:00
Marie
d1b787192a
fix: align note edit errors with note create errors
2024-02-23 17:01:35 +01:00
Marie
15d2319011
merge: upstream
2024-02-23 13:42:52 +01:00
tamaina
c0156b740b
enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeDeletedStateを発行する ( #13382 )
2024-02-23 18:15:39 +09:00
かっこかり
d834232232
enhance(games): 抜けている翻訳を追加・スタイル共通化 ( #13434 )
...
* enhance(games): 抜けている翻訳を追加・スタイル共通化
* frameDivider の使用箇所が見当たらなかったので削除
* ミス
* インナーでもcss変数を使う
* コロンを翻訳から外す
* 一部の翻訳を除去
* p
* revert some text
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-23 18:07:41 +09:00
