fef
51e441bbda
properly disable reactions when not logged in
2022-12-04 12:33:47 +00:00
fef
fb0f9c2174
fix image for new custom emoji reactions
2022-12-03 16:20:29 +00:00
fef
b7a6243272
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-03 11:57:00 +00:00
fef
c501a17b1f
merge catstodon/main into main
2022-12-02 01:41:43 +00:00
fef
e896b802d2
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-02 01:00:08 +00:00
fef
5b024455a7
fix up merge errors
...
See 57b7968504
2022-12-01 23:35:49 +00:00
fef
57b7968504
merge nyastodon-specific changes back in
...
This was caused by an accidental rebase that i
"fixed" by force-pushing, which caused nyastodon
to be even with glitch-soc/main. oops.
2022-12-01 23:23:12 +00:00
fef
8ca3b6525d
cleanup JS imports and other minor stuff
2022-12-01 22:30:39 +00: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
fef
ca4df02956
merge catcatnya/main into main
2022-12-01 02:53:26 +00:00
Jeremy Kescher
495da7d1a8
Merge remote-tracking branch 'upstream/main' into develop
2022-11-30 18:24:52 +01:00
fef
57e46f4aaf
merge catstodon/main into main
2022-11-30 16:35:05 +00:00
fef
ad67d0dd00
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-11-30 17:26:38 +01:00
fef
4571ee9da6
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-11-30 14:59:37 +00:00
fef
cf5659a254
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-11-30 14:21:43 +01:00
fef
96cd869dad
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-11-30 13:20:20 +00:00
Eugen Rochko
a3052dad04
[Glitch] Add user content translations with configurable backends
...
Port 0d6b878808
2022-11-30 13:53:38 +01:00
fef
8cbaf188fc
cleanup frontend emoji reaction code
2022-11-29 10:19:26 +01:00
fef
d259f95fab
move react button to action bar
2022-11-29 10:19:24 +01:00
fef
448c24cc59
cherry-pick emoji reaction changes
2022-11-29 10:19:23 +01:00
fef
718c92513e
show reactions in detailed status view
2022-11-29 10:17:21 +01:00
fef
80a2f84334
cleanup frontend emoji reaction code
2022-11-29 08:54:35 +00:00
fef
96471c9398
move react button to action bar
2022-11-29 04:37:44 +00:00
fef
d6e3a9f17f
send reaction notifications
2022-11-29 03:31:22 +00: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
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
2022-11-28 11:55:56 +01:00
James Adney
2815ac4155
[Glitch] fix gif autoplay on iOS
...
Port c0dcf15d1e
2022-11-28 11:55:09 +01:00
Claire
c0bf90ac19
[Glitch] Fix “Share @{name}'s profile” profile menu item
...
Port fe421257e5
2022-11-28 11:54:00 +01:00
fef
78a86bda16
show reactions in detailed status view
2022-11-25 23:02:40 +00:00
fef
8380f9fc2c
merge catstodon/main into main
2022-11-24 05:55:08 +00: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
fef
44689beb43
merge catcatnya/main into main
2022-11-18 18:14:19 +00: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
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
2022-11-17 12:58:39 +01:00
nyura123dev
87929ad866
[Glitch] Fix safari explore disappearing tabs
...
Port aaca78da78
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
fef
41c844ed6d
remove accidental clipboard paste
2022-11-16 03:15:06 +00:00
fef
be733ade6b
add nyastodon branding
2022-11-16 02:40:44 +00: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
2022-11-14 22:40:37 +01:00
Claire
8aa56aedfd
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji
...
Port ccbca50a25
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
2022-11-14 20:28:22 +01:00
