Commit graph

9522 commits

Author SHA1 Message Date
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
Alex Gleason
c4931d5f6f
Fix follow notifications not having relationship 2023-06-28 09:30:44 -05:00
Alex Gleason
a6a1ed9576 Merge branch 'fix-instance-favicons' into 'develop'
Fix instance favicons

Closes #1447

See merge request soapbox-pub/soapbox!2576
2023-06-28 01:50:10 +00:00
Alex Gleason
fcae0df1f8
Fix instance favicons
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1447
2023-06-27 20:21:50 -05:00
Alex Gleason
14ad6e6fb2 Merge branch 'oakes/own-account-familiar-followers' into 'develop'
Don't show familiar followers for own account

See merge request soapbox-pub/soapbox!2575
2023-06-27 20:38:49 +00:00
oakes
2cae474547 Don't show familiar followers for own account 2023-06-27 16:05:39 -04:00
Chewbacca
e60a4b5be0 Merge branch 'group-mutes' into 'develop'
Support Group Muting

See merge request soapbox-pub/soapbox!2552
2023-06-27 19:14:11 +00:00
Alex Gleason
9eff8d1e9c Merge branch 'oakes/import-relationships' into 'develop'
Import relationships and fix familiar followers dialog

See merge request soapbox-pub/soapbox!2574
2023-06-27 18:54:45 +00:00
oakes
881e8662af Make fetchRelationships import the data into Entities.RELATIONSHIPS 2023-06-27 13:43:57 -04:00
oakes
985022f857 Fetch relationships after getting familiar followers 2023-06-27 13:42:33 -04:00
oakes
ecdbee271b Fix how familiar followers dialog is rendered 2023-06-27 13:41:05 -04:00
Alex Gleason
5883e43711 Merge branch 'default-display-name' into 'develop'
Show username when no display name is set

See merge request soapbox-pub/soapbox!2573
2023-06-27 16:22:02 +00:00
oakes
b8a3083e4d Show username when no display name is set 2023-06-27 12:11:44 -04:00
Chewbacca
f981eaa27e Fix type 2023-06-27 09:34:00 -04:00
Chewbacca
9e27cb06cb Ban User from status action bar 2023-06-27 09:24:29 -04:00
Chewbacca
e3fa58c0da Support Group mutes 2023-06-27 09:24:03 -04:00
Alex Gleason
e58dada03a Merge branch 'modal-scrollable-list' into 'develop'
Fix scrollable list in modals and add pagination

See merge request soapbox-pub/soapbox!2570
2023-06-27 02:52:11 +00:00
Alex Gleason
4c99889812 Merge branch 'group-hooks' into 'develop'
Group entity store updates

See merge request soapbox-pub/soapbox!2571
2023-06-26 18:31:40 +00:00
Alex Gleason
64df93f5a0
Fix status test 2023-06-26 12:41:42 -05:00
Alex Gleason
a8792f9a02
StatusActionBar: use GroupRelationship from entity store 2023-06-26 12:12:34 -05:00