Commit graph

20 commits

Author SHA1 Message Date
528acb8ac5 Merge remote-tracking branch 'soapbox/develop' into update-emoji-mart
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-23 17:42:31 +01:00
Alex Gleason
001c041f51
Remove use of DOMParser in front-end emoji rewriting code
https://github.com/mastodon/mastodon/pull/20758
2022-11-20 18:20:07 -06:00
Chewbacca
4c20784567 Merge branch 'organize-soapbox' into 'develop'
Cleanup file names

See merge request soapbox-pub/soapbox!1894
2022-11-16 14:33:35 +00:00
Chewbacca
d4f5fd4d88 Rename files (5): _ -> - 2022-11-15 12:23:36 -05:00
Alex Gleason
770794dcd7
Patch emoji parsing from upstream
https://github.com/mastodon/mastodon/pull/20640
https://github.com/mastodon/mastodon/pull/20677
2022-11-15 09:47:13 -06:00
ewwwwwwww
2f579839d8 rebased 2022-07-09 09:03:22 -07:00
ewwwwwwww
1249b24ba4 fix all tests 2022-07-09 08:33:14 -07:00
ewwwwwwww
f3c350aeef fix some texts 2022-07-09 08:33:14 -07:00
ewwwwwwww
b1f5902397 added tests 2022-07-09 08:33:14 -07:00
ewwwwwwww
c183ab0f06 fix some tests 2022-07-09 08:33:14 -07:00
ewwwwwwww
f10001fbfd fix some tests 2022-07-09 08:33:13 -07:00
Alex Gleason
0c7f1628b0
Fix more types in tests 2022-07-06 12:31:11 -05:00
Justin
de7fa347df Specifically import the single lodash function 2022-06-17 07:37:53 -04:00
5fec879148 Fix mutes test, prefer TypeScript for tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-12 16:30:48 +02:00
Alex Gleason
6323c7d70e
eslint: enforce gaps between groups with import/order 2022-01-10 16:25:06 -06:00
Alex Gleason
966ca91e1a
eslint: alphabetize imports with import/order 2022-01-10 16:17:52 -06:00
Alex Gleason
5921fa9b2d
Fix emoji tests again 2021-09-12 11:09:01 -05:00
Alex Gleason
d0630c765f
Jest: update emoji tests 2021-09-10 20:37:13 -05:00
Alex Gleason
89b9c739b1
Update tests
I have no idea why changing soapbox -> mastodon fixes this, but I'm tired
2021-07-10 01:59:44 -05:00
Alex Gleason
d24dcb3e60
gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00