Commit Graph

11852 Commits

Author SHA1 Message Date
Alex Gleason cf3ae90233 Merge branch 'custom-emoji-fix' into 'main'
StatusContent: display custom from status emojis, not server emojis

See merge request soapbox-pub/soapbox!3262
2024-11-18 14:35:31 +00:00
Alex Gleason 82ea850344
StatusContent: display custom from status emojis, not server emojis 2024-11-18 08:30:39 -06:00
Alex Gleason d3d55fd999 Merge branch 'upgrade-formatjs' into 'main'
Upgrade react-intl, @formatjs/cli to the latest versions

See merge request soapbox-pub/soapbox!3261
2024-11-18 14:25:16 +00:00
Alex Gleason 2d1c2653b5
Upgrade react-intl, @formatjs/cli to the latest versions 2024-11-18 08:19:08 -06:00
Alex Gleason 19aeb7ebc6 Merge branch 'custom-render' into 'main'
StatusContent: replace custom emojis on render

See merge request soapbox-pub/soapbox!3260
2024-11-18 05:48:05 +00:00
Alex Gleason 9e72bfb3e1
Remove status.contentHtml 2024-11-17 23:38:38 -06:00
Alex Gleason 36e27eb592
StatusContent: fix custom emoji parsing 2024-11-17 23:38:20 -06:00
Alex Gleason f335249104
StatusContent: replace custom emojis on render 2024-11-17 22:53:17 -06:00
Alex Gleason afac59dc3d Merge branch 'custom-hook' into 'main'
Fetch custom_emojis with a hook

See merge request soapbox-pub/soapbox!3259
2024-11-17 21:26:47 +00:00
Alex Gleason ffc7b19aec
Fix custom emoji alignment in lexical 2024-11-17 15:21:57 -06:00
Alex Gleason 62ca4c7a2a
Fetch custom_emojis with a hook 2024-11-17 15:17:38 -06:00
Alex Gleason 0a070153d3 Merge branch 'css-to-tailwind' into 'main'
Remove SCSS

Closes #1763

See merge request soapbox-pub/soapbox!3256
2024-11-17 20:26:44 +00:00
P. Reis 01934b2d33 fix: order locales english 2024-11-16 19:53:09 -03:00
P. Reis 9357e7dd27 fix: new imports style 2024-11-16 19:40:33 -03:00
P. Reis 5102494e5b Merge branch 'main' into small-details-zap-split-polish
Conflicts:
	src/actions/admin.ts
	src/features/ui/index.tsx
	src/features/ui/util/async-components.ts
	src/schemas/instance.ts
2024-11-16 19:03:08 -03:00
P. Reis 728e916d41 feat: implement UI and logic for updating a Ditto instance 2024-11-16 18:41:08 -03:00
danidfra 864a377c8c Merge branch 'main' into css-to-tailwind 2024-11-16 18:16:48 -03:00
danidfra 6d817b07c7 Remove npm commands for scss 2024-11-16 18:14:04 -03:00
Alex Gleason eebdb46b7d Merge branch 'search-no-autofocus' into 'main'
Don't autofocus on the search page

See merge request soapbox-pub/soapbox!3257
2024-11-16 14:37:55 +00:00
Alex Gleason 4ae40dea3d
Don't autofocus on the search page 2024-11-16 08:33:09 -06:00
Alex Gleason 25dfb14776 Merge branch 'native' into 'main'
Switch to native emojis

See merge request soapbox-pub/soapbox!3255
2024-11-16 06:05:01 +00:00
Alex Gleason 158b961bfc
Fix remaining <Emoji /> usages 2024-11-15 19:54:42 -06:00
danidfra 08c5211bf3 Remove "accessibility.scss", "application.scss" and move "emoji-picker.scss" to tailwind.css 2024-11-15 21:59:50 -03:00
Alex Gleason 1738f4365a
Fix/simplify onlyEmoji 2024-11-15 18:29:01 -06:00
danidfra a15e832ab2 Remove "ui.scss" - Many of the styles in this file were only necessary to check as they had already been edited in MR !3210. 2024-11-15 21:28:43 -03:00
Alex Gleason d1738273ed
Switch to native emojis 2024-11-15 17:52:02 -06:00
danidfra b9af47ffc4 Remove "compose-form.scss" 2024-11-15 20:39:10 -03:00
danidfra 7f8289206d Remove "icon.scss" 2024-11-15 19:10:00 -03:00
danidfra d75219780c Remove "status.scss" 2024-11-15 18:44:30 -03:00
danidfra 3cd61231b8 Merge branch 'main' into css-to-tailwind 2024-11-15 18:16:32 -03:00
Alex Gleason 709ea522ca Merge branch 'add-nip-05-modal' into 'main'
Add NIP-05 Step to Modal

Closes #1739

See merge request soapbox-pub/soapbox!3134
2024-11-15 21:12:30 +00:00
danidfra 83514a005c Run yarn i18n 2024-11-15 18:04:41 -03:00
Alex Gleason f38f5604ac Merge branch 'fix-gap-between-names' into 'main'
Fix gap between names in reply-mentions

Closes #1785

See merge request soapbox-pub/soapbox!3253
2024-11-15 21:02:22 +00:00
danidfra 3a92a9a818 Fix gap between names in reply-mentions 2024-11-15 17:57:07 -03:00
danidfra dd23fb9d03 Merge branch 'main' into add-nip-05-modal 2024-11-15 17:36:15 -03:00
danidfra cf0148101c Fix eslint errors 2024-11-15 17:33:29 -03:00
Alex Gleason dd9d171ade Merge branch 'fix-204' into 'main'
MastodonClient: fix HTTP 204 responses

See merge request soapbox-pub/soapbox!3252
2024-11-15 20:16:40 +00:00
Alex Gleason 07c98a21e0
MastodonClient: fix HTTP 204 responses 2024-11-15 14:11:39 -06:00
Alex Gleason b07bcd3ead Merge branch 'emoji-selector-recent' into 'main'
EmojiSelector: track chosen emojis in frequentlyUsedEmojis

Closes #1786

See merge request soapbox-pub/soapbox!3251
2024-11-15 17:21:39 +00:00
Alex Gleason b9528d2bb0
EmojiSelector: track chosen emojis in frequentlyUsedEmojis
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1786
2024-11-15 11:15:06 -06:00
danidfra c8187918d3 Remove loading.scss 2024-11-15 12:27:01 -03:00
Alex Gleason fb4eef11d3
Merge remote-tracking branch 'origin/main' into add-nip-05-modal 2024-11-14 22:53:39 -06:00
Alex Gleason 5725cc4a80 Merge branch 'fix-classnames' into 'main'
Fix classnames warnings

Closes #1761

See merge request soapbox-pub/soapbox!3210
2024-11-15 03:47:39 +00:00
Alex Gleason a16cb85964 Merge branch 'weblate-soapbox-pub-soapbox' into 'main'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!3240
2024-11-15 03:46:49 +00:00
danidfra edd93fc6b0 Add 'eslint-disable' comment into fork-awesome-icon.tsx 2024-11-14 21:28:02 -03:00
danidfra 65c25cd16e Merge remote-tracking branch 'origin/main' into fix-classnames 2024-11-14 20:18:45 -03:00
danidfra a339cb8f8b Move table config for "rtl" into "tailwind.css" and remove "rtl.scss" 2024-11-14 17:32:09 -03:00
danidfra ee0ed09468 Remove "application.scss" 2024-11-14 17:27:54 -03:00
danidfra 834f8305df Adjust chat-message mb 2024-11-14 17:27:10 -03:00
danidfra b7dcd4df8a Merge branch main into fix-classnames 2024-11-14 16:25:11 -03:00