Commit graph

2159 commits

Author SHA1 Message Date
Jeremy Kescher
f35d92b8e9
Merge remote-tracking branch 'upstream/main' into develop 2022-12-17 12:09:58 +01:00
Jeremy Kescher
719a0951af
[Glitch] Fix being unable to react with the keycap number sign emoji (#2004)
Port of https://github.com/mastodon/mastodon/pull/22231
2022-12-17 11:34:39 +01:00
Jeremy Kescher
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/locales/de.js
2022-12-17 11:09:32 +01:00
Jeremy Kescher
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
2022-12-16 17:53:33 +01:00
Claire
0912fb736d [Glitch] Add follow request banner on account header
Port 70415714f1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:11:32 +01:00
Holden Foreman
c459625119 [Glitch] Fix language surrounding disability in prompts for alt text and other media descriptions
Port c761e7a5ef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:07:10 +01:00
Bramus!
1ced365371 [Glitch] Fix media markup
Port 7fbc17afa2 to glitch-soc

Co-authored-by: Effy Elden <effy@effy.space>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:06:29 +01:00
Claire
cdba1ec5f4 [Glitch] Fix being stuck in edit mode when deleting the edited status
Port ebf1d74e40 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:06:00 +01:00
Rens Groothuijsen
d7a6a9393a [Glitch] Display search popout at fixed screen position
Port 726c7dea31 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:05:28 +01:00
Terence Eden
89d3d85cf2 [Glitch] Add transparancy to modal background for accessibility
Port ff414a5489 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:04:20 +01:00
Mina Her
0f5ecb3860 [Glitch] Fix margin for search field on medium window size
Port cedf138313 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:03:14 +01:00
Meisam
7883ba34bb [Glitch] set activation for tag follow button
Port 059d64a59e to glitch-soc

Co-authored-by: meisam <meisam@noreply.codeberg.org>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:00:35 +01:00
Claire
602f18103c [Glitch] Fix the top action bar appearing in multi-column layout
Port 38596e49d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:59:59 +01:00
Nick Schonning
57eab6dbee [Glitch] Fix typo in handler function call name
Port 72a8af8088 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:58:48 +01:00
Connor Shea
e76fb9b2c4 [Glitch] Increase the width of the unread notification border.
Port 08c0e43b6f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:58:22 +01:00
Francis Murillo
b22da94a65 [Glitch] Render current day formats in the client timezone
Port c50e9d078a to glitch-soc

Co-authored-by: Effy Elden <effy@effy.space>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:57:17 +01:00
Yamagishi Kazutoshi
9f3cc9e555 [Glitch] FormattedMessage must be used directly
Port 58200132d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:55:42 +01:00
Pleclown
98f7b3657a [Glitch] Adding 12 hours option for polls
Port 3a59ffde8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:54:53 +01:00
Alex Stine
aad42cfc35 [Glitch] Fix hidden label causing accessibility issue for search inputs
Port 903e5a3f45 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:54:11 +01:00
Riedler
8cd7b95559 [Glitch] Fix profile avatar being slightly offset into left border
Port c3388f4ab1 to glitch-soc

Co-authored-by: Riedler <riedler@gelse.eu>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:49:15 +01:00
Claire
65cc5cb891 [Glitch] Change dropdown menu to contain “Copy link to post” even for non-public posts
Port fe9eab51d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:47:58 +01:00
Claire
1e8aff072a [Glitch] Fix wasteful request to /api/v1/custom_emojis when not logged in
Port 1f762f4271 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:46:21 +01:00
Claire
ccc01559de Fix invalid CSS for links in warning and strike cards 2022-12-14 10:11:04 +01:00
Rin
21ee6a777d [Glitch] fix missing style in warning and strike cards
Port 42e16ea52d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-14 09:26:27 +01:00
cadars
32b8b3355b [Glitch] Make handle more easily selectable on profile page
Port 52a50c5e43 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-14 09:19:23 +01:00
Claire
bc91069e08 [Glitch] Change default reply language to be default language when replying to a translated reply
Port f70bdba926 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-14 09:14:50 +01:00
fef
c957eb758c
fix 404 when reacting with Keycap Number Sign
The Unicode sequence for this emoji starts with an
ASCII # character, which the browser's URI parser
truncates before sending the request to the
backend.
2022-12-11 14:29:26 +01:00
Jeremy Kescher
3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop 2022-12-09 23:46:41 +01:00
fef
66ade5c1fd
properly disable reactions when not logged in 2022-12-09 23:08:45 +01:00
fef
bb93649f38
disable reaction button when not signed in 2022-12-09 23:08:44 +01:00
fef
e6c9206f5c
fix image for new custom emoji reactions 2022-12-09 23:08:44 +01:00
fef
0ea02e608c
display external custom emoji reactions properly
Using an emoji map was completely unnecessary in
the first place, because the reaction list from
the API response includes URLs for every custom
emoji anyway.  The reaction list now also contains
a boolean field indicating whether it is an
external custom emoji, which is required because
people should only be able to react with Unicode
emojis and local custom ones, not with custom
emojis from other servers.
2022-12-09 23:08:44 +01:00
fef
bdd3c4691d
fix padding on posts without reactions
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added.  Adding display: none to
empty reaction bars restores this exact look.
2022-12-09 23:08:42 +01:00
fef
6aa7d7fb12
rename nop handler to handleNoOp
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
2022-12-09 23:08:42 +01:00
fef
7187d6f9cf
cleanup JS imports and other minor stuff 2022-12-09 23:08:42 +01:00
fef
14561a05c8
remove unnecessary parameter 2022-12-09 23:08:42 +01:00
fef
e3f97f60a6
change reaction api to match other interactions
Status reactions had an API similar to that of
announcement reactions, using PUT and DELETE at a
single endpoint.  I believe that for statuses, it
makes more sense to follow the convention of the
other interactions and use separate POST endpoints
for create and destroy respectively.
2022-12-09 23:08:42 +01:00
fef
029097a1a0
remove outdated comments 2022-12-09 23:08:41 +01:00
fef
f4dbfdb9c9
rebase with upstream 2022-12-09 23:08:36 +01:00
fef
be0bf21f3b
make number of visible reactions a vanilla setting
Reactions will be backported to the vanilla
flavour, which requires all related settings to
be accessible from the vanilla settings page
rather than the glitch specific settings modal.
2022-12-09 23:04:13 +01:00
fef
6d2ad83c02
make number of displayed reactions a setting
This adds an extra item to the local settings for
specifying the number of reactions shown in toots.
The detailed status view always shows all
reactions.
2022-12-09 23:04:13 +01:00
fef
e247dd17ed
limit number of reactions displayed
Too many reactions on a single post quickly get
spammy, so they are now sorted by count and only
the first MAX_REACTIONS number of different
emojis are actually displayed.
2022-12-09 23:04:13 +01:00
fef
fd885bec48
fix reaction margins and paddings 2022-12-09 23:04:13 +01:00
fef
b82984f0b5
cleanup frontend emoji reaction code 2022-12-09 23:04:13 +01:00
fef
266bf2543d
fix padding for reaction button 2022-12-09 23:04:12 +01:00
fef
8398f7ad4e
move react button to action bar 2022-12-09 23:04:12 +01:00
fef
079b0d15c5
cherry-pick emoji reaction changes 2022-12-09 23:04:12 +01:00
fef
4577711201
make frontend fetch reaction limit
the maximum number of reactions was previously
hardcoded to 8.  this commit also fixes an
incorrect query in StatusReactionValidator where
it didn't count per-user reactions but the total
amount of different ones.
2022-12-09 23:04:12 +01:00
fef
91fcd87069
show reactions in detailed status view 2022-12-09 23:04:11 +01:00
fef
a5c6f4f4b0
add frontend for emoji reactions
this is still pretty bare bones but hey, it works.
2022-12-09 23:04:11 +01:00