Commit graph

3316 commits

Author SHA1 Message Date
Alex Gleason
f271553213
Fix type of chat_message.emoji_reactions, fix tests with +unreleased 2023-02-14 12:36:15 -06:00
Alex Gleason
d273947f70
Fix chatEmojiReactions feature gating 2023-02-14 11:41:27 -06:00
Alex Gleason
783a79d306 Merge branch 'multiple-attachments' into 'develop'
Chats: allow uploading multiple attachments

See merge request soapbox-pub/soapbox!2268
2023-02-14 15:54:31 +00:00
Alex Gleason
261d900b51 Merge branch 'fix-dropdown' into 'develop'
Fix Profile Dropdown

See merge request soapbox-pub/soapbox!2261
2023-02-14 15:27:51 +00:00
Alex Gleason
14efff51ff
Merge remote-tracking branch 'origin/develop' into multiple-attachments 2023-02-14 09:24:12 -06:00
Alex Gleason
04ae0f2ee4
ChatMessage: remove testid from emoji button resulting in failing test 2023-02-13 14:46:15 -06:00
Alex Gleason
45657c7a2a
EmojiSelector: pass offset as a prop 2023-02-13 13:17:05 -06: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
Alex Gleason
cc2eafdfac
Merge remote-tracking branch 'origin/develop' into react-any-emoji 2023-02-12 20:30:33 -06:00
Alex Gleason
16179a6371
Transpile emoji-mart for jest 2023-02-12 20:23:29 -06:00
marcin mikołajczak
195ec1b67d Merge branch 'chat-resize-reset' into 'develop'
Chats: reset chat message field height after sending a message

See merge request soapbox-pub/soapbox!2277
2023-02-12 22:14:03 +00:00
4936c3ed38 Merge remote-tracking branch 'soapbox/develop' into cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-12 22:26:55 +01:00
7759f64fed Chats: reset chat message field height after sending a message
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-12 22:23:44 +01:00
marcin mikołajczak
8f79ef2bcd Merge branch 'filters' into 'develop'
Fix filters, restyle filters page

See merge request soapbox-pub/soapbox!2262
2023-02-12 21:08:15 +00:00
Chewbacca
f46086d52a Cleanup a few things 2023-02-10 14:43:41 -05:00
Chewbacca
60d7ff8395 Re-build dropdown-menu using FloatingUI 2023-02-10 13:17:39 -05:00
Chewbacca
17684571af Update hoverable menu on Chat Messages 2023-02-09 12:42:00 -05:00
Alex Gleason
e2e3af4a8b
Don't allow reacting with any emoji to a chat for now 2023-02-08 20:28:44 -06:00
47403872fa Merge remote-tracking branch 'soapbox/develop' into filters 2023-02-08 23:40:40 +01:00
Alex Gleason
50457d3b8d
Chats: disable adding media (and submitting) while media is uploading 2023-02-08 13:07:54 -06:00
Chewbacca
3ca491c03f classNames -> clsx 2023-02-08 14:06:41 -05:00
Alex Gleason
6eadaf2942
CHats: fix deleting a specific attachment 2023-02-08 13:02:48 -06:00
Alex Gleason
64f17ef013
ChatTextarea: add gaps between uploads, put pending upload at end of list 2023-02-08 12:53:07 -06:00
Alex Gleason
072e058764
ChatUploadPreview: support gif attachments 2023-02-08 12:50:18 -06:00
Alex Gleason
ef5001d38b
Chats: support multiple attachments 2023-02-08 12:30:20 -06:00
Chewbacca
e255bfac3d Improve Emoji Reactions and add support for Chat Reactions 2023-02-08 12:58:01 -05:00
07b7d1ec2a Merge remote-tracking branch 'soapbox/develop' into rss-button 2023-02-07 22:24:15 +01:00
Alex Gleason
0631657278
ProfileDropdown: enforce a max width 2023-02-07 12:02:37 -06:00
49a7d40efb Fix filters, restyle filters page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-07 15:38:31 +01:00
Alex Gleason
dc597ac765
Add useClickOutside hook for Floating UI elements 2023-02-06 17:17:12 -06:00
Alex Gleason
ec7f9b9950
ProfileDropdown: fix hover styles for menu items with action 2023-02-06 17:00:25 -06:00
Alex Gleason
53a930c75c
ProfileDropdown: dismiss when clicked outside 2023-02-06 16:53:56 -06:00
bfe1401a34 Fix imports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 23:48:44 +01:00
Alex Gleason
7f6b19aa4a
ProfileDropdown: refactor with Floating UI 2023-02-06 16:33:08 -06:00
Alex Gleason
d44be7fbf8 Merge branch 'chat-composer' into 'develop'
Chats: move chat attachments into composer

See merge request soapbox-pub/soapbox!2229
2023-02-06 21:05:42 +00:00
marcin mikołajczak
d62290f020 Merge branch 'events' into 'develop'
Add NewEventPanel to events list page

See merge request soapbox-pub/soapbox!2255
2023-02-06 20:53:49 +00:00
Alex Gleason
e3f168f050
Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-06 14:25:37 -06:00
4721452986 Merge remote-tracking branch 'soapbox/develop' into cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 20:31:20 +01:00
c56728b722 classNames() ==> clsx()
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 20:28:18 +01:00
Alex Gleason
e5f90e4733 Merge branch 'clsx' into 'develop'
classNames() --> clsx(), lint

See merge request soapbox-pub/soapbox!2259
2023-02-06 19:15:43 +00:00
Alex Gleason
785612691a
yarn lint:js --fix 2023-02-06 12:06:44 -06:00
Alex Gleason
701215d7bc
classNames() --> clsx() 2023-02-06 12:05:19 -06:00
Alex Gleason
89d55b1b70
ChatComposer: shrink "x" icon, fix pending upload jump 2023-02-06 11:30:36 -06:00
49ba4c7a9d Fixes, styles improvements, cleanup, enforce classes order for classNames
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 18:18:49 +01:00
Chewbacca
81d7d3a7a4 Merge branch 'develop' into 'improve-logo-alignment'
# Conflicts:
#   app/soapbox/features/ui/components/navbar.tsx
2023-02-06 15:38:14 +00:00
b529ec8a07 Add NewEventPanel to events list page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-05 23:14:21 +01:00
Alex Gleason
25277b0b73
Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-03 12:03:45 -06:00
Alex Gleason
0ee8c8eba1 Merge branch 'tailwind-order' into 'develop'
Tailwind order

Closes #1349

See merge request soapbox-pub/soapbox!2244
2023-02-03 16:38:28 +00:00
Chewbacca
dadeb43c74 Improve navbar alignment 2023-02-03 11:01:25 -05:00
Alex Gleason
4c025bb2bc
Refactor ProgressBar 2023-02-02 18:03:22 -06:00