Commit Graph

3301 Commits

Author SHA1 Message Date
04ae0f2ee4 ChatMessage: remove testid from emoji button resulting in failing test 2023-02-13 14:46:15 -06:00
45657c7a2a EmojiSelector: pass offset as a prop 2023-02-13 13:17:05 -06:00
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
cc2eafdfac Merge remote-tracking branch 'origin/develop' into react-any-emoji 2023-02-12 20:30:33 -06:00
16179a6371 Transpile emoji-mart for jest 2023-02-12 20:23:29 -06:00
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
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
f46086d52a Cleanup a few things 2023-02-10 14:43:41 -05:00
60d7ff8395 Re-build dropdown-menu using FloatingUI 2023-02-10 13:17:39 -05:00
17684571af Update hoverable menu on Chat Messages 2023-02-09 12:42:00 -05:00
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
3ca491c03f classNames -> clsx 2023-02-08 14:06:41 -05:00
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
49a7d40efb Fix filters, restyle filters page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-07 15:38:31 +01:00
bfe1401a34 Fix imports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 23:48:44 +01:00
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
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
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
e5f90e4733 Merge branch 'clsx' into 'develop'
classNames() --> clsx(), lint

See merge request soapbox-pub/soapbox!2259
2023-02-06 19:15:43 +00:00
785612691a yarn lint:js --fix 2023-02-06 12:06:44 -06:00
701215d7bc classNames() --> clsx() 2023-02-06 12:05:19 -06:00
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
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
25277b0b73 Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-03 12:03:45 -06:00
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
dadeb43c74 Improve navbar alignment 2023-02-03 11:01:25 -05:00
4c025bb2bc Refactor ProgressBar 2023-02-02 18:03:22 -06:00
e203e0d0d2 Chats: move uploading progress into the composer text box 2023-02-02 17:37:37 -06:00
6b1882d7a9 Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-02 15:19:54 -06:00
1b8d118217 Chats: support displaying multiple attachments 2023-02-02 14:43:47 -06:00
7fe4b34e6f Add type-aware UploadPreview component, fix ChatComposer bg on dark mode 2023-02-02 14:20:40 -06:00
ec634f4fa1 ChatUpload: allow clicking upload to view in modal 2023-02-02 13:54:36 -06:00
cb715f4f05 ChatUpload: ensure X icon is always white 2023-02-02 13:33:18 -06:00
747868edb3 ChatTextarea: fix focus border and ring styles 2023-02-02 13:27:38 -06:00
ea8561ca19 ChatUpload: add blurhash 2023-02-02 13:06:27 -06:00
01aef5e89e Remove withDismiss prop from status, update CHANGELOG 2023-02-02 12:06:39 -06:00
0d99ae5daa yarn lint:js --fix 2023-02-01 16:13:42 -06:00
382bc6732d Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-01 15:28:33 -06:00
db15858b9f Merge remote-tracking branch 'soapbox/develop' into rss-button
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-30 23:16:25 +01:00
cfd3ea9467 Merge branch 'status-font-size' into 'develop'
Increase font size of focused status in threads

See merge request soapbox-pub/soapbox!2232
2023-01-30 19:53:24 +00:00
747cc8c5b9 StatusContent: size --> textSize 2023-01-30 13:38:29 -06:00
352382cd05 Use Grid + Aspect to size MediaItem 2023-01-30 12:17:06 -06:00