amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,672 Commits 3 Branches 0 Tags 162 MiB
ed896934fc
Commit Graph

7048 Commits

Author SHA1 Message Date
hijiki
315d5af93f タイムラインの項目削除 2024-10-19 16:30:14 +09:00
hijiki
7db4b7eec7 メニューから絵文字とチャートと連合と広告の項目を削除 2024-10-19 14:23:17 +09:00
hijiki
78269ad55e aboutページから色々消した、ページをログインしないと表示できないようにした 2024-10-19 13:55:50 +09:00
hijiki
2e73a1c905 あああ 2024-10-19 13:42:16 +09: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
sweshelo
9132e2c701 feat: 外部のサーバでも最終更新時刻からオンライン状況を推定 2024-10-19 01:15:26 +09:00
hijiki
46e5192de1 うへ〜 2024-10-19 01:06:43 +09:00
lqvp
a84cae91a1 受け入れがいいねの際も隠すように 2024-10-19 00:25:30 +09:00
lqvp
c7b72f579c hideReactionUsersをtrueへ 2024-10-19 00:25:12 +09:00
lqvp
f28e50db5c user/noteも隠す 2024-10-19 00:23:17 +09:00
lqvp
34e49b8f1b 色々隠した 2024-10-19 00:22:01 +09:00
hijiki
d80665fb2b 代替ダイアログを無効化 2024-10-19 00:15:02 +09:00
Marie
ed064b2193
upd: remove type username to confirm dialog 
resolves # 759
 2024-10-18 01:09:46 +02:00
Marie
fea7889e0c
upd: add recommended checks 2024-10-17 21:56:43 +02:00
Marie
5152192e09
fix: add missing type 2024-10-17 20:22:16 +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
dakkar
786677b079 merge: Feat: Implement clickable notifications (!685) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/685

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-17 15:56:05 +00:00
Hazelnoot
fbe6b31878 fix eslint errors in all projects due to over-including files 2024-10-16 10:30:38 -04:00
Hazelnoot
6c30c94b92 fix eslint errors in frontend / frontend-embed 2024-10-16 09:55:29 -04:00
Hazelnoot
2c8af72168 fix formatting in boot.js 2024-10-16 09:15:03 -04:00
Hazelnoot
0c2e113e8e update fast-xml-parser to patch security issue (DoS) 2024-10-15 22:03:42 -04:00
Hazelnoot
af3bb7346e update axios and ws to patch security issue (unexploitable in our case) 2024-10-15 22:00:39 -04:00
Hazelnoot
1f53df66d4 update katex to patch security issue (DoS + 2 more unexploitable) 2024-10-15 21:51:11 -04:00
Hazelnoot
5f3cb09eb1 fix lint errors in SkFormula.vue 2024-10-15 21:50:05 -04:00
Hazelnoot
1a9f2f84b3 fix linting and type checks in all packages 2024-10-15 21:41:36 -04:00
Hazelnoot
b20e671452 disable linting in megalodon, as it's 3rd party code 2024-10-15 21:41:23 -04:00
Hazelnoot
45ac7e50bc fix locales versioning in service worker 2024-10-15 21:40:20 -04:00
Hazelnoot
b5a1c54d65 fix lint errors in backend unit tests 2024-10-15 21:40:20 -04:00
Hazelnoot
7431866d86 fix locales versioning in backend client 2024-10-15 21:40:20 -04:00
Hazelnoot
9b06347882 fix TS errors in NoteCreateService / NoteEditService 2024-10-15 21:31:34 -04:00
Hazelnoot
de61781c4a fix TS errors in vite config files 2024-10-15 21:23:03 -04:00
Hazelnoot
7e220d6e31 fix lint error in const.ts 2024-10-15 21:22:46 -04:00
Hazelnoot
c5f1279d4b fix lint / TS errors in create-notification.ts 2024-10-15 21:22:23 -04:00
Marie
4128b38724 chore: update misskey-js 2024-10-15 18:21:09 -04:00
Marie
dedb24fe74 chore: change permission kind 2024-10-15 18:21:09 -04:00
Marie
6b56163931 upd: change condition 2024-10-15 18:21:08 -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
00bb958874 chore: change string to locale 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
Marie
7647aa637a merge: Improvements and tweaks to latest note handling (resolves #744) (!688) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/688

Closes #744

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-15 21:50:32 +00:00
Hazelnoot
de9b99c937 merge: Add filter options to following feed (resolves #726) (!671) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/671

Closes #726

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-15 21:50:26 +00:00
Hazelnoot
e781be3c72 add unit tests for SkLatestNote.areEquivalent 2024-10-15 14:17:19 -04:00
Hazelnoot
e19193c9d0 unify logic of SkLatestNote.areEquivalent and SkLatestNote.keyFor 2024-10-15 14:17:19 -04:00
Hazelnoot
5dc700938d update latest_note for edits 2024-10-15 14:17:19 -04:00
Hazelnoot
93cf2f9045 factor out latest_note logic into LatestNoteService 2024-10-15 14:17:19 -04:00
Hazelnoot
c55af9c3b3 update latest note in background (don't await the result) 2024-10-15 14:17:19 -04:00
Hazelnoot
fa687ecb33 fix is-renote tests 2024-10-15 14:16:46 -04:00
Hazelnoot
d3792ab201 fix test failures 2024-10-15 14:16:46 -04:00
Hazelnoot
9b1bae653d add "show bots" toggle to following feed 2024-10-15 14:16:46 -04:00
Hazelnoot
24fd35e03d revert accidental change to postgres.ts 2024-10-15 14:16:46 -04:00
Hazelnoot
e3c79b0c83 fix typos in track-latest-note-type migration 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
499e8895c5 save filters for following feed 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
9d3292e6e9 add type columns to SkLatestNote 2024-10-15 14:16:46 -04:00
Hazel K
fea993f6b2 correct name of SkLatestNote 2024-10-15 14:16:46 -04:00
Hazelnoot
86a693b182 factor out tuple logic into from-tuple.ts 2024-10-15 14:03:57 -04:00
Hazelnoot
4e592fb1c9 federate Flag.object as an array to fix Pleroma compatibility 2024-10-15 13:54:28 -04:00
Hazelnoot
5c1d16947c fix import order in common.ts 2024-10-15 12:28:40 -04:00
Hazelnoot
652cc8602c refresh locales after any change, not just a version update 2024-10-15 12:23:18 -04:00
Hazelnoot
2cd41228d8 Merge branch 'develop' into feature/2024.9.0 2024-10-13 11:35:10 -04:00
Hazelnoot
bd2cdd9363 restore missing hasPendingReceivedFollowRequest in navbar 2024-10-13 01:09:49 -04:00
Lhc_fl
edce54ad0f add new i18n pendingFollowRequests 2024-10-13 01:04:41 -04:00
Lhc_fl
19a1f3111b fix default followreq tab 2024-10-13 01:04:41 -04:00
Lhc_fl
0c03f9ead0 fix default followreq tab 2024-10-13 01:04:40 -04:00
Lhc_fl
0e6ba9ccd4 ux: should not show follow requests tab when have no pending sent follow req 2024-10-13 01:04:40 -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
Marie
45974a53f8 merge: try to avoid insert races in FederatedInstanceService (!683) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/683

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-13 00:17:16 +00:00
Marie
fdfb0faab0 merge: Add missing rejectReports field to show-instance API response (!679) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/679

Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se>
 2024-10-13 00:13:26 +00:00
CenTdemeern1
808963189e Autogen seems to have generated this file 
This doesn't seem related so I'm putting it in its own commit so it can be dropped easily if needed
 2024-10-13 01:03:29 +02:00
CenTdemeern1
5085c39440 Implement clickable notifications 
I'm not sure about the get function pattern here as it doesn't include a value to base reactivity on; I might be too used to Svelte though and maybe that's fine
 2024-10-13 01:03:29 +02:00
Hazelnoot
3093707469 merge: Prevent usernames from overflowing the reactions hover-list (resolves #737) (!682) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/682

Closes #737

Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se>
 2024-10-12 21:46:04 +00:00
dakkar
a44d58781f Merge branch 'develop' into feature/2024.9.0 2024-10-12 20:00:40 +01:00
dakkar
80fdb595a6 fix editing notes 2024-10-12 19:45:47 +01:00
dakkar
14e21d00b9 honour prefers-reduced-motion in embeds 2024-10-12 19:45:35 +01:00
dakkar
bf6ca8efdc also ignore stale *failed* responses - #741 
since `misskeyApi` doesn't pass us the request, we close over a copy
of the username we requested, to make sure it still matches the
current username value
 2024-10-12 18:23:20 +01:00
dakkar
5af38db74b ignore stale users/show responses - fixes #741 
* person starts typing "abcd"
* request for user "abcd" is sent to server
* person continues typing "ef"
* request for user "abcdef" is sent to server
* response for user "abcdef" arrives, icon for user "abcdef" is shown
* response for user "abcd" arrives, icon for user "abcd" was shown –
  with this commit, this response is ignored instead

This is not just "showing the wrong avatar", btw: `MkSignin` uses the
`user` variable to decide whether to use 2FA, so having the wrong data
in user can make a login attempt fail.
 2024-10-12 18:16:06 +01:00
Marie
464fb22710 fix: accidental double backslash in DEFAULT_INFO_IMAGE_URL 2024-10-12 11:41:20 +00:00
dakkar
06bd29f209 try to avoid insert races in FederatedInstanceService 
Despite the cache, different processes can race to insert a row for
the same remote host.

This is particularly apparent in our unit tests, with
`test/unit/activitypub.ts` randomly failing.

This is a (somewhat clumsy) attempt at working around that race: trap
the "duplicate key value" error, and fetch the record.

Tests pass, with or without values in the cache.
 2024-10-12 10:57:57 +01:00
dakkar
98f1f30e72 fix "federation allowed" check in our code 2024-10-12 09:35:45 +01:00
Hazelnoot
a1375c8ab7 prevent usernames from overflowing the reactions hover-list 2024-10-12 00:29:40 -04:00
Marie
f68c0ac05d fix: broken error images 2024-10-11 22:06:37 +00:00
Hazelnoot
adbea34c11 generate missing type for UserLite.isSilenced 2024-10-11 14:10:13 -04:00
Hazelnoot
b27b398717 fix calculation of instance-info.isSuspended when instance is null 2024-10-11 14:07:31 -04:00
Hazelnoot
148bf98f21 Merge branch 'develop' into feature/2024.9.0 
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
 2024-10-11 14:06:21 -04:00
Marie
f3e6b43ea4 merge: New logo (!681) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/681

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-11 18:04:32 +00:00
Ruben
69483bb55b
new logo 2024-10-11 11:32:35 -05:00
Hazelnoot
7837852149 copy iAmModerator check to other instance-info controls 2024-10-11 11:25:10 -04:00
Hazelnoot
66a88c89b5 fix TypeScript and ESLint errors in instance-info.vue 2024-10-11 11:24:39 -04:00
Hazelnoot
a39f5c92b4 add missing rejectReports field to show-instance response 2024-10-11 10:21:32 -04:00
Hazelnoot
f496d4b88b re-implement suspension toggle to match other controls 2024-10-11 10:16:57 -04:00
Hazelnoot
87a12c020f convert "suspend deliver" button into a toggle 2024-10-11 09:52:59 -04:00
Hazelnoot
eb2ea85d40 merge: Minor improvements to relation badges on user profiles (!674) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/674

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-11 13:28:55 +00:00
dakkar
fb9b6b1208 thank you linters 2024-10-11 12:20:08 +01:00
dakkar
3cec5f927e fix some linting in frontends 2024-10-11 11:24:49 +01:00
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
dakkar
a12815eabe fix some (all?) Misskey references 2024-10-11 09:59:21 +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
ffff1dfc7d merge: Reduce federation log spam (maybe resolves #689) (!649) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/649

Closes #689

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-10 19:43:39 +00:00
Hazelnoot
a7076ed3e0 show "blocking you" indicator to instance staff only 2024-10-10 14:01:40 -04:00
Hazelnoot
523ad3d60c add "following" and "mutuals" relation badges 2024-10-10 14:01:40 -04:00
Hazelnoot
1b106d92e0 fix HTML semantics of relational info-badges 2024-10-10 14:01:40 -04: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
dakkar
9ea618c4a5 fix some DI mistakes after the merge 2024-10-10 13:55:52 +01:00
dakkar
a2d47f686f replace icons in embeds 2024-10-10 13:50:20 +01:00
dakkar
7628fe9c46 show image comment as title in embeds 2024-10-10 13:48:40 +01:00
dakkar
e87b1d2b11 set isBlock for mfm render in embeds 2024-10-10 13:48:39 +01:00
dakkar
abb93f1d79 use sfm for embeds 2024-10-10 13:48:39 +01:00
dakkar
faa7b26344 maybe update embed mfm to our changes 2024-10-10 13:48:39 +01:00
Marie
7bd971c036
upd: add option to disable external url warning 2024-10-10 02:00:41 +02: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
f449e8ffe6 use injected meta is ApRendererService 2024-10-09 17:05:59 +01:00
dakkar
c31ee21485 fix meta in SignupService 2024-10-09 17:04:31 +01:00
dakkar
e6a78d8027 use injected meta in SponsorsService 2024-10-09 17:03:46 +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
afbed7f605 check redisForReactions at startup 2024-10-09 16:49:49 +01:00
dakkar
11e3c95026 replace isBlockedHost with isFederationAllowedHost 2024-10-09 16:39:24 +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
1a656e8eb5 copy changes from NoteCreateService to NoteEditService 2024-10-09 15:40:00 +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
Hazel K
a5316c06ed don't log job name unless it has one 2024-10-08 11:01:24 -04:00
Hazel K
5171ba7113 collapse AbortErrors 2024-10-08 10:43:58 -04:00
Hazel K
d867c2089b further condense error details 2024-10-08 10:43:51 -04:00
Hazel K
d8e1e4890d normalize ID logging 2024-10-08 10:33:48 -04:00
Hazel K
f62cd8941c condense error info 2024-10-08 10:33:34 -04:00
Hazel K
b4d10aa8f8 fix maxAttempts calculation 2024-10-08 10:29:03 -04:00
Hazel K
786702e076 condense job info 2024-10-08 10:27:55 -04:00
Hazel K
83869e1c47 fix lint errors 2024-10-08 10:14:33 -04:00
Hazel K
20dd66f735 improve error summaries 2024-10-08 10:14:26 -04:00
Hazel K
ed0570110b reduce federation log spam 
* Don't record stack trace for unrecoverable errors.
* Avoid logging duplicate stace traces.
 2024-10-08 09:30:08 -04: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
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
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
39214431f4 check for host 2024-10-07 11:45:58 -04:00
Hazel K
9137ae1eef update autogen types 2024-10-07 11:21:52 -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
PrivateGER
46e53e294e
Parameterize followee as well 2024-10-07 16:47:15 +02: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
Hazel K
c77e90d98a update autogen types 2024-10-07 10:41:18 -04:00
Hazel K
844dfaaf5d model missing "approved" property in show-user response 2024-10-07 10:40:44 -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
a292e46f84 Pack other side of relation into response as well 2024-10-07 11:56:18 +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
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