Commit graph

5748 commits

Author SHA1 Message Date
Justin
04a56c2ad5 Merge branch 'fix-text-theme' into 'develop'
Improve RelativeTimestamp theme

See merge request soapbox-pub/soapbox-fe!1564
2022-06-23 18:39:32 +00:00
Justin
931f2e16d8 Add tests for removeFromFollowers() action 2022-06-23 14:37:55 -04:00
Justin
11f8bf979a Improve RelativeTimestamp theme 2022-06-23 14:22:25 -04:00
Justin
0a9e1c808b Merge branch 'max-video-duration' into 'develop'
Implement 'video_duration_limit' from API

See merge request soapbox-pub/soapbox-fe!1561
2022-06-23 13:09:46 +00:00
marcin mikołajczak
3bee246880 Merge branch 'update' into 'develop'
Update some dependencies, remove `react-router-scroll-4`

See merge request soapbox-pub/soapbox-fe!1557
2022-06-23 07:39:40 +00:00
Alex Gleason
cb53abd2bb Merge branch 'timestamp-muted' into 'develop'
RelativeTimestamp: make text muted

See merge request soapbox-pub/soapbox-fe!1563
2022-06-22 23:03:23 +00:00
Alex Gleason
df0fc3c1e1
RelativeTimestamp: make text muted 2022-06-22 16:34:57 -05:00
Alex Gleason
2b3dcbf5d1 Merge branch 'nginx-packs' into 'develop'
Mastodon nginx: try to fix /packs cache

See merge request soapbox-pub/soapbox-fe!1551
2022-06-22 21:31:16 +00:00
7f8594d05e Reducers: TypeScript
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-22 22:54:21 +02:00
Justin
d56739727e Implement 'video_duration_limit' from API 2022-06-22 15:40:26 -04:00
Alex Gleason
f88dd7d5bb
Mastodon nginx: remove try_files from @mastodon-packs 2022-06-22 13:44:27 -05:00
Alex Gleason
ca3bf680e9 Merge branch 'settings-toast' into 'develop'
Settings: optionally show alert

Closes #1001

See merge request soapbox-pub/soapbox-fe!1560
2022-06-22 18:02:45 +00:00
Alex Gleason
18df7c0c4a
Settings: pass an opts object instead of showAlert 2022-06-22 12:54:36 -05:00
Alex Gleason
c1a0b7a6a8
Settings: optionally show alert 2022-06-22 12:17:35 -05:00
01d9f918ce Remove react-router-scroll-4
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-22 12:49:51 +02:00
b22512fb53 update some deps
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-22 12:47:20 +02:00
Alex Gleason
017ee90dfd Merge branch 'muted' into 'develop'
CSS: remove .muted styles

See merge request soapbox-pub/soapbox-fe!1556
2022-06-22 02:21:48 +00:00
Alex Gleason
a731a865f9
CSS: remove .muted styles 2022-06-21 21:08:20 -05:00
marcin mikołajczak
3a342ad747 Merge branch 'pleroma-edits' into 'develop'
Enable post editing on Pleroma

See merge request soapbox-pub/soapbox-fe!1482
2022-06-21 22:43:51 +00:00
marcin mikołajczak
7a0dff1f33 Enable post editing on Pleroma 2022-06-21 22:43:51 +00:00
Alex Gleason
71e314e342 Merge branch 'chats-autosize' into 'develop'
ChatRoom: autosize height on desktop

See merge request soapbox-pub/soapbox-fe!1554
2022-06-21 21:14:46 +00:00
Alex Gleason
c42f60bc77
ChatRoom: autosize height on desktop 2022-06-21 15:58:03 -05:00
marcin mikołajczak
31a73224a9 Merge branch 'ts' into 'develop'
Actions: TypeScript

See merge request soapbox-pub/soapbox-fe!1534
2022-06-21 19:09:44 +00:00
Alex Gleason
a16230780e
Merge remote-tracking branch 'origin/develop' into ts 2022-06-21 13:57:59 -05:00
Alex Gleason
e5d6b4fd7b Merge branch 'hoverstatus' into 'develop'
Status reply hover

See merge request soapbox-pub/soapbox-fe!1550
2022-06-21 18:57:22 +00:00
Alex Gleason
3b0543eb66
reducers/status-hover-card: add tests 2022-06-21 13:39:47 -05:00
Alex Gleason
00ef5b9ac1 Merge branch 'axios-mock' into 'develop'
Axios mock preparation

See merge request soapbox-pub/soapbox-fe!1553
2022-06-21 18:31:20 +00:00
Alex Gleason
145c6efa4e
MockAdapter: add types 2022-06-21 13:14:45 -05:00
Alex Gleason
504693db83
Danger: fix test files glob 2022-06-21 13:11:35 -05:00
Alex Gleason
e472092bec
Upgrade axios-mock-adapter to ^1.21.1 2022-06-21 13:11:13 -05:00
Alex Gleason
55892e0a82
Poll: convert vote to string 2022-06-21 11:25:20 -05:00
Alex Gleason
fddc7b902b
Mastodon nginx: try to fix /packs cache 2022-06-21 11:15:23 -05:00
Alex Gleason
572744a695
Merge remote-tracking branch 'origin/develop' into ts 2022-06-21 11:01:05 -05:00
Justin
4b25bdf635 Merge branch 'poll-improvements' into 'develop'
Refactor & Redesign Polls in Statuses

See merge request soapbox-pub/soapbox-fe!1533
2022-06-21 11:44:40 +00:00
Justin
4ff54095fd Add help text for selecting multiple 2022-06-21 07:35:19 -04:00
Alex Gleason
04d7a161cd
Merge remote-tracking branch 'origin/develop' into hoverstatus 2022-06-20 17:39:41 -05:00
Alex Gleason
729cf6f6f6
ProfileHoverCard: z-[100] no longer necessary 2022-06-20 17:37:56 -05:00
Alex Gleason
3e531b6827
Disallow status card nested hovering 2022-06-20 17:37:20 -05:00
Alex Gleason
01e643e4f6
StatusHoverCard: ahh, I understand the z-index issue 2022-06-20 17:28:59 -05:00
Alex Gleason
c78e398dad
StatusHoverCard: fix useEffect conditional 2022-06-20 17:20:51 -05:00
Alex Gleason
f1f6892d92
StatusHoverCard: prefer attachment thumbs 2022-06-20 17:06:48 -05:00
Alex Gleason
0292e4f428
StatusHoverCard: fix lint stuff, cleanup 2022-06-20 17:04:57 -05:00
Alex Gleason
3bbc4cffe8
actions/status-hover-card: convert to TypeScript 2022-06-20 16:55:08 -05:00
Alex Gleason
2d3d834a83
StatusReplyMentions: linter fixes 2022-06-20 16:51:25 -05:00
Alex Gleason
f1023b3f80
ProfileHoverCard: set z-index with Tailwind class 2022-06-20 16:49:23 -05:00
88f690824c Update tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-20 22:44:40 +02:00
7d0247bc27 Merge remote-tracking branch 'soapbox/develop' into ts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-20 21:48:58 +02:00
419ab93077 Reducers: TypeScript
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-20 21:48:11 +02:00
Alex Gleason
ff903e0d2b Merge branch 'sentry-fixes' into 'develop'
Sentry fixes

See merge request soapbox-pub/soapbox-fe!1548
2022-06-20 18:19:56 +00:00
Justin
b354382f24 Merge branch 'fix-spacing-regression' into 'develop'
Fix spacing regression

See merge request soapbox-pub/soapbox-fe!1549
2022-06-20 18:07:04 +00:00