Commit graph

7272 commits

Author SHA1 Message Date
marcin mikołajczak
0d278ffc53 Merge branch 'report-modal-previous' into 'develop'
Show 'previous' button in report modal

See merge request soapbox-pub/soapbox!1961
2022-11-28 15:06:29 +00:00
Chewbacca
50f5e2af38 Merge remote-tracking branch 'origin/develop' into chats 2022-11-28 10:03:40 -05:00
Chewbacca
4b036abefe Merge branch 'redesign-interaction-bar' into 'develop'
Redesign interaction bar

See merge request soapbox-pub/soapbox!1913
2022-11-28 14:40:17 +00:00
Chewbacca
ca0aae8e9b Merge branch 'improve-in-review-statuses' into 'develop'
Add dropdown-menu to SensitiveContentOverlay to allow status deletion

See merge request soapbox-pub/soapbox!1963
2022-11-28 14:31:23 +00:00
Chewbacca
7cce9812ef Add dropdown-menu to SensitiveContentOverlay to allow status deletion 2022-11-28 09:05:13 -05:00
Alex Gleason
84edb651ad
Allow disabling feed injection 2022-11-27 21:05:39 -06:00
6fb8290444 EventCarousel: Do not show placeholder if already has results
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-28 00:46:32 +01:00
5d1921b2cc styles fix
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-28 00:28:15 +01:00
Alex Gleason
3a489f98d2 Merge branch 'use-instance' into 'develop'
Add useInstance() hook

See merge request soapbox-pub/soapbox!1946
2022-11-27 23:18:43 +00:00
4a96507cd1 Show 'previous' button in report modal
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-28 00:08:27 +01:00
7c1726c665 update test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-27 23:52:12 +01:00
Alex Gleason
ed573bfeb2
Merge remote-tracking branch 'origin/develop' into use-instance 2022-11-27 16:42:06 -06:00
9ba56a3945 Merge remote-tracking branch 'soapbox/develop' into events 2022-11-27 23:33:51 +01:00
6465423ccb Cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-27 23:33:44 +01:00
Alex Gleason
6697e0191b
Fix crash against Pleroma (make latest_read_message_by_account an optional param) 2022-11-27 15:34:43 -06:00
Alex Gleason
5bb30b6282
Merge remote-tracking branch 'origin/develop' into chats 2022-11-27 15:30:00 -06:00
Alex Gleason
429b40aa6d Merge branch 'hide-md-images' into 'develop'
Hide Markdown images

Closes #1171

See merge request soapbox-pub/soapbox!1956
2022-11-27 21:17:32 +00:00
Alex Gleason
b556166efa
StatusInteractionBar: combine likes and reactions again 2022-11-27 15:10:10 -06:00
Alex Gleason
33dc2f1a02
Merge remote-tracking branch 'origin/develop' into redesign-interaction-bar 2022-11-27 15:05:49 -06:00
Alex Gleason
946545f869
Admin Report: fix report flowing off screen on mobile 2022-11-27 13:33:41 -06:00
Alex Gleason
92053cefb0
Admin Report: use better icons for 'deactivate' and 'delete' 2022-11-27 13:23:43 -06:00
Alex Gleason
5ef9a93371
Admin Reports: restyle with Tailwind 2022-11-27 13:12:40 -06:00
Alex Gleason
c483a60ef1 Merge branch 'fix-feed-carousel' into 'develop'
Fix feed carousel (overflow-hidden)

See merge request soapbox-pub/soapbox!1957
2022-11-27 18:10:31 +00:00
Alex Gleason
0d0ee2b41a
Fix feed carousel (overflow-hidden) 2022-11-27 11:54:19 -06:00
Alex Gleason
a2a445691f
Hide Markdown images 2022-11-26 17:05:19 -06:00
Alex Gleason
8a30454be2 Merge branch 'emoji-selector-wrap' into 'develop'
Wrap the emoji selector on smaller screens

Closes #1161

See merge request soapbox-pub/soapbox!1947
2022-11-26 22:58:49 +00:00
Alex Gleason
67cd7ed07a Merge branch 'quote-mention-fix' into 'develop'
Mention the author when quote-posting them

Closes #1202

See merge request soapbox-pub/soapbox!1954
2022-11-26 22:58:38 +00:00
Alex Gleason
d61e115804 Merge branch 'profile-fields-mobile' into 'develop'
Display custom profile fields on mobile

Closes #1160

See merge request soapbox-pub/soapbox!1955
2022-11-26 22:58:28 +00:00
marcin mikołajczak
78779a814f Merge branch 'chats-styles' into 'develop'
Improve chats styles and chat placeholder

See merge request soapbox-pub/soapbox!1951
2022-11-26 22:44:26 +00:00
c61dcddd81 Events page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-26 22:15:58 +01:00
Alex Gleason
2d97ae399a Merge branch 'remote-timeline-styles' into 'develop'
Remote timeline styles

Closes #1182

See merge request soapbox-pub/soapbox!1952
2022-11-26 20:45:31 +00:00
Alex Gleason
433757a9d1 Merge branch 'messages-styles' into 'develop'
Improve direct timeline styles

See merge request soapbox-pub/soapbox!1949
2022-11-26 20:45:17 +00:00
Alex Gleason
8c55af5b5e
Display custom profile fields on mobile
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1160
2022-11-26 14:36:09 -06:00
Alex Gleason
e114b1d362
Break ProfileField out into its own file 2022-11-26 14:25:22 -06:00
Alex Gleason
50ead4f16e
Mention the author when quote-posting them
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1202
2022-11-26 14:12:50 -06:00
Alex Gleason
0be017ea78 Merge branch 'fix-datepicker' into 'develop'
Fix scheduled post datepicker being cut off

Closes #1213

See merge request soapbox-pub/soapbox!1953
2022-11-26 19:59:33 +00:00
Alex Gleason
fa8e821c1e
Fix scheduled post datepicker being cut off
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1213
2022-11-26 13:47:04 -06:00
Alex Gleason
3b1eaaddfc
Redesign EditFederationModal 2022-11-26 13:28:51 -06:00
859d93b289 Merge remote-tracking branch 'soapbox/develop' into events-
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-26 20:25:48 +01:00
Alex Gleason
8c7dc570a6 Merge branch 'features-rebased' into 'develop'
Features: SOAPBOX --> REBASED

See merge request soapbox-pub/soapbox!1950
2022-11-26 19:25:12 +00:00
Alex Gleason
bbb41533b7
RemoteTimeline: improve styles, icons 2022-11-26 13:18:11 -06:00
91103fe400 Events route
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-26 20:13:14 +01:00
b8542c619d Improve chats styles and chat placeholder
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-26 20:03:17 +01:00
Alex Gleason
de2186babf
Features: SOAPBOX --> REBASED 2022-11-26 12:48:33 -06:00
Alex Gleason
1470de587a
Improve direct timeline styles 2022-11-26 12:44:56 -06:00
Alex Gleason
7a3d027ccc Merge branch 'develop' into 'develop'
German translations

See merge request soapbox-pub/soapbox!1948
2022-11-26 17:19:49 +00:00
forenta
c605dbe494 Update de.json 2022-11-26 17:11:11 +00:00
forenta
c9e9c9e071 Update german translation 2022-11-26 17:09:56 +00:00
Alex Gleason
596653ee1e
Wrap the emoji selector on smaller screens 2022-11-26 11:02:50 -06:00
Alex Gleason
42aff1ca29
Merge remote-tracking branch 'origin/develop' into use-instance 2022-11-26 10:45:13 -06:00