Wykres commitów

7271 Commity (9c3bd08f8d1322ad3b472e7f55c86d2635adb521)

Autor SHA1 Wiadomość Data
Alex Gleason 9c3bd08f8d Merge branch 'fix-avatar-ring' into 'develop'
Fix avatar ring

See merge request soapbox-pub/soapbox!1995
2022-12-14 20:55:42 +00:00
Alex Gleason 7138bec3b0
Merge remote-tracking branch 'origin/develop' into fix-avatar-ring 2022-12-14 14:41:14 -06:00
Alex Gleason 9fb1f69cd2 Merge branch 'edit-profile-top' into 'develop'
EditProfile: move profile preview (avatar/banner) to the top

See merge request soapbox-pub/soapbox!2002
2022-12-14 20:31:27 +00: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 e2c7933513 Merge branch 'carousel-seen-feature' into 'develop'
Carousel: make `seen` optional, only hit the API if features.carouselSeen is supported

See merge request soapbox-pub/soapbox!2001
2022-12-14 19:46:30 +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
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 dd5056cfb3 Merge branch 'bio-wrap' into 'develop'
Markup: use whitespace-pre-wrap (fix multiline bios on Mastodon)

See merge request soapbox-pub/soapbox!1999
2022-12-14 17:18:24 +00:00
Alex Gleason eef7fdb78e
Markup: use whitespace-pre-wrap (fix multiline bios on Mastodon) 2022-12-14 11:01:09 -06:00
Alex Gleason 5a38f7fb09 Merge branch 'chats-font-fix' into 'develop'
Add Inter 600, fix ChatPaneHeader font weight

See merge request soapbox-pub/soapbox!1998
2022-12-14 16:34:09 +00: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
Alex Gleason ff878e1b49 Merge branch 'reduce-timestamp-size' into 'develop'
Chats: Reduce size of timestamp

See merge request soapbox-pub/soapbox!1996
2022-12-13 17:00:37 +00: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
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 5a2d082437 Merge branch 'supported-languages' into 'develop'
Support source_languages and target_languages

See merge request soapbox-pub/soapbox!1991
2022-12-11 12:13:31 +00: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 14b015a025 Merge branch 'events' into 'develop'
ComposeEventModal: Set is_uploading to false after successsfully uploading banner

See merge request soapbox-pub/soapbox!1987
2022-12-09 19:04:21 +00: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 fc728f4b1a Merge branch 'domain-blocks' into 'develop'
this wasn't meant to be merged

See merge request soapbox-pub/soapbox!1986
2022-12-09 16:29:48 +00: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 5998400a75 Merge branch 'chats-deletion' into 'develop'
Enable Chats deletion for Rebased

Closes #608

See merge request soapbox-pub/soapbox!1984
2022-12-09 02:13:49 +00:00
Alex Gleason 889d598027
Enable Chats deletion for Rebased 2022-12-08 19:48:34 -06:00
Alex Gleason 9dd791eeed Merge branch 'it-lang-patch' into 'develop'
small ita patch

See merge request soapbox-pub/soapbox!1983
2022-12-09 00:24:00 +00:00
Tassoman Pigi 321e347b32 small ita patch 2022-12-09 00:24:00 +00:00
marcin mikołajczak 523e573fd7 Merge branch 'events' into 'develop'
Revert "Remove 'show on map' for now"

See merge request soapbox-pub/soapbox!1982
2022-12-08 16:45:29 +00:00