Commit graph

9105 commits

Author SHA1 Message Date
Alex Gleason
bf7d7f93a5 Merge branch 'dismiss-memberships' into 'develop'
useGroupMembershipRequests: dismiss instead of decrement

See merge request soapbox-pub/soapbox!2481
2023-05-02 16:53:23 +00:00
Chewbacca
799b845467 Merge branch 'add-tests' into 'develop'
Add tests for Groups discover components

See merge request soapbox-pub/soapbox!2483
2023-05-01 17:11:02 +00:00
Alex Gleason
95364a46d9 Merge branch 'contextual-compose' into 'develop'
Contextual compose button

See merge request soapbox-pub/soapbox!2478
2023-05-01 16:06:13 +00:00
Chewbacca
4d609b57d6 Add tests for Groups discover components 2023-05-01 12:01:39 -04:00
Chewbacca
78621a696e Merge branch 'handle-deleted-groups' into 'develop'
Account for soft-deleted Groups in the profile

See merge request soapbox-pub/soapbox!2479
2023-05-01 15:58:06 +00:00
marcin mikołajczak
696e97bb19 Merge branch 'groups-note-plain' into 'develop'
Use note_plain on group edit page

See merge request soapbox-pub/soapbox!2482
2023-04-29 13:35:59 +00:00
97dd235de3 Use note_plain on group edit page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-29 13:56:07 +02:00
Alex Gleason
d8a3f51e4a
useGroupMembershipRequests: dismiss instead of decrement 2023-04-27 14:11:45 -05:00
Alex Gleason
a1b9d8a682
Fix ComposeButton tests 2023-04-27 13:20:53 -05:00
Chewbacca
fbb258c387 Merge branch 'fix-group-relationship-state-bug' into 'develop'
Update GroupRelationship state after join/leave group

See merge request soapbox-pub/soapbox!2477
2023-04-27 14:14:47 +00:00
marcin mikołajczak
ac220cb642 Merge branch 'explanation-box-dismiss' into 'develop'
Use dismiss button instead of menu in fediverse explanation box

See merge request soapbox-pub/soapbox!2480
2023-04-27 06:06:18 +00:00
Alex Gleason
44300539d5
yarn i18n 2023-04-26 16:41:20 -05:00
21b6ad1cbd Add dismiss button instead of menu in fediverse explanation box
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-26 23:28:57 +02:00
Alex Gleason
8ee5727cd8
ComposeModal: add share to group toggle 2023-04-26 15:53:06 -05:00
Alex Gleason
506cad3b70
FloatingActionButton: contextual group support 2023-04-26 15:33:34 -05:00
Alex Gleason
a193108ef8
ComposeModal: become group-aware 2023-04-26 15:14:54 -05:00
Alex Gleason
f9b5954060
ComposeModal: allow passing a composeId 2023-04-26 15:07:19 -05:00
Chewbacca
27f632786f Account for soft-deleted Groups in the profile 2023-04-26 15:53:52 -04:00
Chewbacca
3a5f9f3c93 Update GroupRelationship state after join/leave group 2023-04-26 14:27:36 -04:00
Alex Gleason
4720922015
ComposeButton: style group compose button 2023-04-26 13:06:03 -05:00
Chewbacca
84641d053a Merge branch 'improve-group-popover' into 'develop'
Hide 'View group' button if already on Group

See merge request soapbox-pub/soapbox!2476
2023-04-26 17:06:16 +00:00
Chewbacca
1960eb000a Merge branch 'hide-status-info-on-threads' into 'develop'
Hide status info if Thread Status

See merge request soapbox-pub/soapbox!2475
2023-04-26 17:06:02 +00:00
Chewbacca
c001a4ab76 Merge branch 'update-group-tag-schema' into 'develop'
Change 'uses' to 'groups' in Tag schema

See merge request soapbox-pub/soapbox!2474
2023-04-26 17:05:38 +00:00
Chewbacca
f19e3b01c2 Merge branch 'fix-visibility-logic' into 'develop'
Fix logic with toggling Group Tag visibility

See merge request soapbox-pub/soapbox!2473
2023-04-26 17:05:29 +00:00
Chewbacca
b0ac174f80 Merge branch 'handle-null-group' into 'develop'
Handle null group in confirmation step

See merge request soapbox-pub/soapbox!2472
2023-04-26 17:01:31 +00:00
Chewbacca
915c19c7eb Merge branch 'improve-group-avatar-fallback' into 'develop'
Improve fallback of Group Avatars not loading

See merge request soapbox-pub/soapbox!2471
2023-04-26 17:01:14 +00:00
Chewbacca
7548c26490 Hide 'View group' button if already on Group 2023-04-26 10:11:54 -04:00
Chewbacca
b2848f52f9 Hide status info if Thread Status 2023-04-26 09:46:31 -04:00
Chewbacca
5d923842c5 Change 'uses' to 'groups' in Tag schema 2023-04-26 09:17:31 -04:00
Chewbacca
4f0cafabcf Fix logic with toggling Group Tag visibility 2023-04-26 09:08:00 -04:00
Chewbacca
6cda34fb69 Handle null group in confirmation step 2023-04-26 09:06:02 -04:00
Chewbacca
36be68cdcc Improve fallback of Group Avatars not loading 2023-04-26 09:04:25 -04:00
marcin mikołajczak
e5cf1dfa85 Merge branch 'deafult-privacy' into 'develop'
Fix default privacy setting on Mastodon

See merge request soapbox-pub/soapbox!2470
2023-04-25 20:47:26 +00:00
929935fb19 Fix default privacy setting on Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-25 19:14:02 +02:00
Alex Gleason
39d381ae4a Merge branch 'drop-zones' into 'develop'
Drop zones

See merge request soapbox-pub/soapbox!2464
2023-04-25 13:55:17 +00:00
Chewbacca
762b9946d0 Merge branch 'fix-import' into 'develop'
Fix export

See merge request soapbox-pub/soapbox!2469
2023-04-24 17:01:25 +00:00
Chewbacca
1144b863a2 Fix export 2023-04-24 13:01:01 -04:00
Chewbacca
533400bd66 Merge branch 'clear-pending-cache' into 'develop'
Clear pending groups cache

See merge request soapbox-pub/soapbox!2468
2023-04-24 16:32:27 +00:00
Chewbacca
3bbaa02054 Merge branch 'fix-tab-counter' into 'develop'
Fix counter in Group tabs

See merge request soapbox-pub/soapbox!2467
2023-04-24 16:32:14 +00:00
Chewbacca
c5151417d1 Merge branch 'fallback-group-images' into 'develop'
Handle errors on Group Headers

See merge request soapbox-pub/soapbox!2465
2023-04-24 16:20:25 +00:00
Chewbacca
dfae278741 Merge branch 'remove-warning-for-group-posts' into 'develop'
Remove hashtag warning for Group posts

See merge request soapbox-pub/soapbox!2460
2023-04-24 16:20:10 +00:00
Chewbacca
81bf8649b4 Merge branch 'fix-reporting-modal' into 'develop'
Fix reporting modal

See merge request soapbox-pub/soapbox!2466
2023-04-24 16:19:55 +00:00
Chewbacca
68d3775737 Clear pending groups cache 2023-04-24 12:15:56 -04:00
Chewbacca
50a005da54 Fix counter in Group tabs 2023-04-24 11:46:31 -04:00
Chewbacca
9b90289e7c Fix confirmation step in Group report 2023-04-24 11:34:09 -04:00
Chewbacca
11cb90bb15 Allow admins to report Groups 2023-04-24 11:33:42 -04:00
Alex Gleason
5834be838b Merge branch 'group-tags-x' into 'develop'
GroupTagsField: hide "x" until there's more than one tag

See merge request soapbox-pub/soapbox!2461
2023-04-24 15:00:30 +00:00
Chewbacca
b6a5c56859 Merge branch 'tag-improvements' into 'develop'
Tag improvements

See merge request soapbox-pub/soapbox!2458
2023-04-24 12:59:13 +00:00
Chewbacca
8530471ddb Handle errors on Group Headers 2023-04-24 08:17:51 -04:00
Chewbacca
9602382d39 Merge branch 'group-grid-list-item-fixes' into 'tag-improvements'
Group grid list item fixes

See merge request soapbox-pub/soapbox!2459
2023-04-24 12:01:09 +00:00