饺子w (Yumechi)
e05420a92d
Merge commit from fork
...
[ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236 )
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-10-22 22:30:17 +02:00
dakkar
60be692a0a
merge: fix: should use invite limit cycle to calculate invite/limit ( !706 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/706
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-22 14:07:17 +00:00
Lhc_fl
6aaeda13b9
fix: should use invite limit cycle to calculate invite/limit
2024-10-22 18:48:24 +08:00
Hazelnoot
04654b2f84
add "followers" tab to following feed
2024-10-21 17:55:06 -04:00
Hazelnoot
053b47d78a
return error when calling following feed with both includeReplies and filesOnly
2024-10-21 17:55:06 -04:00
Hazelnoot
6430a191f7
fix duplicate users in the following feed
2024-10-21 17:55:06 -04:00
Marie
65ac5fef46
fix: default sensitive not letting users unmark files
2024-10-20 11:04:48 +02:00
dakkar
2a4c91efcc
Merge branch 'develop' into feature/2024.9.0
2024-10-18 22:09:11 +01:00
Marie
290bfd2075
merge: Allow logged in users to refresh polls ( !686 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/686
Closes #743
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-18 21:03:07 +00:00
dakkar
52e291af67
Merge branch 'develop' into feature/2024.9.0
2024-10-18 22:00:07 +01:00
Marie
fea7889e0c
upd: add recommended checks
2024-10-17 21:56:43 +02:00
Marie
42530b5a39
upd: add additional check from delete endpoint
2024-10-17 20:15:20 +02:00
Marie
360a127ad7
chore: indent
2024-10-17 20:14:25 +02:00
Marie
1d9cb4fad9
upd: add decline endpoint and free up username on decline
2024-10-17 20:11:10 +02:00
Hazelnoot
2c8af72168
fix formatting in boot.js
2024-10-16 09:15:03 -04:00
Hazelnoot
7431866d86
fix locales versioning in backend client
2024-10-15 21:40:20 -04:00
Marie
dedb24fe74
chore: change permission kind
2024-10-15 18:21:09 -04:00
Marie
61cb46b171
upd: hide refresh if logged out and if local, change blocked error message
2024-10-15 18:21:08 -04:00
Marie
dd58a4aa92
upd: add ability to refresh poll
2024-10-15 18:21:08 -04:00
Hazelnoot
8a34d8e9d2
Merge branch 'develop' into feature/2024.9.0
...
# Conflicts:
# locales/en-US.yml
# locales/ja-JP.yml
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/NoteDeleteService.ts
# packages/backend/src/core/NoteEditService.ts
# packages/frontend-shared/js/config.ts
# packages/frontend/src/boot/common.ts
# packages/frontend/src/pages/following-feed.vue
# packages/misskey-js/src/autogen/endpoint.ts
2024-10-15 18:09:11 -04:00
Hazelnoot
68b90df00b
merge: Refresh locales after any change, not just a version update ( resolves #732 ) ( !692 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/692
Closes #732
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-15 21:50:56 +00:00
Hazelnoot
9b1bae653d
add "show bots" toggle to following feed
2024-10-15 14:16:46 -04:00
Hazel K
fb7ac68ece
match following endpoint default values with frontend defaults
2024-10-15 14:16:46 -04:00
Hazel K
463b9ac59d
add filters for following feed
2024-10-15 14:16:46 -04:00
Hazel K
56e7d7e0b1
remove un-necessary assignment to query
2024-10-15 14:16:46 -04:00
Hazel K
fea993f6b2
correct name of SkLatestNote
2024-10-15 14:16:46 -04:00
Hazelnoot
652cc8602c
refresh locales after any change, not just a version update
2024-10-15 12:23:18 -04:00
Lhc_fl
1eacf0772c
FEAT: Allow users to view pending follow requests they sent
...
This commit implements the `following/requests/sent` interface firstly
implemented on Firefish, and provides a UI interface to view the pending
follow requests users sent.
2024-10-13 01:04:40 -04:00
dakkar
98f1f30e72
fix "federation allowed" check in our code
2024-10-12 09:35:45 +01:00
Marie
f68c0ac05d
fix: broken error images
2024-10-11 22:06:37 +00:00
dakkar
fb9b6b1208
thank you linters
2024-10-11 12:20:08 +01:00
dakkar
a12815eabe
fix some (all?) Misskey references
2024-10-11 09:59:21 +01:00
dakkar
9ea618c4a5
fix some DI mistakes after the merge
2024-10-10 13:55:52 +01:00
dakkar
ebe5f678f6
fix imports in channels bubble-timeline
2024-10-09 17:57:58 +01:00
dakkar
dec81d32d3
fix type in channel.ts
2024-10-09 17:56:40 +01:00
dakkar
671d71b3ba
probably use correct icons in embeds
2024-10-09 17:24:33 +01:00
dakkar
43bdae4cc4
use injected meta in search-by-tag
2024-10-09 17:19:50 +01:00
dakkar
3b3bd68645
use injected meta in MastodonApiServerService
2024-10-09 17:18:38 +01:00
dakkar
9200d35f57
use injected meta in stream bubble-timeline
2024-10-09 17:17:27 +01:00
dakkar
7b7bc8b7b3
use injected meta in claim-achievement.ts
2024-10-09 17:15:27 +01:00
dakkar
96e77f8d39
use injected meta in like.ts
...
also, add extra errors copied from reactions/create.ts
2024-10-09 17:15:04 +01:00
dakkar
81376bcd1b
use injected meta in SigninApiService
2024-10-09 17:10:02 +01:00
dakkar
ee439f9c7f
remove MetaService from ActivityPubServerService
2024-10-09 17:07:43 +01:00
dakkar
b04568f378
use injected meta in bubble-timeline
2024-10-09 17:00:38 +01:00
dakkar
ad33886bbb
always use this.meta
in SignupApiService
2024-10-09 16:53:46 +01:00
dakkar
11e3c95026
replace isBlockedHost
with isFederationAllowedHost
2024-10-09 16:39:24 +01:00
dakkar
5856858f49
try to fix icons
2024-10-09 15:52:42 +01:00
dakkar
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
Marie
72a0f16b38
merge: Show instance sponsors if OC is set as donation url ( !642 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/642
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Julia <julia@insertdomain.name>
2024-10-08 18:07:58 +00:00
Hazelnoot
a90b4d487a
merge: Increase character hard limits ( resolves #686 and #696 ) ( !647 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647
Closes #686 and #696
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-07 23:20:14 +00:00