c5ff081557
fix MkUrlWarningDialog imports
2024-10-09 15:52:42 +01:00
7519f98462
copy changes from MkNoteDetailed to SkNoteDetailed
2024-10-09 15:52:42 +01:00
3fca2ba2f6
copy changes from MkNote to SkNote
2024-10-09 15:52:42 +01:00
b4c53687b4
oops, missed a closing tag
2024-10-09 15:27:05 +01:00
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
2d6f1ed464
Merge branch 'merge-requests/668' into feature/2024.9.0
2024-10-09 10:41:22 +01:00
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
672c4f746c
inform users about sharkey specific localization
2024-10-08 00:33:16 -03:00
eb5a2b023e
count CW for character limit
2024-10-07 19:25:03 -04:00
5f435f7250
restore sorting of pinned notes
2024-10-07 16:26:30 -04:00
c783ccf8cb
sort pinned notes by date
2024-10-07 16:20:40 -04:00
35114df6d4
always default to latest notes instead of pins
2024-10-07 16:20:40 -04:00
3003affe6a
fix extra gap above user notes
2024-10-07 16:20:40 -04:00
60ec877d3c
on user profiles, move pinned notes down with the other notes
2024-10-07 16:20:40 -04:00
3defc831c3
Fix formatting issues
2024-10-07 21:51:55 +02:00
ba5eec2129
merge: Prevent deletion or suspension of system accounts ( resolves #625 ) ( !666 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/666
Closes #625
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 19:34:26 +00:00
f7e9ffb99a
merge: Display instance follow/following relationships in instance view (partial implementation of 648) ( !665 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/665
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 19:30:48 +00:00
cd9bce3072
prevent login and password reset for system accounts
2024-10-07 14:58:39 -04:00
126a2fcf15
Merge branch 'develop' into hazelnoot/625-protect-system-accounts
2024-10-07 14:10:45 -04:00
6cfadb1f61
add prefix to components
2024-10-07 11:21:37 -04:00
12de9fcb18
fix error display
2024-10-07 11:18:08 -04:00
0da7f9b3f6
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-07 10:45:16 -04:00
adc7b91e3b
fix UI hiding on admin-user.vue
2024-10-07 10:41:41 -04:00
1c3495ef59
Make including followers in response a parameter
2024-10-07 16:23:24 +02:00
a790fef261
prevent deletion or suspension of system accounts
2024-10-07 10:02:55 -04:00
bfd812720e
Move styling to MkA elements
2024-10-07 12:46:28 +02:00
80cbf00eac
Add following and follower relationship view
2024-10-07 12:30:49 +02:00
347dc25bb8
Add show bots toggle
2024-10-07 03:12:29 +02:00
fadae347ff
Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui
2024-10-06 23:13:10 +02:00
28bfd87537
merge: Add option to reject reports from an instance ( Resolves #579 , #715 , #716 ) ( !662 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662
Closes #579 , #715 , and #716
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 19:39:38 +00:00
f028795483
Move text into translation files
2024-10-06 20:31:41 +02:00
42dbe999e1
merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO ( !648 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2024-10-06 17:56:36 +00:00
941a200f35
Move button into button group
2024-10-06 19:53:10 +02:00
939f07fa55
upd: fix returns
2024-10-06 19:08:32 +02:00
047563bdde
Merge branch 'develop' into hazelnoot/579-reject-reports
...
# Conflicts:
# packages/frontend/src/pages/instance-info.vue
2024-10-06 12:26:25 -04:00
60d0e3df7b
preserve refresh button on mobile UI
2024-10-06 12:20:06 -04:00
01fb606fee
fix weird left-alignment
2024-10-06 12:18:15 -04:00
d016ef7675
fix display size reactivity
2024-10-06 12:02:56 -04:00
6d7c7357ab
merge: Warn when a domain is implicitly blocked because a base domain is blocked ( resolves #564 ) ( !661 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/661
Closes #564
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 15:54:46 +00:00
702bb9e5e0
merge: Set visitor dashboard's menu button z-index to 50 ( !656 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656
Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 15:44:57 +00:00
4ca27692ac
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-06 11:16:43 -04:00
eec4a5082d
fix OpenAPI definition for admin/meta.silencedHosts
2024-10-06 11:03:28 -04:00
605c22b55e
add lockout for isMediaSilenced
2024-10-06 10:58:27 -04:00
008ac89672
fix translation string
2024-10-06 10:58:06 -04:00
9b11aead5a
Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked
2024-10-06 10:48:20 -04:00
2bc9ce93b8
add missing import
2024-10-06 10:47:55 -04:00
5f7730bd5c
merge: Show yes/no options instead of ok/cancel when pasting long text ( resolves #584 ) ( !658 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/658
Closes #584
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 10:51:22 +00:00
88f3f0c7eb
merge: Indicate that a user is blocked / muted ( resolves #557 ) ( !659 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659
Closes #557
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 10:48:48 +00:00
f77eb34225
merge: Check if time-based achievements are unlocked before initializing them in main-boot ( !657 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/657
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 10:38:51 +00:00
7dd296017b
fix modlog and translations for "Mark as NSFW"
2024-10-05 22:43:34 -04:00
4da0d4be71
add option to reject reports from an instance
2024-10-05 22:01:55 -04:00
b23d650a15
warn when a domain is hard-blocked by a base domain
2024-10-05 20:42:31 -04:00
e622ab7cc7
indicate if a user is blocked / muted by the current user
2024-10-05 19:13:09 -04:00
c635992616
restore primary highlighting
2024-10-05 18:47:50 -04:00
ca98107eee
respect following privacy settings
2024-10-05 18:25:13 -04:00
c0702fd92f
Check if time-based achievements are unlocked before initializing them in main-boot
2024-10-05 22:58:43 +03:00
5cd44433a0
Set visitor dashboard's menu button z-index to 50
2024-10-05 21:10:33 +03:00
b3f925c426
Fix breaking follow relationships + add warning counts to dialogue
2024-10-05 19:06:05 +02:00
99a0f756ff
Expose instance-moderation endpoints in UI
2024-10-05 19:06:05 +02:00
d633fe41bc
Don't depend on launcher.moe for status assets
2024-10-05 14:49:29 +03:00
fb7bc2ff01
preserve scroll positions when navigating
2024-10-04 08:58:32 -04:00
4273640530
fix extra scroll bar on mobile
2024-10-04 08:31:25 -04:00
4b31004c2b
upd: apply suggestions
2024-10-04 08:41:23 +02:00
323c075483
fix: add props before url
2024-10-04 02:34:34 +02:00
67d739cf71
upd: add script and check to MkUrl
2024-10-04 02:34:01 +02:00
d5b372f7a9
upd&merge: Merge Cherrypick/MisskeyIO's external url popup, delete old popup warning and modify script to handle undefined domains
2024-10-04 02:31:22 +02:00
ac1e5a0fb5
merge: Feat: Implement "Show Below Avatar" for Avatar Decorations ( !645 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/645
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 20:40:34 +00:00
aedc5fba81
merge: Disabling cat speak on the client ( !609 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/609
Closes #604
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 19:51:35 +00:00
bdd8e54be9
add missing copyright header
2024-10-03 15:19:05 -04:00
fddf078b52
improve per-user view on mobile
2024-10-03 15:16:07 -04:00
97a16c2ebc
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-03 14:00:06 -04:00
ef002e00b6
cover case of author speaking as cat while not being cat
...
as @Marie pointed out, if you disable "is cat" without first disabling
"speak as cat", you don't want to speak as a cat!
2024-10-03 18:51:05 +01:00
f6e0a04053
merge: maybe fix #510 - try to not edit visibility ( !631 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/631
Closes #510
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:45:26 +00:00
0f71dc6a07
merge: fix #332 - classic view navbar now respects "side (icon only)" ( !630 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/630
Closes #332
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:39:32 +00:00
66ddf965b5
merge: alert when searching notes from widget, and search is disabled - fixes #275 ( !629 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/629
Closes #275
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:32:20 +00:00
cb264dae75
Use negative z-index to position decorations behind the avatar
...
Co-authored-by: dakkar <dakkar@thenautilus.net>
2024-10-03 19:12:10 +02:00
d82c0ddba9
fix "fetch user info during animation sync"
2024-10-03 12:03:21 -04:00
fa71e54812
backup/restore `disableCatSpeak`
2024-10-03 16:59:08 +01:00
491a499c58
store `disableCatSpeak` per account
2024-10-03 16:59:08 +01:00
49eb673c40
fix nyaize line
2024-10-03 16:59:08 +01:00
d55c86548d
You can now disable cat speak in settings (client side)
2024-10-03 16:58:49 +01:00
bc8c6592ea
merge: make MkAbuseReport more friendly for smaller screen sizes ( !646 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/646
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-10-03 15:57:19 +00:00
e2beec33f8
merge: Minor issue fixes on the frontend ( !625 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/625
Closes #659 , #656 , #651 , #661 , #632 , and #710
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-10-03 15:52:00 +00:00
8b7482f9c0
fix linting
2024-10-03 16:49:20 +01:00
04c729e504
fix: lint error in MkAbuseReport
2024-10-03 11:43:04 -04:00
21b935aa78
add toggle for "only with files"
2024-10-03 11:33:03 -04:00
2fbb697bf9
fetch user info during animation sync
2024-10-03 11:32:51 -04:00
9b572be0df
use standard mute logic
2024-10-03 11:32:23 -04:00
e43c58a955
Simplify the getDecorationZIndex function
2024-10-03 16:55:24 +02:00
5ef58c90ae
replace brs with margin in MkAbuseReport
2024-10-03 09:12:25 -04:00
7ad36d33e9
add comments for mute logic
2024-10-03 00:49:47 -04:00
72d59b459a
respect word mutes
2024-10-03 00:45:49 -04:00
fcb1218bbc
add missing import
2024-10-03 00:43:45 -04:00
cbecaad5ae
don't make MkAbuseReport harder to see if resolved
2024-10-03 00:06:20 -04:00
a32a8e0404
improvement: make MkAbuseReport more friendly for smaller screen sizes
2024-10-03 00:02:04 -04:00
64c737036f
more lint fixes
2024-10-02 23:35:40 -04:00
40179a5591
lint fixes
2024-10-02 22:00:32 -04:00
5c87ed8488
add missing import
2024-10-02 20:32:54 -04:00
444b02ecdd
reload user info when switching tabs
2024-10-02 20:26:22 -04:00
508e76b672
scroll both columns separately
2024-10-02 20:20:51 -04:00
28aa99b273
Implement "Show Below Avatar" for Avatar Decorations
2024-10-02 23:49:30 +02:00
9ddab63a6a
hide actions in mobile layout
2024-10-02 17:08:12 -04:00
007384c536
upd: fix random bg on post button in classic view
...
This does basically nothing in classic view besides breaking the custom wallpapers function
2024-10-02 20:40:58 +02:00
da7a5add33
upd: use @click.prevent instead of @click
2024-10-02 20:11:41 +02:00
49e00c39cf
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-02 13:23:04 -04:00
e2010caaff
Merge branch 'develop' into upd/instancesponsor
2024-10-02 18:57:49 +02:00
a87ced64ca
chore: lint
2024-10-02 18:51:07 +02:00
f43cb514b0
add menu to toggle user replies / boosts
2024-10-02 12:41:08 -04:00
cc1017b2af
upd: add sponsors to instance information
2024-10-02 18:25:23 +02:00
705ae79eb1
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-02 11:45:09 -04:00
ef7cde6bc6
fixes from peer review
2024-10-02 11:38:21 -04:00
321e7daab5
chore: add comments
2024-10-02 17:26:23 +02:00
0bd6d48c7e
merge: Customize Sidebar/Visitor/About separately from app icon. ( !632 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/632
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-02 14:55:20 +00:00
bf85d22a66
merge: Enhance: Add back buttons to Antenna and List Timelines, Tag Search, and Role Detail page. ( !637 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/637
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-02 14:43:37 +00:00
7bc0d4efff
merge: Respect CWs in note previews ( resolves #690 ) ( !639 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/639
Closes #690
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-02 14:43:07 +00:00
c0583e5d5c
don't leak boost / quote / reply contents when CW is in effect
2024-10-02 00:54:35 -04:00
19204851a0
Revert "respect CWs in note summaries"
...
This reverts commit cf49701c2a
2024-10-02 00:49:26 -04:00
5a36c91bf1
Revert "avoid TS errors in get-note-summary"
...
This reverts commit 6785996960
2024-10-02 00:49:25 -04:00
2cad08001a
Revert "preserve non-text details in note summaries"
...
This reverts commit 23659ab013
2024-10-02 00:49:25 -04:00
fa176ab543
Revert "expose prop to force-collapse MkNote / SkNote"
...
This reverts commit c5117552ca
2024-10-02 00:48:23 -04:00
93a4008d42
disable the per-user feed on mobile
2024-10-02 00:45:41 -04:00
09b0de13bf
fix comment typo
2024-10-02 00:44:26 -04:00
e031877a9e
rename some CSS and JS names
2024-10-02 00:20:39 -04:00
eb2c2e261b
remove extraneous "user preview" from feed entries
2024-10-02 00:15:52 -04:00
21277eab8f
auto-select the first user in the following feed
2024-10-02 00:11:57 -04:00
2a11c1ecf6
emit "init" event from MkPagination
2024-10-02 00:09:32 -04:00
8f14fec45b
fix error handling for following-feed
2024-10-02 00:09:10 -04:00
ce5c156e42
translate alt text for "no notes found" image
2024-10-02 00:08:52 -04:00
c8abbcaa33
fix link to post
2024-10-01 22:40:19 -04:00
779b5ef257
show two lines of text for feed entries
2024-10-01 22:27:08 -04:00
d2cf675569
show user info over user feed
2024-10-01 22:21:08 -04:00
cb10fe91bb
preserve non-text details in note summaries
2024-10-01 18:28:25 -04:00
204e734192
include user feed
2024-10-01 18:28:04 -04:00
23659ab013
preserve non-text details in note summaries
2024-10-01 18:26:59 -04:00
94ce7272a7
avoid TS errors in get-note-summary
2024-10-01 14:47:06 -04:00
34aeeb0862
respect CWs in note summaries
2024-10-01 14:47:06 -04:00
6785996960
avoid TS errors in get-note-summary
2024-10-01 14:44:34 -04:00
cf49701c2a
respect CWs in note summaries
2024-10-01 14:44:16 -04:00
ae3863bed0
use compact rendering for following feed
2024-10-01 14:37:09 -04:00
91889dfed3
Add spacing in type signature
...
Again, to match the upstream PR.
2024-10-01 13:07:32 -04:00
0aec0bb402
Fix to match upstream
...
Upstreams linter was mad about the attributes not being before the event
handlers, so this fixes that to match upstream when we end up merging
2024.9 (assuming it gets included in that release)
2024-10-01 10:30:02 -04:00
7a1596cad9
Make post form attachments accessible
...
Adds a role="button", tabindex, and @keydown to MkPostFormAttaches in
order to make it accessible to keyboard users.
2024-10-01 10:06:40 -04:00
6cb4ee7879
fix page icon
2024-09-30 14:47:35 -04:00
e022148875
add refresh button
2024-09-30 13:56:10 -04:00
6a42874eac
add following-feed page
2024-09-30 12:06:00 -04:00
c5117552ca
expose prop to force-collapse MkNote / SkNote
2024-09-30 12:04:44 -04:00
04baad2f9c
fix icon mappings for ti-user-check and ti-user-heart
2024-09-30 12:03:21 -04:00
de33ade423
fix wording for the branding setting
2024-09-29 11:45:35 -03:00
4edce0cb48
classic view
2024-09-29 09:04:21 -03:00
08711e144b
fix iconOnly view
2024-09-29 08:29:50 -03:00
dakkar
Marie
piuvas
Hazel K
codingneko
PrivateGER
Evan Paterakis
CenTdemeern1
Leah
blueb
Julia Johannesen