miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność
7 674 Commity
176 Gałęzie
14 Tagi
48 MiB
Wykres commitów

5878 Commity (cfd5c1e927f8bc34b54802d0efa1cd40e1a20fa1)

Autor SHA1 Wiadomość Data
marcin mikołajczak bcf82e4312 Merge remote-tracking branch 'soapbox/develop' into modals-fix 2022-12-22 19:52:40 +01:00
Chewbacca 51146574d4 Fix tests 2022-12-22 12:02:17 -05:00
Chewbacca b6afb8ae01 Add support for pinning an avatar in the Carousel 2022-12-22 11:23:18 -05:00
Chewbacca a9e05859d1 Merge branch 'improve-toasts' into 'develop' 
Introduce Toast module as Snackbar replacement

See merge request soapbox-pub/soapbox!2023
 2022-12-21 19:47:35 +00:00
Chewbacca 8d28c37a7f Merge branch 'tab-continuation' into 'develop' 
Allow tab continuation on Email confirmation

See merge request soapbox-pub/soapbox!1847
 2022-12-21 19:26:52 +00:00
Chewbacca a3c7164147 Move Toast to components/ui 2022-12-21 14:14:31 -05:00
Chewbacca 90fcc8ad05 Fix tests 2022-12-20 17:45:29 -05:00
Chewbacca 3dceaacc16 Improve UI of toast 2022-12-20 17:12:17 -05:00
Chewbacca bffe5318a9 Fix tests 2022-12-20 13:14:38 -05:00
Chewbacca f504d17abe Remove usage of 'snackbar' 2022-12-20 12:46:06 -05:00
Chewbacca 3c38a57560 Convert 'show' usage to Toast 2022-12-20 12:46:06 -05:00
Chewbacca 642d1d8b3e Convert 'info' usage to Toast 2022-12-20 12:46:06 -05:00
Chewbacca b348ca71b9 Convert 'error' usage to Toast 2022-12-20 12:46:06 -05:00
Chewbacca b7d0b4abe8 Convert 'success' usage to Toast 2022-12-20 12:46:06 -05:00
Chewbacca 01eccc897b Introduce new Toast module 2022-12-20 12:46:03 -05:00
Chewbacca 397d79f73f Fix overflow issue on mobile 2022-12-19 10:33:37 -05:00
Alex Gleason 6b5c214b9a Merge branch 'dm-fixes' into 'develop' 
Small chats fixes

Closes #1258

See merge request soapbox-pub/soapbox!2018
 2022-12-19 00:04:32 +00:00
Alex Gleason 6825082475
README: clean up copyright, move sounds licenses to a separate file 2022-12-18 17:14:34 -06:00
Alex Gleason 26cb4b1029
Hide button to chat with yourself 
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1258
 2022-12-18 12:58:19 -06:00
Alex Gleason f955691d01
Settings: Messages --> Chats, reword follow criteria 2022-12-18 12:56:35 -06:00
Alex Gleason fed6a7aa51
Fix demo mode 2022-12-18 12:29:31 -06:00
Alex Gleason 34ebe9bd57
ThemeEditor: improve layout, improve color of slider 2022-12-17 21:25:20 -06:00
Alex Gleason b71bb3966a
ThemeEditor: configure single-color items 2022-12-17 21:13:30 -06:00
Alex Gleason ab70af31cd
ThemeEditor: restore default theme 2022-12-17 20:48:02 -06:00
Alex Gleason 716cc311c7
ThemeEditor: allow importing a theme 2022-12-17 20:36:54 -06:00
Alex Gleason c624fbcba3
ThemeEditor: allow exporting a theme 2022-12-17 20:16:05 -06:00
Alex Gleason b15871aaa8
utils/download: take a string instead of AxiosResponse 2022-12-17 20:15:40 -06:00
Alex Gleason 69a9748b3d
ThemeEditor: allow resetting the theme 
(that was harder than I expected)
 2022-12-17 19:39:54 -06:00
Alex Gleason 2505f622e2
ThemeEditor: add hue sliders 2022-12-17 19:02:02 -06:00
Alex Gleason faf513c049
Add Slider component (based on video volume slider) 2022-12-17 18:31:56 -06:00
Alex Gleason 8a14dfefe7
Merge remote-tracking branch 'origin/develop' into theme-editor 2022-12-17 17:57:43 -06:00
Alex Gleason 8f78336a4b
Dashboard: include link to repo for the current commit 2022-12-17 16:14:57 -06:00
Alex Gleason dc7aea6466
Admin: restyle unapproved account, delete admin.scss 2022-12-17 15:48:45 -06:00
Alex Gleason 6c232d70a8
Admin: improve design of Moderation Logs 2022-12-17 15:23:18 -06:00
Alex Gleason 60f54f80b0
Dashboard: add quick links to Soapbox Config and Moderation Log 2022-12-17 15:08:59 -06:00
Alex Gleason 4fde647aa8
Admin: redesign registration picker 2022-12-17 14:53:21 -06:00
Alex Gleason 52bdb48bfb
Admin: refactor email list downloads into List, get rid of .dashwidget css 2022-12-17 14:23:52 -06:00
Alex Gleason ee443158b6
Admin: refactor counters with DashCounter component 2022-12-17 14:04:37 -06:00
Alex Gleason 819e03073b
SoapboxConfig: link to theme editor 2022-12-17 13:10:59 -06:00
Alex Gleason f906558dba
Theme editor: allow saving theme 2022-12-17 13:05:50 -06:00
Alex Gleason ed12246ae4
Remove unused sea-blue color 2022-12-17 11:47:18 -06:00
Alex Gleason 63ee2ba2ba
Bundle: componentWillReceiveProps --> UNSAFE_componentWillReceiveProps 2022-12-17 11:01:43 -06:00
Alex Gleason 62accd5559
Fix import paths 2022-12-16 19:22:59 -06:00
Alex Gleason 48bd830349
Merge remote-tracking branch 'origin/develop' into theme-editor 2022-12-16 18:39:20 -06:00
Alex Gleason e24a62d203 Merge branch 'delete-locale-data' into 'develop' 
Delete custom locale-data

See merge request soapbox-pub/soapbox!2007
 2022-12-16 23:04:59 +00:00
Alex Gleason 3590b75b6b
InteractionCounter: use shortNumberFormat 2022-12-15 18:40:21 -06:00
Alex Gleason 64a2566ddb
Delete custom locale-data 2022-12-15 14:57:19 -06:00
marcin mikołajczak e8d6c7d4b6 Merge branch 'profile-header' into 'develop' 
Default header should not be clickable

See merge request soapbox-pub/soapbox!1994
 2022-12-15 11:52:16 +00:00
Alex Gleason 71bad449a4 Merge branch 'gate-events' into 'develop' 
Feature-gate event routes

See merge request soapbox-pub/soapbox!2005
 2022-12-15 02:06:20 +00:00
Tassoman d3e9b283eb Feeding hide network checkbox 2022-12-15 00:52:56 +00:00
Alex Gleason 7ae1b197d5
Feature-gate event routes 2022-12-14 17:38:57 -06:00
marcin mikołajczak 1bc30cb694 Update Polish translation 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-15 00:37:12 +01:00
Alex Gleason 7138bec3b0
Merge remote-tracking branch 'origin/develop' into fix-avatar-ring 2022-12-14 14:41:14 -06:00
Alex Gleason 5499696915
EditProfile: move profile preview (avatar/banner) to the top 2022-12-14 13:53:59 -06:00
Alex Gleason 450119da99 Merge branch 'issue/1262' into 'develop' 
file fields inverted position

Closes #1262

See merge request soapbox-pub/soapbox!1990
 2022-12-14 19:50:50 +00:00
Alex Gleason b5f829cdb3
Carousel: add mock for seen API 2022-12-14 13:28:41 -06:00
Alex Gleason e2b6a7af84
Carousel: don't set unseen unless it's explicitly `false` (backwards-compat) 2022-12-14 13:23:11 -06:00
Alex Gleason 8f3c0a1071
Carousel: make `seen` optional, only hit the API if features.carouselSeen is supported 2022-12-14 13:06:41 -06:00
Alex Gleason 30abdab924
features.feedUserFiltering --> features.carousel 2022-12-14 12:54:42 -06:00
Chewbacca 113de75355 Merge branch 'fix-centering-of-compose-form' into 'develop' 
Add spacing above textarea

See merge request soapbox-pub/soapbox!2000
 2022-12-14 18:37:35 +00:00
Chewbacca fa4bd20d11 Merge branch 'carousel-v2' into 'develop' 
Support 'seen' property in the Feed Carousel

See merge request soapbox-pub/soapbox!1978
 2022-12-14 18:36:50 +00:00
Alex Gleason 15b9e0e355
HomePage: shift the ComposeForm with translate-y instead of pt 2022-12-14 12:04:59 -06:00
Chewbacca 07d24c91d8 Allow tab continuation on Email confirmation 2022-12-14 12:59:21 -05:00
Alex Gleason 55cf6d6041
Merge remote-tracking branch 'origin/develop' into fix-centering-of-compose-form 2022-12-14 11:41:05 -06:00
Chewbacca c54b50c562 Add spacing above textarea 2022-12-14 12:26:44 -05:00
Alex Gleason eef7fdb78e
Markup: use whitespace-pre-wrap (fix multiline bios on Mastodon) 2022-12-14 11:01:09 -06:00
Alex Gleason 463504346c
Add Inter 600, fix ChatPaneHeader font weight 2022-12-14 10:12:24 -06:00
Alex Gleason 5418e49234 Merge branch 'chat-fixes' into 'develop' 
Push chat to top of the list after sending a message

See merge request soapbox-pub/soapbox!1997
 2022-12-14 13:59:58 +00:00
Chewbacca 4204b48a40 Remove mocks 2022-12-14 08:44:04 -05:00
Alex Gleason 8f99d549f0 Merge branch 'ita-patch1' into 'develop' 
ita mobile patch

See merge request soapbox-pub/soapbox!1985
 2022-12-14 03:44:40 +00:00
Tassoman 2adf8f1886 ita mobile patch 2022-12-14 03:44:40 +00:00
Alex Gleason 5de1c3a61d
Revert flattenPages order changes 2022-12-13 15:17:58 -06:00
Chewbacca b3a0f785d8
Fix sorting of Chat List 2022-12-13 15:08:25 -06:00
Chewbacca 8aa171fede
Re-order chat-list after sending messaging 2022-12-13 15:07:13 -06:00
Chewbacca f0a057d685
Reduce size of timestamp 2022-12-13 10:48:12 -06:00
Chewbacca 84d0717f44 Fix avatar ring 2022-12-13 11:46:07 -05:00
marcin mikołajczak 6900b59697 Move isDefaultHeader and isDefaultAvatar to utils/accounts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-13 00:09:00 +01:00
marcin mikołajczak 761061c9a8 Default header should not be clickable 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-13 00:00:13 +01:00
Alex Gleason 90513f1807 Merge branch 'chat-search-pagination' into 'develop' 
Improve Chats search

See merge request soapbox-pub/soapbox!1993
 2022-12-12 19:27:17 +00:00
Chewbacca 61cd1d2227
Fix expiration values 2022-12-12 12:13:41 -06:00
Chewbacca e8427b3081
Remove 2 minute expiration 2022-12-12 12:13:32 -06:00
Chewbacca af19c1bd44
Fix spacing bug 2022-12-12 12:12:06 -06:00
Alex Gleason 502f9d9f47
queries/search: use flattenPages util 2022-12-12 12:10:39 -06:00
Chewbacca 15594df644
Fix tests 2022-12-12 12:01:10 -06:00
Chewbacca 6bae81a758
Reduce size of ellipsis icon 2022-12-12 12:01:04 -06:00
Chewbacca 9657598d33
Remove unneeded code from AccountSearch 2022-12-12 12:00:53 -06:00
Chewbacca 5a30509fa6
Add support for pagination in Chat Search 2022-12-12 11:59:37 -06:00
marcin mikołajczak 2f2ae8237d Support source_languages and target_languages 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-10 23:16:06 +01:00
tassoman 6c00d4e0e1 file fields inverted position 2022-12-10 18:55:04 +01:00
marcin mikołajczak 24b5f0bf28 ComposeEventModal: Set is_uploading to false after successsfully uploading banner 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-09 19:54:25 +01:00
marcin mikołajczak aea7016123 this wasn't meant to be merged 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-09 17:07:38 +01:00
Alex Gleason 889d598027
Enable Chats deletion for Rebased 2022-12-08 19:48:34 -06:00
Tassoman Pigi 321e347b32 small ita patch 2022-12-09 00:24:00 +00:00
marcin mikołajczak 24b790c2d1 Set tile server to empty by default 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-08 16:45:33 +01:00
marcin mikołajczak 47b8f5fe64 Specify description format as markdown 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-08 16:40:14 +01:00
marcin mikołajczak 2137193935 Revert "Remove 'show on map' for now" 
This reverts commit 46cb676822.
 2022-12-08 16:30:48 +01:00
marcin mikołajczak 41746b84d9 Merge branch 'events' into 'develop' 
Show Unauthorized modal for 'X people going'

See merge request soapbox-pub/soapbox!1979
 2022-12-08 14:28:13 +00:00
Alex Gleason 0fd931aa6e Merge branch 'it-develop' into 'develop' 
italian translation

See merge request soapbox-pub/soapbox!1980
 2022-12-07 23:19:33 +00:00
Tassoman Pigi 10a1a3b74e italian translation 2022-12-07 23:19:33 +00:00
Alex Gleason 3acc95447f
Fix order of optimistic chat messages 2022-12-07 16:18:17 -06:00
Alex Gleason dad6244c7d
Chats: remove language around followers 2022-12-07 15:56:22 -06:00
Alex Gleason d6d327c760
Helmet: add unread chats count 2022-12-07 15:56:22 -06:00
Alex Gleason dc556248f0
private --> direct 2022-12-07 15:56:22 -06:00
Alex Gleason b42b8fced4
Chats: fix mention styling 2022-12-07 15:56:17 -06:00
Alex Gleason 8b013cbf1c
Chats: fix message from profile button 2022-12-07 08:25:56 -06:00
Alex Gleason df3a64a4af
Chats: simplify Welcome screen 2022-12-07 08:14:22 -06:00
Alex Gleason fbd2471dc6
Move StatProvider above UI, increment chats unread counter from streaming events 2022-12-07 00:45:10 -06:00
Alex Gleason d811500812
Chats: enable autocomplete 2022-12-07 00:18:47 -06:00
Alex Gleason d4419bf71f
Chats: hide read receipts for unsupported servers 2022-12-06 22:32:35 -06:00
Alex Gleason 2986f00728
appendPageItem: fix order 2022-12-06 22:30:03 -06:00
Alex Gleason ef4e738625
Load chats even on small screen sizes 2022-12-06 22:22:25 -06:00
Alex Gleason 2ffce5b68f
Chats: delete failing tests 2022-12-06 17:44:50 -06:00
Alex Gleason acc2da252f
Chats: allow toggling sound 2022-12-06 17:24:24 -06:00
Alex Gleason ac4ffaa41f
Streaming: play chat sounds if enabled 2022-12-06 17:19:09 -06:00
Alex Gleason 6c22a3841b
ChatPaneHeader: i18n title 2022-12-06 17:10:16 -06:00
Alex Gleason e1edc9796b
Make .compose-form__upload more widely available 2022-12-06 17:08:00 -06:00
Alex Gleason 6a27670271
Break composer upload into a generic component 2022-12-06 17:01:06 -06:00
Alex Gleason 5b1de5da8c
Chats: improve uploading progress bar styles 2022-12-06 16:39:37 -06:00
Alex Gleason 9e39415ca8
Chats: gate upload button behind `chatsMedia` feature flag 2022-12-06 16:36:30 -06:00
Alex Gleason 4c5e8eb525
Chats: improve upload button styles 2022-12-06 16:33:53 -06:00
Alex Gleason dc420a843b
Chats: fix submitting an attachment 2022-12-06 16:27:07 -06:00
Alex Gleason 6eafb8c0c3
Chats: start making attachments work again 2022-12-06 16:21:00 -06:00
Alex Gleason 2ca4db5c3b
Chats: fix display of media attachments, fix break-words 2022-12-06 15:45:33 -06:00
marcin mikołajczak 3855d966af Add 'View event on {domain}' 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-06 22:33:17 +01:00
Alex Gleason e1c80920ed
Enable chatsv2 on TruthSocial 2022-12-06 15:25:40 -06:00
Alex Gleason 3aff4ee715
Replace proprietary send icon with Tabler 2022-12-06 15:20:48 -06:00
marcin mikołajczak 39b9cf4eed Show Unauthorized modal for 'X people going' 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-06 22:17:23 +01:00
Alex Gleason cad1d9071a
Restore "chats" name and icon 2022-12-06 15:16:36 -06:00
Alex Gleason 30646ec8c3
Fix pagination of chat messages 2022-12-06 15:12:24 -06:00
Chewbacca 994d58294a Support 'seen' property in the Feed Carousel 2022-12-06 16:00:56 -05:00
Alex Gleason f7bd5c5951
deduplicateById: fix Entity types 2022-12-06 14:48:41 -06:00
Alex Gleason 569296af36
Merge branch 'chats-pleroma' into chats 2022-12-06 14:36:38 -06:00
Chewbacca 717c21a2e3 Switch X for Check 2022-12-06 13:50:03 -05:00
Alex Gleason 2d9c73cf9e
EventHeader: fix initReport() calls 2022-12-06 12:21:25 -06:00
Alex Gleason 2cedd69f1d
Merge remote-tracking branch 'origin/develop' into chats 2022-12-06 11:53:47 -06:00
marcin mikołajczak d4a9e1f139 Merge remote-tracking branch 'soapbox/develop' into events 2022-12-06 16:18:51 +01:00
marcin mikołajczak ee8a424d28 lint 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-06 16:18:42 +01:00
Alex Gleason cb7f0aeab8
Chats: deduplicate items 2022-12-05 18:38:32 -06:00
Alex Gleason cfc0c855e8 Merge branch 'emojis-clipped' into 'develop' 
Improve display of emojis

See merge request soapbox-pub/soapbox!1971
 2022-12-06 00:18:14 +00:00
Chewbacca a73ade90c1 Change websocket event name 2022-12-05 15:41:06 -05:00
Chewbacca 0bed4d5f31 Update copy 2022-12-05 15:04:45 -05:00
Chewbacca 5e47a2567f Revert "Replace 'send' icon from Tabler" 
This reverts commit d5303387f5.
 2022-12-05 13:09:23 -05:00
Chewbacca d5303387f5 Replace 'send' icon from Tabler 2022-12-05 08:45:20 -05:00
Chewbacca 9cc9e8876b Fix infinite pagination of chats 2022-12-05 08:41:26 -05:00
Alex Gleason 6154e4bac4
Rotate arrows for RTL 2022-12-04 19:40:09 -06:00
Alex Gleason 4a48e9d510
Merge remote-tracking branch 'origin/develop' into chats 2022-12-04 19:27:54 -06:00
marcin mikołajczak 103ff2b2c0 Merge remote-tracking branch 'soapbox/develop' into events 2022-12-04 12:34:15 +01:00
marcin mikołajczak 6317930b30 Document events endpoints 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-04 12:34:09 +01:00
marcin mikołajczak c531c26078 maybe fix links in modals 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-03 20:49:43 +01:00
Ahmad Dakhlallah e76fcf7929 Fix Arabic menu popup in RTL. 2022-12-03 18:22:25 +02:00
Ahmad Dakhlallah 952317708f Fix menu-popover in RTL 2022-12-03 17:25:40 +02:00
Ahmad Dakhlallah f7fdbca698 Fix Arabic translation 2022-12-03 17:21:19 +02:00
marcin mikołajczak 10eaf60fe9 Merge remote-tracking branch 'soapbox/develop' into HEAD 2022-12-02 23:17:50 +01:00
marcin mikołajczak 46cb676822 Remove 'show on map' for now 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-02 23:16:11 +01:00
Chewbacca 5816659a09 Refactor chat functions 2022-12-02 15:50:54 -05:00
Alex Gleason 6f21905a8b
Improve display of emojis 2022-12-02 14:15:59 -06:00
Chewbacca b5aca1649d Remove unused 'initReportById' function 2022-12-02 09:03:08 -05:00
Chewbacca 8df7d9c9ef UX improvements to message bubble 2022-12-02 08:28:51 -05:00
Chewbacca d875c1c3e8 Fix tests 2022-12-01 13:08:05 -05:00
Chewbacca 67a61ad3b4 Search on focus 2022-12-01 12:40:30 -05:00
marcin mikołajczak 3051c4f854 Merge branch 'fix-code-font' into 'develop' 
Use monospace font for code, pre

See merge request soapbox-pub/soapbox!1969
 2022-12-01 14:43:53 +00:00
marcin mikołajczak e0b41badd3 Use monospace font for code, pre 2022-12-01 13:17:46 +00:00
Alex Gleason 69d64c11b4
Fix spacing of ColumnHeader on Local/Federated timelines 2022-11-30 21:45:49 -06:00
Alex Gleason ae5e4c05f6
ColumnHeader: remove `transparent` prop, pass className from Column instead 2022-11-30 21:45:31 -06:00
marcin mikołajczak ea4f7a7332 Merge remote-tracking branch 'soapbox/develop' into events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 23:39:49 +01:00
marcin mikołajczak 0481e528af Add events to sidebar 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 22:59:37 +01:00
Alex Gleason 31444756e4
Merge remote-tracking branch 'origin/develop' into chats 2022-11-30 12:46:24 -06:00
marcin mikołajczak 403bcba525 Compose event modal improvements 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 19:32:35 +01:00
Alex Gleason f93f4c9a8b
ColumnHeader: remove unused `children` prop 2022-11-30 11:38:03 -06:00
marcin mikołajczak 13ccc3fe7f Date display improvements 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 18:34:05 +01:00
Alex Gleason 7675860429
Refactor columns 2022-11-30 11:19:16 -06:00
marcin mikołajczak 6435f33af9 fallback to link.url 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 16:57:21 +01:00
marcin mikołajczak 1de5a69f8b Use remote_url for external links 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-30 11:16:42 +01:00
marcin mikołajczak 443b960067 Show quoted statuses list 2022-11-29 23:32:21 +00:00
marcin mikołajczak ee389e523d Allow to configure tile server 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-29 23:14:16 +01:00
marcin mikołajczak 5d9925ed5f Styles improvements, fixes 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-29 22:49:35 +01:00
Alex Gleason e5ff4fa176
Merge remote-tracking branch 'origin/develop' into events 2022-11-29 11:40:42 -06:00
Alex Gleason 1df8270ce0
yarn manage:translations 2022-11-28 11:39:30 -06:00
marcin mikołajczak c87826c419 Merge branch 'report-modal-previous' into 'develop' 
do not show 'previous' button in last step

See merge request soapbox-pub/soapbox!1964
 2022-11-28 16:08:36 +00:00
marcin mikołajczak 90cb114237 do not show 'previous' button in last step 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-28 16:56:18 +01:00
Alex Gleason f87cf765b3
Admin Reports: fix overflow issues 2022-11-28 09:41:19 -06:00
Alex Gleason 0e16bc13c5
Merge remote-tracking branch 'origin/develop' into reports-tailwind 2022-11-28 09:23:13 -06:00
Alex Gleason 860a985a0d Merge branch 'toggle-feed-injection' into 'develop' 
Allow disabling feed injection

See merge request soapbox-pub/soapbox!1962
 2022-11-28 15:06:43 +00:00
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 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
marcin mikołajczak 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
marcin mikołajczak 5d1921b2cc styles fix 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-28 00:28:15 +01:00
marcin mikołajczak 4a96507cd1 Show 'previous' button in report modal 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-28 00:08:27 +01:00
marcin mikołajczak 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
marcin mikołajczak 9ba56a3945 Merge remote-tracking branch 'soapbox/develop' into events 2022-11-27 23:33:51 +01:00
marcin mikołajczak 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