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
Claire
3ea445bb5c
[Glitch] Fix potential duplicate statuses in Explore tab
...
Port c8a1faa86b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-09 16:50:53 +01:00
Jeremy Kescher
3992d8393d
Merge remote-tracking branch 'upstream/main' into develop
2022-12-09 14:47:08 +01:00
Michal Dvorak
859db01268
initial translation of Glitch-specific texts into Czech ( #1997 )
2022-12-08 10:38:52 +01:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop
2022-12-07 17:49:14 +01:00
Juan Xavier Gomez
16fb604c52
[Glitch] Fix hidden overflow on interaction modal
...
Port 21b208afcb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-07 09:11:57 +01:00
Claire
4642f7d830
[Glitch] Fix UI header overflow on mobile
...
Port 76454cc638
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-07 09:10:47 +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
cf912c6ccb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
2022-12-04 20:53:50 +01:00
Claire
f4879c4481
Fix content-type being reset when editing toots ( #1993 )
...
Fixes #1990
2022-12-04 17:58:10 +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
Claire
e64909d8bf
Move translate button above media attachments/preview cards
2022-11-30 15:03:47 +01:00
Claire
afdd75e1f9
Fix translate button not being shown when the toot has no Content Warning
2022-11-30 14:44:06 +01:00
Claire
620b079a78
Fix inconsistent with “translate” button padding
2022-11-30 13:53:38 +01:00
Eugen Rochko
f7684a31fe
[Glitch] Change design of translations in web UI
...
Port fcca781aae
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Claire
44c0ba445a
[Glitch] Add mention of the translation provider when translating a post
...
Port 30453fab80
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Claire
47bd934061
[Glitch] Change “Translate” button to only show up when a translation backend is configured
...
Port 8046cf34d6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Eugen Rochko
e8d0a1b320
[Glitch] Fix showing translate button when status has no language in web UI
...
Port 4adb267f91
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Eugen Rochko
5e143db13a
[Glitch] Don't show translate button to logged-out users
...
Port part of e623c302d5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Eugen Rochko
b5ee275ed9
[Glitch] Fix translations not being formatted, other issues in web UI
...
Port 55a2e9b5be
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +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
kedama
32b43a96a7
[Glitch] Fix status mismatch of sensitive check
...
Port 14e2354eea
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:53:21 +01:00
Jeremy Kescher
f34d3b838e
Merge remote-tracking branch 'upstream/main' into develop
2022-11-26 14:02:07 +01:00
Claire
6517b7b9f0
Fix pillbar buttons in light theme ( #1972 )
...
* Simplify pillbar button design and make it more consistent with toggles
* Fix pillbar buttons in light theme
Fixes #1970
2022-11-25 13:54:43 +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
Claire
96c1ef6d50
[Glitch] Fix media metadata being only editable once
...
Port 2d54986a03
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 18:32:33 +01:00
trwnh
c31e756644
[Glitch] Move V2 Filter methods under /api/v2 prefix
...
Port b59ce0a60f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 09:17:59 +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
Samuel Kaiser
9fd866f38e
[Glitch] Stick batch table toolbar to the top
...
Port e62b514e95
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 09:05:56 +01:00
Jeremy Kescher
c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2022-11-12 14:38:59 +01:00
Claire
a808ac1fd8
[Glitch] Fix WebUI crash when listing server blocks and rationale is not available
...
Port 93a6ebc83d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 14:02:23 +01:00
Claire
9255bfb908
[Glitch] Add the ability to edit media attachment metadata for any unattached media
...
Port 31005aad12
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 14:01:47 +01:00
Cutls
e2315876f4
[Glitch] Do not show drag&drop dialog when not logined
...
Port 553b169d48
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:59:03 +01:00
Claire
8ac4165c72
[Glitch] Remove “No description added” media warning in edit mode
...
Port 5e796dc6f8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:57:41 +01:00
Eugen Rochko
400d168310
[Glitch] Fix domain blocks on about page not working well on small screens in web UI
...
Port 6774c339b2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:56:49 +01:00
Connor Shea
d525ae4bdd
[Glitch] Only remove padding when listing applications
...
Port cf4992c918
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:55:43 +01:00
Yamagishi Kazutoshi
0071582c6d
[Glitch] Delay workbox import
...
Port 53d26cfc1c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:55:02 +01:00
Claire
5394ca6807
[Glitch] Fix unnecessary service worker registration and preloading when logged out
...
Port 894ce3726a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:54:09 +01:00
Claire
487689f062
[Glitch] Remove preview cards from fav and boost notifications
...
Port 99734ac936
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:51:30 +01:00
Claire
3fa6c603ba
[Glitch] Fix color of the “No description added“ media upload warning on light theme
...
Port 89a6b76f99
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 13:48:42 +01:00
Claire
6a96b17a2d
Add “Glitch-only” label to glitch-specific settings
2022-11-12 11:30:35 +01:00
Claire
c813df2ebb
Merge pull request #1917 from ClearlyClaire/glitch-soc/fixes/not-recommended-label
...
Fix “not recommended” label being shown as “recommended”
2022-11-12 11:10:39 +01:00
Claire
1ce29aeabf
Change "Allow trends without prior review' setting to include statuses
...
Port SCSS changes from 546672e292
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 10:59:17 +01:00
Claire
73b68fcabb
Fix styling of advanced options dropdown ( #1916 )
...
Fixes #1914
2022-11-12 09:59:28 +01:00
Jeremy Kescher
4886f1955b
Merge remote-tracking branch 'upstream/main' into develop
2022-11-10 21:11:05 +01:00
atsuchan
6df9d388e7
Update Flavour 'ja' Translation ( #1911 )
2022-11-10 17:26:28 +01:00
Eugen Rochko
c4d2c72924
[Glitch] Add option to open original page in dropdowns of remote content in web UI
...
Port ef582dc4f2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10 11:06:56 +01:00
Sasha Sorokin
099b3011aa
[Glitch] Remove aria-pressed where it's redundant
...
Port d055d75172
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10 10:25:43 +01:00
Eugen Rochko
65b6c4f6df
[Glitch] Change larger reblogs/favourites numbers to be shortened in web UI
...
Port 7bdb2433f1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10 10:15:21 +01:00
Effy Elden
c722c4cce8
[Glitch] Remove unused timeline_container to fix linter errors
...
Port 8fdbb4d00d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10 09:54:19 +01:00
Eugen Rochko
41ea39903d
[Glitch] Fix confusing wording in interaction modal in web UI
...
Port 16122761c5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10 09:53:06 +01:00
Eugen Rochko
d3a29a136c
[Glitch] Fix profile header being cut off in light theme in web UI
...
Port e37e8deb0f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10 09:51:46 +01:00
Jeremy Kescher
5b797a34df
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 23:30:01 +01:00
Claire
9b6d6a919f
[Glitch] Fix redrafting a currently-editing post not leaving edit mode
...
Port 782b6835f7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-08 16:26:25 +01:00
Claire
fe1b694128
[Glitch] Fix opening the language picker scrolling the single-column view to the top
...
Port 608343c135
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-08 15:49:09 +01:00
Zach Flanders
6eac1cfccd
[Glitch] Fix spoiler buttons css not rendering correct color in light theme
...
Port 0beb095a4b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-08 15:47:48 +01:00
Jeremy Kescher
ffa93fa157
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 07:26:59 +01:00
Claire
2bc22be66c
[Glitch] Add aria-expanded to content warning toggle button
...
Port 622f603ac7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 20:04:31 +01:00
Claire
c493c967d6
Fix light theme issues with the favourite modal and some background colors ( #1902 )
...
* Fix favourite modal styling in glitch-soc light theme
* Fix unnecessary difference between glitch-soc's light theme and upstream's
2022-11-07 10:34:18 +01:00
Sunny Ripert
7ba13dddfa
[Glitch] Fix double button to clear emoji search input
...
Port 4b7f32a2a6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:55:44 +01:00
Sunny Ripert
71e68dac4e
[Glitch] Fix JavaScript console error on Getting Started column
...
Port ffe735344b
to glitch-soc
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:54:18 +01:00
Sunny Ripert
d13a2f7901
[Glitch] Fix console log error on column settings load
...
Port 34c269310d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:53:20 +01:00
Jeremy Kescher
03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/ui/components/link_footer.js
# lib/mastodon/version.rb
# public/avatars/original/missing.png
2022-11-06 20:59:47 +01:00
Claire
0be6da42d3
Change glitch-soc composer classes to match upstream
2022-11-06 17:29:04 +01:00
Eugen Rochko
c199387558
[Glitch] Fix colors in light theme
...
Port 20aa8881dc
to glitch-soc
2022-11-06 17:29:04 +01:00
Eugen Rochko
cbfa5ad5dd
[Glitch] Fix wrong colors in the high-contrast theme
...
Port 1c3192df6b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko
c883799a1f
[Glitch] Change design of link footer
...
Port 2d9a85db6e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko
d29172a682
[Glitch] Fix missing interpolation of domain in disabled account banner in web UI
...
Port a442f481f8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Claire
b6c0ef70a2
[Glitch] Change sign-in banner to reflect disabled or moved account status
...
Port 312d616371
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko
0437159056
[Glitch] Fix showing profile's featured tags on individual statuses
...
Port bfafb114a2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Claire
fa293f03fa
[Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
...
Port 7c8e2b9859
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko
01e0cb1cd5
[Glitch] Add assets from Twemoji 14.0
...
Port e02812d5b6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:50:23 +01:00
Sunny Ripert
8368f4857c
[Glitch] Fix JavaScript console warning when loading notifications
...
Port 887976814a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:47:31 +01:00
Sunny Ripert
93ccb4a29e
[Glitch] Fix JavaScript console error on upload editing status
...
Port c95d9aab56
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:46:03 +01:00
Eugen Rochko
81334e2bfb
[Glitch] Fix limited account hint referencing "your" server when logged out
...
Port 139ea4c981
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:45:00 +01:00
Claire
6b498fae46
[Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled ( #19687 )
...
Port cbb440bbc2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:43:18 +01:00
Claire
e42875d195
[Glitch] Fix edits not being immediately reflected
...
Port 74d40c7d8f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:42:15 +01:00
Jeremy Kescher
9dafedaecd
Remove misc duplicate declarations
2022-11-06 01:42:40 +01:00
Jeremy Kescher
5ab1ac972b
Show about tab if explore tab wouldn't show any statuses
2022-11-06 01:41:55 +01:00
Jeremy Kescher
b0be4764b4
Keep showing explore tab, only statuses are hidden
2022-11-06 01:30:46 +01:00
Jeremy Kescher
da8c3bed5c
Don't show trending statuses in public web UI
2022-11-06 01:13:19 +01:00
Jeremy Kescher
96afc222d2
Merge remote-tracking branch 'upstream/main' into develop
2022-11-05 12:26:08 +01:00
prplecake
34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI ( #1888 )
2022-11-05 08:12:04 +01:00
Jeremy Kescher
9c8fb2d475
Improve min poll options, expose value in API
2022-11-01 10:29:44 +01:00
Jeremy Kescher
22427cd43c
Merge remote-tracking branch 'upstream/main'
...
# Conflicts:
# app/javascript/flavours/glitch/features/ui/components/link_footer.js
# app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
2022-11-01 10:23:35 +01:00
prplecake
fc340c9154
Change ul, ol margin-left to 2em ( #1879 )
2022-11-01 09:41:58 +01:00
prplecake
c199556f64
Fix 'App settings' link in basic web UI ( #1880 )
2022-11-01 09:38:55 +01:00
Jeremy Kescher
41885c8715
Remove/update old "tootsuite" references, except those needed for Docker ( #1860 )
2022-11-01 09:38:05 +01:00
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-10-31 21:37:48 +01:00
Eugen Rochko
8048874a3a
[Glitch] Fix sidebar and tabs on settings on small screens in admin UI
...
Port ad83e64795
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:32:20 +01:00
Eugen Rochko
ebfe393e9c
[Glitch] Fix upload progress not communicating processing phase in web UI
...
Port 30ef110224
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:30:58 +01:00
Eugen Rochko
eb307ec1bd
[Glitch] Fix logged out search and changed logged-in search placeholder
...
Port 55af04b253
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:24:57 +01:00
Claire
eee36267d6
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
Upstream change too close to a glitch-soc-specific string.
The glitch-soc-specific string should not have been in this file, so it
has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
Upstream refactored a part, that as usual is split and duplicated in various
pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
Upstream fixed custom.css path in a different way than we did, went with
upstream's change.
2022-10-30 18:15:28 +01:00
Eugen Rochko
8814a1b949
[Glitch] Fix closed registrations message not appearing in web UI
...
Port 5fa340931e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:49:45 +02:00
Eugen Rochko
9f6c175550
[Glitch] Fix number of uses being shown again on trending hashtags in web UI
...
Port 923f06a07c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:49:45 +02:00
Claire
2cb3dd9364
[Glitch] Change admin announcement edition interface to use datetime-local
...
Port d9d722d74b
to glitch-soc
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:49:45 +02:00
Robert Laurenz
047a2f1f1b
[Glitch] fix(component): adjust style of counter button to fix overflow issue
...
Port 10922294ff
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:49:45 +02:00
Claire
592147b902
Remove local settings items that make no sense anymore
2022-10-28 19:30:51 +02:00
Claire
f405ad69b3
[Glitch] Remove navigation links to /explore when trends are disabled
...
Port 267978d4fe
to glithc-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:26:28 +02:00
Eugen Rochko
89fdfb8fe6
[Glitch] Fix redirecting to /publish
when compose form is visible in web UI
...
Port 5452af2188
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:26:28 +02:00
Eugen Rochko
80b53623e1
[Glitch] Change settings area to be separated into categories in admin UI
...
Port 7c152acb2c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
58e2b0973d
[Glitch] Fix media, following and followers tabs in web UI
...
Port 73de39e632
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
c9d3c7d63a
[Glitch] Fix too many featured tags causing navigation panel scroll in web UI
...
Port 23d367f544
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
7bb1b917b2
[Glitch] Change featured hashtags to be displayed in navigation panel
...
Port aefa9253d6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
2cea6e5564
[Glitch] Remove volume number from hashtags in web UI
...
Port c55219efa8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Takeshi Umeda
8be350cc82
[Glitch] Add featured tags selector for WebUI
...
Port 4c7b5fb6c1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
a2942fd0b8
[Glitch] Fix nofollow
rel being removed in web UI
...
Port 9757c917da
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
e9ccee38a7
[Glitch] Change floating action button to be a button in header in web UI
...
Port 1fd6460b02
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Claire
05c1dd9114
[Glitch] Add closed registrations modal
...
Port 2277913f3f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00