dakkar
2ecaa57cd5
fix nyaize test
2024-10-11 10:25:07 +01:00
dakkar
02d36c4518
Merge branch 'develop' into feature/2024.9.0
2024-10-11 10:10:16 +01:00
Marie
fefdd1c1e8
merge: Fix: Finding emoji that include capital letters ( !676 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/676
Closes #522
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-10 20:11:03 +00:00
CenTdemeern1
5cebb4da54
fix: Finding emoji that include capital letters
...
Custom emoji names and aliases that include capital letters can now be found in the emoji picker.
I kind of hate copy-pasting `.toLowerCase()` like this but apparently I'm not allowed to refactor Misskey code.
2024-10-10 21:48:53 +02:00
Hazelnoot
2be802131f
merge: On user profiles, move pinned notes down with the other note tabs ( resolves #555 ) ( !651 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/651
Closes #555
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-10 16:33:39 +00:00
Marie
8e85487f64
merge: Add show bots toggle to hamburger menu ( !664 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/664
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-10 16:31:20 +00:00
codingneko
1b278f5630
Remove show bots from client settings
2024-10-10 16:15:59 +00:00
dakkar
2da85e1163
(not related to the merge) fix instance name in severAllFollowRelations
2024-10-10 14:09:36 +01:00
Marie
7bd971c036
upd: add option to disable external url warning
2024-10-10 02:00:41 +02: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
Hazel K
5f435f7250
restore sorting of pinned notes
2024-10-07 16:26:30 -04:00
Hazel K
c783ccf8cb
sort pinned notes by date
2024-10-07 16:20:40 -04:00
Hazel K
35114df6d4
always default to latest notes instead of pins
2024-10-07 16:20:40 -04:00
Hazel K
3003affe6a
fix extra gap above user notes
2024-10-07 16:20:40 -04:00
Hazel K
60ec877d3c
on user profiles, move pinned notes down with the other notes
2024-10-07 16:20:40 -04:00
codingneko
3defc831c3
Fix formatting issues
2024-10-07 21:51:55 +02: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
codingneko
347dc25bb8
Add show bots toggle
2024-10-07 03:12:29 +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
