Wykres commitów

7295 Commity (8f2a1fb6ef70021d60b5eb37cd8b4334cf996e1e)

Autor SHA1 Wiadomość Data
Alex Gleason 8f2a1fb6ef
Danger: don't warn about changelog for docs, CI, etc 2022-12-17 10:42:05 -06:00
Alex Gleason af4e8765fd Merge branch 'weblate-installation' into 'develop'
Adding a link to Weblate in our project's homepage

See merge request soapbox-pub/soapbox!2011
2022-12-17 03:05:47 +00:00
Tassoman 9bd82252f4 Adding a link to Weblate in our project's homepage 2022-12-17 03:05:47 +00:00
Alex Gleason 636abf6400 Merge branch 'ci-interruptable' into 'develop'
GitLab CI: let jobs auto-cancel when a new commit is pushed to the same branch

See merge request soapbox-pub/soapbox!2009
2022-12-17 02:19:35 +00:00
Alex Gleason 16eeb89a37
GitLab CI: let jobs auto-cancel when a new commit is pushed to the same branch 2022-12-16 19:26:39 -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 05514275c6 Merge branch 'changelogging' into 'develop'
Prevent conflicts to CHANGELOG.md, warn if not updated with Danger

See merge request soapbox-pub/soapbox!2006
2022-12-16 23:04:40 +00:00
Alex Gleason 9c00fe2f00 Merge branch 'status-short-numbers' into 'develop'
InteractionCounter: use shortNumberFormat

See merge request soapbox-pub/soapbox!2008
2022-12-16 17:44:58 +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
Alex Gleason cbb027f09c
CHANGELOG: fill out changes for Soapbox v2.0, and Unreleased 2022-12-15 14:23:49 -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
Alex Gleason a494d42fb6 Merge branch 'fix/1231' into 'develop'
Feeding hide network checkbox

Closes #1231

See merge request soapbox-pub/soapbox!1989
2022-12-15 00:52:57 +00:00
Tassoman d3e9b283eb Feeding hide network checkbox 2022-12-15 00:52:56 +00:00
Alex Gleason 5bfe3d8f99
Danger: improve phrasing of changelog warning 2022-12-14 18:19:34 -06:00
Alex Gleason 5b79f91c53
CHANGELOG: add missing release, boilerplate [Unreleased] section 2022-12-14 18:09:33 -06:00
Alex Gleason b030c15583
Danger: warn when CHANGELOG.md isn't updated 2022-12-14 18:06:44 -06:00
marcin mikołajczak 255f9cd6d1 Merge branch 'i18n-pl' into 'develop'
Update Polish translation

See merge request soapbox-pub/soapbox!2004
2022-12-14 23:46:17 +00:00
Alex Gleason 4a1ae9798a
Add .gitattributes, prevent conflicts on CHANGELOG.md 2022-12-14 17:44:16 -06: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 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