Commit Graph

6796 Commits

Author SHA1 Message Date
93f98ffd96 Merge branch 'chats-styles' into 'develop'
Minor chats styles improvements

Closes #1181 and #1210

See merge request soapbox-pub/soapbox!1932
2022-11-24 22:57:52 +00:00
37b698b2e0 Minor chats styles improvements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-24 23:15:30 +01:00
cd282079a2 Merge branch 'media-modal-hotkeys' into 'develop'
MediaModal: fix hotkey navigation

Closes #1209

See merge request soapbox-pub/soapbox!1930
2022-11-23 20:01:00 +00:00
16f52538ce MediaModal: fix hotkey navigation
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1209
2022-11-23 13:46:09 -06:00
c4d3719918 Merge branch 'fix-header-preview' into 'develop'
ProfilePreview: fix display of header image, code cleanup

See merge request soapbox-pub/soapbox!1929
2022-11-23 18:24:45 +00:00
afaf8b10c2 Merge branch 'sensitive-video-fix' into 'develop'
Sensitive video refactor

Closes #1190

See merge request soapbox-pub/soapbox!1917
2022-11-23 18:01:43 +00:00
ea0146400c Merge remote-tracking branch 'origin/develop' into sensitive-video-fix 2022-11-23 11:49:27 -06:00
85b8d09d68 ProfilePreview: fix display of header image, code cleanup 2022-11-23 11:45:52 -06:00
41dd2bfcef Merge branch 'stillimage-tw' into 'develop'
Make StillImage Tailwind friendly

See merge request soapbox-pub/soapbox!1925
2022-11-22 23:31:38 +00:00
47613dde56 Simplify StillImage component, fix header images 2022-11-22 11:33:47 -06:00
dce26a6600 ProfileHoverCard: fix account bio on Mastodon 2022-11-22 11:33:00 -06:00
0111d4f179 Fix StillImage in Safari 2022-11-22 11:04:35 -06:00
82c00fdfb2 Merge branch 'custom-emoji-categories' into 'develop'
Support custom emoji categories

Closes #1197

See merge request soapbox-pub/soapbox!1927
2022-11-21 17:45:49 +00:00
9751ae56fe Merge branch 'feed-suggestions-html' into 'develop'
FeedSuggestions: use HTML display name

See merge request soapbox-pub/soapbox!1928
2022-11-21 17:39:51 +00:00
462078862f Merge branch 'translation-strip-compat' into 'develop'
Translations: strip compatibility features from HTML

See merge request soapbox-pub/soapbox!1921
2022-11-21 17:29:12 +00:00
1e155c4efd Merge remote-tracking branch 'origin/develop' into stillimage-tw 2022-11-21 10:59:38 -06:00
aad68fcdc1 FeedSuggestions: use HTML display name 2022-11-21 10:56:38 -06:00
650f75ee65 Merge branch 'remove-iconfont' into 'develop'
Remove 'soapbox' icon font

See merge request soapbox-pub/soapbox!1926
2022-11-21 16:22:11 +00:00
5f9ce5776e Merge branch 'markup-css' into 'develop'
Add <Markup> component to style markup from the API

See merge request soapbox-pub/soapbox!1922
2022-11-21 16:11:28 +00:00
1514fafa98 Fix alignment of emojis in picker 2022-11-20 18:37:31 -06:00
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
181d03d0c5 Support custom emoji categories
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1197
Related https://github.com/mastodon/mastodon/pull/11196
2022-11-20 18:11:11 -06:00
8d2db4c2a3 Fix letterboxing remote statuses 2022-11-20 15:26:01 -06:00
967ff441c6 Remove 'soapbox' icon font 2022-11-20 15:07:06 -06:00
b530d933a3 Merge remote-tracking branch 'origin/develop' into markup-css 2022-11-20 15:00:58 -06:00
b4b9aa039d Remove .still-image css, display "GIF" badge in media when autoPlayGif is off 2022-11-20 14:53:24 -06:00
f7d75f57ea StillImage: make it play nice with Tailwind, remove still-image.scss 2022-11-20 14:23:18 -06:00
032ce10d6a Merge branch 'actually-fix-propagation' into 'develop'
Actually fix status propagation

See merge request soapbox-pub/soapbox!1924
2022-11-20 19:31:37 +00:00
54801e44af StatusMedia: stop propagation from element root 2022-11-20 12:56:13 -06:00
b892b85f70 StatusActionBar: stop propogation in parent div instead of each element individually 2022-11-20 12:36:54 -06:00
d96ba27905 Status: switch back to onClick instead of onMouseUp 2022-11-20 12:28:11 -06:00
8061c8d782 Revert "Merge branch 'mouseup' into 'develop'"
This reverts commit 39b4ee9f09, reversing
changes made to a0597a6445.
2022-11-20 12:27:45 -06:00
6444632324 Revert "Merge branch 'autosuggest-profiles-fix' into 'develop'"
This reverts commit 9df92e91e7, reversing
changes made to 39b4ee9f09.
2022-11-20 12:27:30 -06:00
9df92e91e7 Merge branch 'autosuggest-profiles-fix' into 'develop'
AutosuggestAccount: let account be clicked

See merge request soapbox-pub/soapbox!1923
2022-11-20 02:16:51 +00:00
908985bdc6 AutosuggestAccount: let account be clicked 2022-11-19 20:15:32 -06:00
00989a7dfc LandingPage: use Markup component for instance description 2022-11-19 18:28:34 -06:00
7e32f0d992 Add <Markup> component to style markup from the API 2022-11-19 18:15:17 -06:00
15ec4c8830 Video: remove spoiler styles 2022-11-19 17:20:27 -06:00
30a34b0b82 Remove .spoiler-button styles 2022-11-19 17:17:56 -06:00
f3fdc7b387 Translations: strip compatibility features from HTML 2022-11-19 16:24:35 -06:00
39b4ee9f09 Merge branch 'mouseup' into 'develop'
Stop mouseUp propagation in statuses

See merge request soapbox-pub/soapbox!1920
2022-11-19 22:08:58 +00:00
990e28ccc8 Remove unnecessary stopPropagation() calls 2022-11-19 15:55:55 -06:00
f66b50361d StatusReplyMentions: prevent bubbling 2022-11-19 15:33:30 -06:00
4c57968914 StatusContent: prevent bubbling of mentions, links, hashtags, and "Read more" button 2022-11-19 15:30:09 -06:00
6a8d7e4ed3 StopPropagation: let it be disabled 2022-11-19 15:26:07 -06:00
0cea66dcef ProfileDropdown: allow clicking accounts again 2022-11-19 15:10:23 -06:00
9d87d9957f TranslateButton: stopPropagation() 2022-11-19 15:08:49 -06:00
e973d69c61 Stop mouseUp propagation in statuses 2022-11-19 14:36:58 -06:00
a0597a6445 Merge branch 'fix-status-focus' into 'develop'
Status: prevent selecting text from navigating to the status

Closes #901

See merge request soapbox-pub/soapbox!1919
2022-11-19 10:29:36 +00:00
a7902421e5 Merge branch 'audio-focus' into 'develop'
Audio: prevent focusing the status when clicked

Closes #1191

See merge request soapbox-pub/soapbox!1918
2022-11-19 10:29:16 +00:00