Commit graph

1106 commits

Author SHA1 Message Date
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
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
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
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
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
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
fef
66ade5c1fd
properly disable reactions when not logged in 2022-12-09 23:08:45 +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
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
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
b82984f0b5
cleanup frontend emoji reaction code 2022-12-09 23:04:13 +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
91fcd87069
show reactions in detailed status view 2022-12-09 23:04:11 +01:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop 2022-12-07 17:49:14 +01:00
Claire
0e70215c40 [Glitch] Fix “Sign up” button with closed registrations not opening modal on mobile
Port 51098035ed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-07 09:09:23 +01:00
Jeremy Kescher
32600375b3
Merge remote-tracking branch 'upstream/main' into develop 2022-12-01 20:57:06 +01:00
Claire
4ac6601476
Port navigation bar from upstream (#1986)
Fixes #1977
2022-12-01 20:06:08 +01:00
Jeremy Kescher
495da7d1a8
Merge remote-tracking branch 'upstream/main' into develop 2022-11-30 18:24:52 +01:00
Eugen Rochko
a3052dad04 [Glitch] Add user content translations with configurable backends
Port 0d6b878808 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6 2022-11-29 00:15:08 +01:00
Connor Shea
f51990bd62 [Glitch] Make the 'Trending now' header a link to Explore.
Port cec1e902e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:59:00 +01:00
Claire
98c5ca1037 [Glitch] Fix infinite loading instead of soft 404 for non-existing remote accounts
Port 3ffaa966b0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:55:56 +01:00
James Adney
2815ac4155 [Glitch] fix gif autoplay on iOS
Port c0dcf15d1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:55:09 +01:00
Claire
c0bf90ac19 [Glitch] Fix “Share @{name}'s profile” profile menu item
Port fe421257e5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:54:00 +01:00
Jeremy Kescher
41ce71cc92
Merge remote-tracking branch 'upstream/main' into develop 2022-11-23 22:54:06 +01:00
Claire
43dbc62568
Fix privacy dropdown in boost modal on mobile (#1967)
Fixes #1965
2022-11-22 11:26:14 +01:00
Jeremy Kescher
b221a857f7
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2022-11-17 23:38:08 +01:00
Claire
c22f3a87a3 [Glitch] Remove use of DOMParser in front-end emoji rewriting code
Port 585cc1a604 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-17 12:59:29 +01:00
Levi Bard
4b449fff23 [Glitch] Make the button that expands the publish form differentiable from the button that publishes a post
Port 654d348aac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-17 12:58:39 +01:00
nyura123dev
87929ad866 [Glitch] Fix safari explore disappearing tabs
Port aaca78da78 to glitch-soc

Co-authored-by: nyura <nyura@hidden.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-17 12:57:58 +01:00
Claire
23ea0e7508
Add aria-label and title attributes to local settings navigation items (#1949) 2022-11-16 20:56:06 +01:00
Jeremy Kescher
4b56353f13
Merge remote-tracking branch 'upstream/main' into develop 2022-11-15 00:34:05 +01:00
Claire
ceafd1f68f
Fix infinite loop when system emoji font is enabled (#1931)
Fixes #1930
2022-11-15 00:32:59 +01:00
Jeremy Kescher
5135399a5f
Merge remote-tracking branch 'upstream/main' into develop 2022-11-14 22:50:54 +01:00
Jeremy Kescher
14ef153c69
Revert "[Glitch] Fix nodes order being sometimes mangled when rewriting emoji"
This reverts commit 06faf2f977.
2022-11-14 22:50:45 +01:00
Jeremy Kescher
06faf2f977
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji
backport ccbca50a25 by Claire
2022-11-14 22:40:37 +01:00
Claire
8aa56aedfd [Glitch] Fix nodes order being sometimes mangled when rewriting emoji
Port ccbca50a25 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 22:32:00 +01:00
Jeremy Kescher
122870cb6b
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	config/initializers/rack_attack.rb
#	lib/mastodon/version.rb
2022-11-14 22:18:48 +01:00
Claire
71982e5c83 [Glitch] Fix emoji substitution not applying only to text nodes in Web UI
Port 625e086996 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 20:28:22 +01:00
Eugen Rochko
9db90d2ebe [Glitch] Fix dropdown menu on profiles not being accessible on narrow screens in web UI
Port 6da9df774e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 09:16:41 +01:00