Commit graph

3274 commits

Author SHA1 Message Date
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
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
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
Alex Gleason
e203e0d0d2
Chats: move uploading progress into the composer text box 2023-02-02 17:37:37 -06:00
Alex Gleason
6b1882d7a9
Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-02 15:19:54 -06:00
Alex Gleason
1b8d118217
Chats: support displaying multiple attachments 2023-02-02 14:43:47 -06:00
Alex Gleason
7fe4b34e6f
Add type-aware UploadPreview component, fix ChatComposer bg on dark mode 2023-02-02 14:20:40 -06:00
Alex Gleason
ec634f4fa1
ChatUpload: allow clicking upload to view in modal 2023-02-02 13:54:36 -06:00
Alex Gleason
cb715f4f05
ChatUpload: ensure X icon is always white 2023-02-02 13:33:18 -06:00
Alex Gleason
747868edb3
ChatTextarea: fix focus border and ring styles 2023-02-02 13:27:38 -06:00
Alex Gleason
ea8561ca19
ChatUpload: add blurhash 2023-02-02 13:06:27 -06:00
Alex Gleason
01aef5e89e
Remove withDismiss prop from status, update CHANGELOG 2023-02-02 12:06:39 -06:00
Alex Gleason
0d99ae5daa
yarn lint:js --fix 2023-02-01 16:13:42 -06:00
Alex Gleason
382bc6732d
Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-01 15:28:33 -06:00
Alex Gleason
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
Alex Gleason
747cc8c5b9
StatusContent: size --> textSize 2023-01-30 13:38:29 -06:00
Chewbacca
352382cd05
Use Grid + Aspect to size MediaItem 2023-01-30 12:17:06 -06:00
Alex Gleason
d64b8d9b16
Merge remote-tracking branch 'origin/develop' into accounts-scss 2023-01-30 12:14:51 -06:00
bb4aac4c65 Switch back to using account-container in notification list
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-29 23:11:52 +01:00
1f39ddf0ec Merge remote-tracking branch 'soapbox/develop' into mastodon-groups
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-27 23:07:26 +01:00
Alex Gleason
1169149b83
Increase font size of focused status in threads 2023-01-27 12:36:49 -06:00
Alex Gleason
7b32373694
Move chat attachments into composer 2023-01-26 12:30:26 -06:00
69b597d119 Add 'Repost event' to menu
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-25 23:16:03 +01:00
Alex Gleason
382e464390
Move chat attachments into the chat composer 2023-01-25 15:45:33 -06:00
Alex Gleason
eb54e5c15c Merge branch 'polyfills' into 'develop'
Increase compatibility with older browsers

See merge request soapbox-pub/soapbox!2221
2023-01-24 18:48:24 +00:00
Alex Gleason
ad6d03b4eb
Make OAuth tokens API more resilient 2023-01-24 12:00:34 -06:00
Alex Gleason
70de5aea0f
Increase janky test timeout even more >:( 2023-01-23 17:53:06 -06:00
88e2c011a1 i18n: handle plurals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-24 00:08:51 +01:00
Alex Gleason
ce01b93a70
Replace occurrences of fetch() with axios 2023-01-23 16:09:45 -06:00
901861d5b8 Fix #1330
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-22 23:29:44 +01:00
Alex Gleason
fa86d1d5dd Merge branch 'i-1263' into 'develop'
transatable staff badges inside profile

Closes #1263

See merge request soapbox-pub/soapbox!2207
2023-01-21 16:15:17 +00:00
Tassoman
cf677a610b transatable staff badges inside profile 2023-01-21 16:15:17 +00:00
Alex Gleason
e2a4bfc632
Chats: fix bubble corner for other person's message 2023-01-20 13:08:10 -06:00
Alex Gleason
58cf71ceda
ChatMessageList: fix regression with links not wrapping 2023-01-20 11:56:50 -06:00
Alex Gleason
ec0a3d6eea
Chats: actually, do use a paperclip 2023-01-20 11:53:10 -06:00
Alex Gleason
af1ad92432
Chats: use plus icon to upload attachment 2023-01-20 11:29:40 -06:00
Alex Gleason
f222491b3e
ChatMessageList: sharpen top-right corner of bubble when there's an attachment 2023-01-20 11:13:54 -06:00
Alex Gleason
bab64a98af
Merge remote-tracking branch 'origin/develop' into improve-chat-media 2023-01-20 10:14:22 -06:00
afd4a39337 Friendica, version parsing fixes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-19 00:15:32 +01:00
marcin mikołajczak
e41b35bfdc Merge branch 'compose-improvements' into 'develop'
Minor composer improvements

See merge request soapbox-pub/soapbox!2181
2023-01-18 06:48:22 +00:00