Commit graph

919 commits

Author SHA1 Message Date
3d433c6a75 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-04-16 19:05:21 +02:00
Chewbacca
5612cb6fdf Merge branch 'fix-reply-status-group' into 'develop'
Fix replying to status from Group

See merge request soapbox-pub/soapbox!2426
2023-04-12 19:05:42 +00:00
Chewbacca
39f2734bd4 Fix replying to status from Group 2023-04-10 15:59:36 -04:00
Alex Gleason
c2348a6249
Merge remote-tracking branch 'origin/develop' into home-link-headers 2023-04-10 10:13:19 -05:00
33d8ad1774 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-04-04 22:34:16 +02:00
Alex Gleason
9d0ff2b8a4
Remove group-editor code 2023-04-03 15:10:33 -05:00
Alex Gleason
659c186394
ManageGroupModal: use internal state instead of Redux 2023-04-03 15:06:20 -05:00
Alex Gleason
2bc6ff3fa3
Use Link header for home timeline pagination 2023-04-02 18:32:50 -05:00
9c49fc3d8a Lexical: Hashtag, emoji autocompletion
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-02 20:50:15 +02:00
46ffd053bb Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-02 12:03:35 +02:00
Alex Gleason
5720d396fc
Groups: make "share with followers" button work 2023-03-30 20:47:08 -05:00
820ead9932 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-30 18:17:23 +02:00
marcin mikołajczak
55c0f8d6a1 Merge branch 'friendica' into 'develop'
Friendica dislikes

See merge request soapbox-pub/soapbox!2381
2023-03-28 22:13:24 +00:00
6b2109735d Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-28 14:35:49 +02:00
Alex Gleason
d39e2cc7e0
UnapprovedAccount: use countdown, remove rejectUserModal 2023-03-27 17:14:22 -05:00
c953da7c78 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-27 20:04:26 +02:00
12f3b4fbc3 Support Friendica dislikes, quotes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-25 23:16:40 +01:00
96a8bcdf82 Friendica dislikes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-25 12:14:53 +01:00
Chewbacca
30ef70440f Add ability to report a Group 2023-03-23 15:17:44 -04:00
dadaadcdde Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-23 15:09:22 +01:00
Alex Gleason
28a69ad88b
Ensure group_visibility param is passed when creating group 2023-03-20 15:30:13 -05:00
Alex Gleason
bc457b61d1 Merge branch 'edit-group' into 'develop'
Edit group

See merge request soapbox-pub/soapbox!2357
2023-03-20 18:41:52 +00:00
5b55a89826 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-19 19:39:21 +01:00
8b81838f2f Support custom emoji reacts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-18 00:07:18 +01:00
Alex Gleason
181bf23c34
Importer: use EntityStore enums 2023-03-16 13:15:00 -05:00
Alex Gleason
1518e88904
Retrofit old Group actions to EntityStore 2023-03-15 18:37:50 -05:00
8c68e93e55 Add draggable block plugin
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-14 17:22:23 +01:00
61ece4d271 Merge remote-tracking branch 'takver/fix-locale-parser' into fix-locale-parser
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-13 20:44:09 +01:00
Alex Gleason
1922e889f7 Merge branch 'create-group' into 'develop'
Create group

See merge request soapbox-pub/soapbox!2325
2023-03-13 18:28:43 +00:00
Chewbacca
7ad2696f85 Move Join / Leave / Cancel group/request to mutations 2023-03-13 11:36:08 -04:00
84fa5bf333 Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-10 17:43:47 +01:00
1d64f934d9 Merge remote-tracking branch 'soapbox/develop' into filters-v2 2023-03-09 21:49:57 +01:00
88a6ed0ee1 Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-08 22:08:03 +01:00
Alex Gleason
d7f5e210d8
Groups: scaffold the confirmation step 2023-03-08 13:43:16 -06:00
Alex Gleason
925509a985
Fix groups modal bailing too soon 2023-03-08 12:20:20 -06:00
1d4d9c2732 Filters expiration, restyle filters list, fix keywords deletion
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-05 19:49:40 +01:00
af314ee55d Allow editing filters
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-04 21:22:59 +01:00
4c92f581c4 Allow creating v2 filters
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-04 12:43:27 +01:00
4200fa2df4 filters v2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-03 22:40:39 +01:00
171341ff1a Merge, store Lexical editorState
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-02 19:42:31 +01:00
2bbbcd625e WIP
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-26 19:29:37 +01:00
528acb8ac5 Merge remote-tracking branch 'soapbox/develop' into update-emoji-mart
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-23 17:42:31 +01:00
marcin mikołajczak
28d84dedff Compose: Only send group_id when not null 2023-02-22 17:35:48 +00:00
81de0014d3 Change ESLint rules, lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-16 00:12:02 +01:00
marcin mikołajczak
2cfd402bec Merge branch 'admin-announcements' into 'develop'
Dashboard: Allow to create announcements

See merge request soapbox-pub/soapbox!2276
2023-02-14 23:05:07 +00:00
Chewbacca
0b9fe2cfca Merge branch 'hoverable-menu' into 'develop'
Add new hoverable menu for Chat Messages (and rebuild DropdownMenu component with Popper)

See merge request soapbox-pub/soapbox!2274
2023-02-13 17:32:02 +00:00
64c4847f9d Dashboard: Allow to create announcements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-12 17:54:13 +01:00
Chewbacca
60d7ff8395 Re-build dropdown-menu using FloatingUI 2023-02-10 13:17:39 -05:00
Chewbacca
380d2b763f Merge branch 'improve-reactions' into 'develop'
Improve Emoji Reactions and add support for Chat Reactions

See merge request soapbox-pub/soapbox!2267
2023-02-09 21:37:57 +00:00
Chewbacca
e255bfac3d Improve Emoji Reactions and add support for Chat Reactions 2023-02-08 12:58:01 -05:00