dakkar
|
2da85e1163
|
(not related to the merge) fix instance name in severAllFollowRelations
|
2024-10-10 14:09:36 +01:00 |
|
dakkar
|
60c6267d7a
|
replace new icons with ours
|
2024-10-09 16:24:10 +01:00 |
|
dakkar
|
0a7075044a
|
fix deleteAndEdit danger class
|
2024-10-09 16:10:03 +01:00 |
|
dakkar
|
10aab285d1
|
fix import
|
2024-10-09 16:07:37 +01:00 |
|
dakkar
|
50120371f7
|
fix import
|
2024-10-09 16:07:30 +01:00 |
|
dakkar
|
5856858f49
|
try to fix icons
|
2024-10-09 15:52:42 +01:00 |
|
dakkar
|
73abf3204e
|
fix following-feed imports
|
2024-10-09 15:52:42 +01:00 |
|
dakkar
|
c5ff081557
|
fix MkUrlWarningDialog imports
|
2024-10-09 15:52:42 +01:00 |
|
dakkar
|
7519f98462
|
copy changes from MkNoteDetailed to SkNoteDetailed
|
2024-10-09 15:52:42 +01:00 |
|
dakkar
|
3fca2ba2f6
|
copy changes from MkNote to SkNote
|
2024-10-09 15:52:42 +01:00 |
|
dakkar
|
b4c53687b4
|
oops, missed a closing tag
|
2024-10-09 15:27:05 +01:00 |
|
dakkar
|
f00576bce6
|
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
|
2024-10-09 15:17:22 +01:00 |
|
dakkar
|
2d6f1ed464
|
Merge branch 'merge-requests/668' into feature/2024.9.0
|
2024-10-09 10:41: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 |
|
piuvas
|
672c4f746c
|
inform users about sharkey specific localization
|
2024-10-08 00:33:16 -03:00 |
|
Hazel K
|
eb5a2b023e
|
count CW for character limit
|
2024-10-07 19:25:03 -04:00 |
|
Marie
|
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 |
|
Marie
|
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 |
|
Hazel K
|
cd9bce3072
|
prevent login and password reset for system accounts
|
2024-10-07 14:58:39 -04:00 |
|
Hazel K
|
126a2fcf15
|
Merge branch 'develop' into hazelnoot/625-protect-system-accounts
|
2024-10-07 14:10:45 -04:00 |
|
Hazel K
|
6cfadb1f61
|
add prefix to components
|
2024-10-07 11:21:37 -04:00 |
|
Hazel K
|
12de9fcb18
|
fix error display
|
2024-10-07 11:18:08 -04:00 |
|
Hazel K
|
0da7f9b3f6
|
Merge branch 'develop' into hazelnoot/following-timeline
|
2024-10-07 10:45:16 -04:00 |
|
Hazel K
|
adc7b91e3b
|
fix UI hiding on admin-user.vue
|
2024-10-07 10:41:41 -04:00 |
|
PrivateGER
|
1c3495ef59
|
Make including followers in response a parameter
|
2024-10-07 16:23:24 +02:00 |
|
Hazel K
|
a790fef261
|
prevent deletion or suspension of system accounts
|
2024-10-07 10:02:55 -04:00 |
|
PrivateGER
|
bfd812720e
|
Move styling to MkA elements
|
2024-10-07 12:46:28 +02:00 |
|
PrivateGER
|
80cbf00eac
|
Add following and follower relationship view
|
2024-10-07 12:30:49 +02:00 |
|
PrivateGER
|
fadae347ff
|
Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui
|
2024-10-06 23:13:10 +02:00 |
|
Marie
|
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 |
|
PrivateGER
|
f028795483
|
Move text into translation files
|
2024-10-06 20:31:41 +02:00 |
|
Hazelnoot
|
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 |
|
PrivateGER
|
941a200f35
|
Move button into button group
|
2024-10-06 19:53:10 +02:00 |
|
Marie
|
939f07fa55
|
upd: fix returns
|
2024-10-06 19:08:32 +02:00 |
|
Hazel K
|
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 |
|
Hazel K
|
60d0e3df7b
|
preserve refresh button on mobile UI
|
2024-10-06 12:20:06 -04:00 |
|
Hazel K
|
01fb606fee
|
fix weird left-alignment
|
2024-10-06 12:18:15 -04:00 |
|
Hazel K
|
d016ef7675
|
fix display size reactivity
|
2024-10-06 12:02:56 -04:00 |
|
Marie
|
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 |
|
Hazelnoot
|
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 |
|
Hazel K
|
4ca27692ac
|
Merge branch 'develop' into hazelnoot/following-timeline
|
2024-10-06 11:16:43 -04:00 |
|
Hazel K
|
eec4a5082d
|
fix OpenAPI definition for admin/meta.silencedHosts
|
2024-10-06 11:03:28 -04:00 |
|
Hazel K
|
605c22b55e
|
add lockout for isMediaSilenced
|
2024-10-06 10:58:27 -04:00 |
|
Hazel K
|
008ac89672
|
fix translation string
|
2024-10-06 10:58:06 -04:00 |
|
Hazel K
|
9b11aead5a
|
Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked
|
2024-10-06 10:48:20 -04:00 |
|
Hazel K
|
2bc9ce93b8
|
add missing import
|
2024-10-06 10:47:55 -04:00 |
|
Marie
|
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 |
|
Marie
|
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 |
|
Marie
|
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 |
|
Hazel K
|
7dd296017b
|
fix modlog and translations for "Mark as NSFW"
|
2024-10-05 22:43:34 -04:00 |
|