Commit graph

9391 commits

Author SHA1 Message Date
marcin mikołajczak
0ba4a63106 Merge branch 'familiar-followers' into 'develop'
Fix features.ts

See merge request soapbox-pub/soapbox!2601
2023-07-10 08:49:21 +00:00
becb80611a Fix features.ts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-10 10:24:48 +02:00
marcin mikołajczak
e616045f60 Merge branch 'mkljczk-develop-patch-54530' into 'develop'
Enable familiar followers on Rebased

See merge request soapbox-pub/soapbox!2600
2023-07-10 07:24:10 +00:00
marcin mikołajczak
34acc019f7 Enable familiar followers on Rebased 2023-07-10 06:51:20 +00:00
marcin mikołajczak
84d7ce1b67 Merge branch 'calckey' into 'develop'
Support Calckey, maybe

See merge request soapbox-pub/soapbox!2599
2023-07-09 20:06:58 +00:00
07a8df4b61 Support Calckey, maybe
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-09 19:54:44 +02:00
Alex Gleason
23247802b3 Merge branch 'fix-username-lookup-case' into 'develop'
useAccountLookup, useGroupLookup: make lookup case insensitive

Closes #1460

See merge request soapbox-pub/soapbox!2597
2023-07-06 17:33:56 +00:00
Alex Gleason
0e58f2b505
useAccountLookup, useGroupLookup: make lookup case insensitive
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1460
2023-07-06 11:56:27 -05:00
Alex Gleason
c73cf80d26 Merge branch 'redirect-unauth' into 'develop'
Redirect to login when groups or accounts 403

See merge request soapbox-pub/soapbox!2583
2023-07-06 16:41:06 +00:00
Alex Gleason
39eb76bc18
Fix useGroupLookup test 2023-07-06 11:14:34 -05:00
Alex Gleason
6f83b7748e
Merge remote-tracking branch 'origin/develop' into redirect-unauth 2023-07-06 11:10:34 -05:00
marcin mikołajczak
0aecc2fb57 Merge branch 'edit-profile-pickers' into 'develop'
Fix HeaderPicker/AvatarPicker for missing images

See merge request soapbox-pub/soapbox!2596
2023-07-06 13:58:43 +00:00
7c38f751f2 Fix HeaderPicker/AvatarPicker for missing images
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-06 13:22:15 +02:00
marcin mikołajczak
542924fab0 Merge branch 'edit-profile-pickers' into 'develop'
Use AvatarPicker/HeaderPicker on Edit Profile page

See merge request soapbox-pub/soapbox!2594
2023-07-06 06:23:19 +00:00
da42586ca5 Update en.json
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-05 21:49:56 +02:00
a9db41de89 Use AvatarPicker/HeaderPicker on Edit Profile page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-05 21:39:50 +02:00
marcin mikołajczak
aca9c51924 Merge branch 'media-modal-focus-status' into 'develop'
Focus the correct status in media modal

See merge request soapbox-pub/soapbox!2592
2023-07-03 20:33:02 +00:00
marcin mikołajczak
72de8fb90f Merge branch 'hotkeys-statuses' into 'develop'
Move GlobalHotkeys back to features/ui for now

See merge request soapbox-pub/soapbox!2593
2023-07-03 12:32:07 +00:00
bf6bf879a0 Move GlobalHotkeys back to features/ui for now
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-03 13:53:41 +02:00
55b1f9be67 Focus the correct status in media modal
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-03 13:39:11 +02:00
marcin mikołajczak
42e9d31a3e Merge branch 'hotkeys-statuses' into 'develop'
Fix hotkey navigation in media modal

See merge request soapbox-pub/soapbox!2589
2023-07-02 21:27:10 +00:00
marcin mikołajczak
6337a321d5 Merge branch 'chats-date-year' into 'develop'
Show year for older chat messages

See merge request soapbox-pub/soapbox!2591
2023-07-02 21:01:37 +00:00
32c8a94267 Move Hotkeys to a new component
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-02 22:39:10 +02:00
702d8a843e Show year for older chat messages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-02 22:30:23 +02:00
Alex Gleason
362639759e Merge branch 'fix-0' into 'develop'
Fix "0" in place of ProfileFieldsPanel when no fields are set

Closes #1453

See merge request soapbox-pub/soapbox!2590
2023-07-02 19:03:29 +00:00
Alex Gleason
bd4ae72248
Fix "0" in place of ProfileFieldsPanel when no fields are set
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1453
2023-07-02 14:02:26 -05:00
b0bdb78543 Fix hotkey navigation in media modal
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-02 18:41:39 +02:00
marcin mikołajczak
acdc781bc2 Merge branch 'follow-hashtags' into 'develop'
Add Followed hashtags page

See merge request soapbox-pub/soapbox!2588
2023-07-02 11:54:48 +00:00
8646aa5572 Add Followed hashtags page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-02 13:54:02 +02:00
174be975c8 Support Mastodon nightly version
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-02 13:18:52 +02:00
Alex Gleason
b1a775c2a9 Merge branch 'fix-profile-fields-panel' into 'develop'
Fix profile fields panel from not showing up

See merge request soapbox-pub/soapbox!2586
2023-07-02 04:14:59 +00:00
Alex Gleason
6f99396bc4
Fix profile fields panel from not showing up 2023-07-01 23:14:27 -05:00
Alex Gleason
bdf81b1d39 Merge branch 'fix-edit-profile' into 'develop'
Fix edit profile

Closes #1451

See merge request soapbox-pub/soapbox!2585
2023-06-30 17:18:41 +00:00
Alex Gleason
b8c42c9371
Fix edit profile
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1451
2023-06-30 11:52:37 -05:00
Alex Gleason
f7e82e2fc1 Merge branch 'fix-mentions' into 'develop'
Fix mentions

Closes #1449

See merge request soapbox-pub/soapbox!2584
2023-06-30 15:13:55 +00:00
Alex Gleason
6326eeb083
Fix mentions 2023-06-30 09:45:11 -05:00
Alex Gleason
bcac58b9c3
Redirect to login when groups or accounts 403 2023-06-29 15:10:45 -05:00
Alex Gleason
5ffaaa4c3a Merge branch 'compose-safe' into 'develop'
Make Compose reducer type-safe

See merge request soapbox-pub/soapbox!2581
2023-06-29 17:12:32 +00:00
Chewbacca
05efc9f30e Merge branch 'refactor-group-queries' into 'develop'
Refactor group queries

See merge request soapbox-pub/soapbox!2579
2023-06-29 15:06:03 +00:00
Chewbacca
241ef58e88 Add account check 2023-06-29 10:49:37 -04:00
Chewbacca
cadff9b4ab Add test for 'usePendingGroups' 2023-06-29 10:40:15 -04:00
Chewbacca
5eef027ed0 Use new api hook for 'useGroup' 2023-06-29 10:40:15 -04:00
Chewbacca
6f2e0749b6 Refactor 'usePendingGroups' into new api hooks 2023-06-29 10:40:15 -04:00
Alex Gleason
32990fa77b
Merge remote-tracking branch 'origin/develop' into compose-safe 2023-06-28 22:29:39 -05:00
Alex Gleason
11f100da51 Merge branch 'get-account-perf' into 'develop'
Fix performance issue with makeGetAccount

See merge request soapbox-pub/soapbox!2582
2023-06-29 03:12:36 +00:00
Alex Gleason
3ffc5e054d
Fix performance issue with makeGetAccount 2023-06-28 21:42:56 -05:00
Alex Gleason
a336fa2137 Merge branch 'status-get' into 'develop'
status.get('x') --> status.x

See merge request soapbox-pub/soapbox!2580
2023-06-28 22:53:50 +00:00
Alex Gleason
de0b05d691
Make Compose reducer type-safe 2023-06-28 17:53:17 -05:00
Alex Gleason
118cbd5994
status.get('x') --> status.x 2023-06-28 16:27:25 -05:00
Alex Gleason
0c83f840fb Merge branch 'fix-follow-relationship' into 'develop'
Fix follow notifications not having relationship

Closes #1446

See merge request soapbox-pub/soapbox!2578
2023-06-28 14:56:09 +00:00