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
a47ecf6e69
clean up new imports in vanilla flavour
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
2022-12-09 16:50:53 +01:00
Claire
e877bb47b8
Merge branch 'main' into glitch-soc/main
2022-12-09 16:48:55 +01:00
Eugen Rochko
97b6e38a7d
New Crowdin updates ( #21954 )
...
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations devise.en.yml (Serbian (Latin))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Chinese Traditional)
* New translations en.json (Serbian (Latin))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Icelandic)
* New translations en.json (Serbian (Latin))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.json (Malay)
* New translations en.json (Malay)
* New translations activerecord.en.yml (Malay)
* New translations devise.en.yml (Malay)
* New translations en.yml (Malay)
* New translations en.yml (Arabic)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Malay)
* New translations en.yml (Greek)
* New translations en.yml (Russian)
* New translations en.yml (Belarusian)
* New translations en.yml (Greek)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Greek)
* New translations en.json (Greek)
* New translations en.yml (Greek)
* New translations en.yml (Belarusian)
* New translations doorkeeper.en.yml (Greek)
* New translations en.yml (Greek)
* New translations en.yml (Malay)
* New translations simple_form.en.yml (Malay)
* New translations en.json (Esperanto)
* New translations en.yml (Malay)
* New translations en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.yml (Belarusian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Belarusian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.json (Occitan)
* New translations en.json (Czech)
* New translations en.yml (Hebrew)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.json (German)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (German)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Thai)
* New translations activerecord.en.yml (Scots)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (Latvian)
* New translations en.json (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations devise.en.yml (Latvian)
* New translations en.yml (Turkish)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Danish)
* New translations en.yml (Thai)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Belarusian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Persian)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Scots)
* New translations en.yml (Belarusian)
* New translations en.yml (Danish)
* New translations en.yml (Scots)
* New translations simple_form.en.yml (Scots)
* New translations en.json (Scots)
* New translations devise.en.yml (Scots)
* New translations doorkeeper.en.yml (Scots)
* New translations en.yml (Greek)
* New translations en.yml (Greek)
* New translations en.yml (Belarusian)
* New translations en.json (German)
* New translations en.yml (Belarusian)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.json (French)
* New translations en.yml (Esperanto)
* New translations en.yml (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Belarusian)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations activerecord.en.yml (Slovak)
* New translations devise.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (Lithuanian)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.json (Esperanto)
* New translations en.json (Vietnamese)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.yml (Latvian)
* New translations en.yml (Belarusian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Hebrew)
* New translations en.yml (Welsh)
* New translations en.yml (Hebrew)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Slovak)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* normalize
* New translations en.yml (Belarusian)
* normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-12-10 00:12:56 +09: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
Claire
c8a1faa86b
Fix potential duplicate statuses in Explore tab ( #22121 )
2022-12-07 14:12:55 +01:00
Juan Xavier Gomez
16fb604c52
[Glitch] Fix hidden overflow on interaction modal
...
Port 21b208afcb
2022-12-07 09:11:57 +01:00
Claire
4642f7d830
[Glitch] Fix UI header overflow on mobile
...
Port 76454cc638
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
2022-12-07 09:09:23 +01:00
Claire
9a3d91f629
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
Fixed a code style issue upstream in a PR that got merged in glitch-soc
earlier.
Changed the code to match upstream's.
2022-12-07 09:03:42 +01:00
Juan Xavier Gomez
21b208afcb
Fix hidden overflow on interaction modal ( #21763 )
...
* Fix hidden overflow on interaction modal
* only update overflow y
2022-12-07 00:40:37 +01:00
Claire
76454cc638
Fix UI header overflow on mobile ( #21783 )
2022-12-07 00:40:18 +01:00
Claire
51098035ed
Fix “Sign up” button with closed registrations not opening modal on mobile ( #22060 )
...
Fixes #20840
2022-12-07 00:25:40 +01:00
Jed Fox
33f06a4ae7
Fix the top border of verified account fields ( #22006 )
2022-12-06 23:54:02 +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
Claire
3be6aff1a8
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-04 17:22:57 +01:00
Nick Schonning
05d4c50f64
Fix spacing warning from ESLint ( #22005 )
2022-12-04 10:56:21 +09:00
Eugen Rochko
6119668e45
New Crowdin updates ( #21599 )
...
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Spanish)
* New translations devise.en.yml (Spanish)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Spanish)
* New translations en.yml (Danish)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Faroese)
* New translations en.yml (Faroese)
* New translations en.json (German)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.json (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations en.json (Czech)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Faroese)
* New translations devise.en.yml (Catalan)
* New translations en.yml (German)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Galician)
* New translations doorkeeper.en.yml (Catalan)
* New translations simple_form.en.yml (German)
* New translations en.json (Danish)
* New translations en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Faroese)
* New translations en.json (Danish)
* New translations en.yml (Japanese)
* New translations en.yml (German)
* New translations en.json (Urdu (Pakistan))
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (German)
* New translations en.json (Urdu (Pakistan))
* New translations simple_form.en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.json (Scots)
* New translations activerecord.en.yml (Scots)
* New translations en.json (Finnish)
* New translations en.json (Finnish)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.yml (Belarusian)
* New translations en.json (Romanian)
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (Galician)
* New translations activerecord.en.yml (Romanian)
* New translations en.yml (Russian)
* New translations en.yml (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.json (Czech)
* New translations en.yml (Bulgarian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Serbian (Cyrillic))
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations en.json (Breton)
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations simple_form.en.yml (Galician)
* New translations devise.en.yml (Italian)
* New translations en.json (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations devise.en.yml (Italian)
* New translations en.json (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Italian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Serbian (Latin))
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Italian)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.json (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Czech)
* New translations en.json (Czech)
* New translations simple_form.en.yml (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Belarusian)
* New translations en.yml (Thai)
* New translations en.json (English, United Kingdom)
* New translations en.yml (Belarusian)
* New translations en.yml (Thai)
* New translations en.yml (Estonian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.json (Russian)
* New translations en.yml (Icelandic)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.yml (Belarusian)
* New translations en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.yml (Thai)
* New translations en.yml (Belarusian)
* New translations en.yml (Thai)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Belarusian)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.yml (Thai)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Belarusian)
* New translations en.yml (Thai)
* New translations en.yml (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Bulgarian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Estonian)
* New translations en.json (Ukrainian)
* New translations en.yml (Estonian)
* New translations en.json (Esperanto)
* New translations en.yml (Estonian)
* New translations en.yml (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (Persian)
* New translations en.yml (Belarusian)
* New translations en.json (Esperanto)
* New translations en.json (Greek)
* New translations en.json (Persian)
* New translations en.json (Scots)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Thai)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Finnish)
* New translations en.yml (Estonian)
* New translations en.yml (German)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.yml (Finnish)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Spanish)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Thai)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (German)
* New translations en.yml (Ukrainian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Spanish, Mexico)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations en.json (German)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (Korean)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Thai)
* New translations en.yml (Japanese)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Belarusian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Estonian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Italian)
* New translations en.yml (Italian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Spanish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Belarusian)
* New translations en.json (Serbian (Cyrillic))
* New translations simple_form.en.yml (Serbian (Cyrillic))
* normalize
* New translations en.json (German)
* New translations en.json (Serbian (Cyrillic))
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-12-02 23:03:06 +09: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
Jeremy Kescher
d23e167d0d
Merge remote-tracking branch 'upstream/main' into develop
2022-11-30 17:56:57 +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
2022-11-30 13:53:38 +01:00
Claire
44c0ba445a
[Glitch] Add mention of the translation provider when translating a post
...
Port 30453fab80
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
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
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
2022-11-30 13:53:38 +01:00
Eugen Rochko
b5ee275ed9
[Glitch] Fix translations not being formatted, other issues in web UI
...
Port 55a2e9b5be
2022-11-30 13:53:38 +01:00
Eugen Rochko
a3052dad04
[Glitch] Add user content translations with configurable backends
...
Port 0d6b878808
2022-11-30 13:53:38 +01:00
Claire
fe111a8bad
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-30 10:29:19 +01:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6
2022-11-29 00:15:08 +01:00
Claire
2d4d99f135
Fix expanded statuses not always being scrolled into view ( #21797 )
2022-11-28 16:42:04 +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
kedama
32b43a96a7
[Glitch] Fix status mismatch of sensitive check
...
Port 14e2354eea
2022-11-28 11:53:21 +01:00
Claire
a2e7997592
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different.
Discarded upstream changes.
2022-11-28 11:33:34 +01:00
Connor Shea
cec1e902e0
Make the 'Trending now' header a link to Explore. ( #21759 )
...
This keeps the same design that exists currently, but makes "Trending
now" into a link to the Hashtags section of "Explore".
Resolves #21758 .
2022-11-27 23:49:32 +01:00
Claire
3ffaa966b0
Fix infinite loading instead of soft 404 for non-existing remote accounts ( #21303 )
...
Fixes #21278 , #21021
2022-11-27 20:48:12 +01:00
James Adney
c0dcf15d1e
fix gif autoplay on iOS ( #21422 )
2022-11-27 20:46:23 +01:00
Claire
fe421257e5
Fix “Share @{name}'s profile” profile menu item ( #21490 )
2022-11-27 20:42:17 +01:00
kedama
14e2354eea
Fix status mismatch of sensitive check ( #21724 )
2022-11-27 20:36: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
Eugen Rochko
3d906d8e62
New Crowdin updates ( #20942 )
...
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations devise.en.yml (Finnish)
* New translations en.json (Norwegian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Esperanto)
* New translations en.yml (Scots)
* New translations en.yml (Italian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (German)
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (Belarusian)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Italian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Estonian)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Scots)
* New translations simple_form.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (Hungarian)
* New translations en.json (Bengali)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Welsh)
* New translations en.yml (Scots)
* New translations doorkeeper.en.yml (German)
* New translations en.yml (Russian)
* New translations en.yml (Estonian)
* New translations en.json (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations en.json (Belarusian)
* New translations en.yml (Belarusian)
* New translations devise.en.yml (Serbian (Latin))
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations devise.en.yml (German)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (Spanish)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Belarusian)
* New translations en.json (German)
* New translations en.yml (Welsh)
* New translations en.json (Asturian)
* New translations simple_form.en.yml (German)
* New translations en.yml (Faroese)
* New translations en.yml (Belarusian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (French, Quebec)
* New translations en.json (Faroese)
* New translations en.yml (Faroese)
* New translations en.json (Belarusian)
* New translations en.yml (Belarusian)
* New translations devise.en.yml (Asturian)
* New translations en.json (Spanish)
* New translations en.json (French, Quebec)
* New translations en.yml (Faroese)
* New translations en.yml (Scots)
* New translations en.json (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (French, Quebec)
* New translations en.yml (Scots)
* New translations en.yml (Belarusian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Faroese)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations simple_form.en.yml (Belarusian)
* New translations devise.en.yml (Serbian (Latin))
* New translations en.yml (Japanese)
* New translations en.json (Serbian (Latin))
* New translations en.yml (Faroese)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Catalan)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Estonian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (Scots)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations en.yml (Belarusian)
* New translations devise.en.yml (German)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Romanian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Scots)
* New translations doorkeeper.en.yml (Estonian)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (German)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations en.yml (Scots)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations en.yml (Scots)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.yml (Scots)
* New translations en.yml (Belarusian)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.yml (Scots)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations en.yml (Scots)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations en.yml (Czech)
* New translations en.json (Czech)
* New translations en.yml (Bulgarian)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Scots)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations en.json (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Faroese)
* New translations en.yml (Faroese)
* New translations en.yml (Scots)
* New translations en.yml (Scots)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (Czech)
* New translations en.json (Malayalam)
* New translations en.yml (Scots)
* New translations en.json (Czech)
* New translations en.json (Hindi)
* New translations en.json (Malayalam)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations en.yml (Scots)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations en.json (Czech)
* New translations en.json (Serbian (Cyrillic))
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Scots)
* New translations en.json (Czech)
* New translations en.json (Frisian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Scots)
* New translations en.yml (Belarusian)
* New translations devise.en.yml (Frisian)
* New translations en.json (Czech)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.yml (Faroese)
* New translations en.yml (Belarusian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Bulgarian)
* New translations en.json (Italian)
* New translations en.json (Ukrainian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Faroese)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations devise.en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Italian)
* New translations en.json (Ukrainian)
* New translations en.json (Spanish, Mexico)
* New translations simple_form.en.yml (Ukrainian)
* New translations activerecord.en.yml (Italian)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* Add `app/javascript/mastodon/locales/whitelist_be.json`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-25 09:40:05 +09: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
367db8222f
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-17 21:56:05 +01:00
Eugen Rochko
0a78631e86
New Crowdin updates ( #20759 )
...
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (German)
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.json (Dutch)
* New translations en.json (Esperanto)
* New translations en.json (Dutch)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Irish)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.json (Scots)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Scots)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.json (Lithuanian)
* New translations en.yml (Galician)
* New translations en.json (Icelandic)
* New translations en.yml (Galician)
* New translations en.json (Icelandic)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Portuguese)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Georgian)
* New translations en.yml (Swedish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Korean)
* New translations en.yml (Japanese)
* New translations en.yml (German)
* New translations en.yml (Arabic)
* New translations en.yml (Czech)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.yml (Spanish)
* New translations en.yml (Turkish)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Romanian)
* New translations en.yml (French)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Italian)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.yml (Finnish)
* New translations en.yml (Hebrew)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Silesian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Taigi)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Asturian)
* New translations en.yml (Burmese)
* New translations en.yml (Igbo)
* New translations en.yml (French, Quebec)
* New translations en.json (Faroese)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (Occitan)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Bengali)
* New translations en.yml (Telugu)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Kannada)
* New translations en.yml (Welsh)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Thai)
* New translations en.yml (Portuguese)
* New translations en.yml (Georgian)
* New translations en.yml (Korean)
* New translations en.yml (Lithuanian)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Russian)
* New translations en.yml (Italian)
* New translations en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Japanese)
* New translations en.yml (Armenian)
* New translations en.json (Hebrew)
* New translations en.yml (French)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Hungarian)
* New translations en.yml (Arabic)
* New translations en.yml (Bulgarian)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Basque)
* New translations en.yml (Finnish)
* New translations en.yml (Irish)
* New translations en.yml (Hebrew)
* New translations en.yml (Indonesian)
* New translations en.yml (Ido)
* New translations en.yml (Persian)
* New translations simple_form.en.yml (Polish)
* New translations en.yml (Breton)
* New translations en.yml (Sinhala)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Malay)
* New translations en.yml (Corsican)
* New translations en.yml (Occitan)
* New translations en.yml (Sardinian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kabyle)
* New translations en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.yml (French, Quebec)
* New translations en.json (Faroese)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.yml (Korean)
* New translations en.yml (Dutch)
* New translations en.yml (Slovenian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Kurmanji (Kurdish))
* normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-17 21:59:15 +09: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
aec61a703f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how docker images were built, including how
they were cached.
I don't know much about it, so applied upstream's changes.
- `app/controllers/admin/domain_blocks_controller.rb`:
The feature, that was in glitch-soc, got backported upstream.
It also had a few fixes upstream, so those have been ported!
- `app/javascript/packs/admin.js`:
Glitch-soc changes have been backported upstream. As a result,
some code from `app/javascript/core/admin.js` got added upstream.
Kept our version since our shared Javascript already has that feature.
- `app/models/user.rb`:
Upstream added something to distinguish unusable and unusable-because-moved
accounts, while glitch-soc considers moved accounts usable.
Took upstream's code for `functional_or_moved?` and made `functional?`
call it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream cleaned up code style a bit, on a line that we had custom changes
for.
Applied upstream's change while keeping our change.
- `config/initializers/content_security_policy.rb`:
Upstream adopted one CSP directive we already had.
The conflict is because of our files being structurally different, but the
change itself was already part of glitch-soc.
Kept our version.
2022-11-17 12:01:37 +01:00
Claire
585cc1a604
Remove use of DOMParser in front-end emoji rewriting code ( #20758 )
...
* Add jstest for node ordering in emojify
* Remove use of DOMParser in front-end emoji rewriting code
2022-11-17 11:24:59 +01:00
lenore gilbert
c373148b3d
Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes ( #20597 )
...
* Allow import/export of instance-level domain blocks/allows (#1754 )
* Allow import/export of instance-level domain blocks/allows.
Fixes #15095
* Pacify circleci
* Address simple code review feedback
* Add headers to exported CSV
* Extract common import/export functionality to
AdminExportControllerConcern
* Add additional fields to instance-blocked domain export
* Address review feedback
* Split instance domain block/allow import/export into separate pages/controllers
* Address code review feedback
* Pacify DeepSource
* Work around Paperclip::HasAttachmentFile for Rails 6
* Fix deprecated API warning in export tests
* Remove after_commit workaround
(cherry picked from commit 94e98864e3#1773 )
* Move glitch-soc-specific strings to glitch-soc-specific locale files
* Add confirmation page when importing blocked domains
(cherry picked from commit b91196f4b775279377589094c2f52c26ff48ee48
2022-11-17 11:05:09 +01:00
Levi Bard
654d348aac
Make the button that expands the publish form differentiable from the button that publishes a post ( #20864 )
2022-11-17 10:53:38 +01:00
nyura123dev
aaca78da78
Fix safari explore disappearing tabs ( #20917 )
...
* fix disappearing Explore tabs on Safari
* fix lint
Co-authored-by: nyura <nyura@hidden.com>
2022-11-17 08:54:43 +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
82e063ac6c
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-11-16 17:43:21 +01:00
Claire
1901829f9a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Our config file is pretty different from upstream.
Upstream changed CSP directive `script-src` to include
`wasm-unsafe-eval` instead of `unsafe-eval`, which we
did not include.
Added `wasm-unsafe-eval` to `script-src` to fix
execution of the OCR web worker.
- `package.json`:
Upstream updated a dependency (`array-includes`) textually
adjacent to a glitch-soc-only dependency (`atrament`).
Updated `array-includes` as upstream did.
2022-11-16 08:30:00 +01:00
Eugen Rochko
a1738f8991
New Crowdin updates ( #20580 )
...
* New translations en.json (Catalan)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Ukrainian)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Hungarian)
* New translations en.json (Slovak)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Irish)
* New translations en.yml (Norwegian)
* New translations en.yml (German)
* New translations en.json (Romanian)
* New translations en.yml (Danish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.yml (Danish)
* New translations en.json (Catalan)
* New translations en.yml (Norwegian)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian)
* New translations en.json (Catalan)
* New translations en.json (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Latvian)
* New translations en.json (Irish)
* New translations en.json (Swedish)
* New translations en.yml (Galician)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.json (Kabyle)
* New translations en.yml (Welsh)
* New translations en.json (Breton)
* New translations en.json (Kabyle)
* New translations en.yml (Kabyle)
* New translations simple_form.en.yml (Kabyle)
* New translations en.json (Malay)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Malay)
* New translations activerecord.en.yml (Malay)
* New translations devise.en.yml (Malay)
* New translations doorkeeper.en.yml (Malay)
* New translations en.json (Malay)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Malay)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Malay)
* New translations en.yml (Dutch)
* New translations en.json (Malay)
* New translations en.yml (Malay)
* New translations en.json (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Malay)
* New translations devise.en.yml (Welsh)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations devise.en.yml (Malay)
* New translations en.json (Vietnamese)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Malay)
* New translations devise.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Norwegian)
* New translations devise.en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Norwegian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Esperanto)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Norwegian)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Norwegian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations en.json (Asturian)
* New translations en.json (Asturian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-15 14:37:37 +09:00
Eugen Rochko
17bd9a87b9
Fix wrong color on mentions hidden behind content warning in web UI ( #20724 )
2022-11-15 02:58:00 +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
2022-11-14 22:40:37 +01:00
Claire
db16d7d9de
Fix nodes order being sometimes mangled when rewriting emoji ( #20677 )
...
* Fix front-end emoji tests
* Fix nodes order being sometimes mangled when rewriting emoji
2022-11-14 22:33:52 +01:00
Claire
8aa56aedfd
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji
...
Port ccbca50a25
2022-11-14 22:32:00 +01:00
Claire
b5698af25f
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-14 22:30:30 +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
ccbca50a25
Fix nodes order being sometimes mangled when rewriting emoji ( #20677 )
...
* Fix front-end emoji tests
* Fix nodes order being sometimes mangled when rewriting emoji
2022-11-14 22:14:55 +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
Claire
767630be24
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
Upstream removed blank lines.
2022-11-14 20:27:31 +01:00
Claire
625e086996
Fix emoji substitution not applying only to text nodes in Web UI ( #20640 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 20:26:03 +01:00
Claire
96c1ef6d50
[Glitch] Fix media metadata being only editable once
...
Port 2d54986a03
2022-11-14 18:32:33 +01:00
Claire
9ab4e3fc6d
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-14 18:31:04 +01:00
Claire
2d54986a03
Fix media metadata being only editable once ( #20665 )
2022-11-14 17:52:31 +01:00
trwnh
c31e756644
[Glitch] Move V2 Filter methods under /api/v2 prefix
...
Port b59ce0a60f
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
2022-11-14 09:16:41 +01:00
Samuel Kaiser
9fd866f38e
[Glitch] Stick batch table toolbar to the top
...
Port e62b514e95
2022-11-14 09:05:56 +01:00
Claire
32c70d2f09
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
2022-11-14 08:35:55 +01:00
trwnh
b59ce0a60f
Move V2 Filter methods under /api/v2 prefix ( #20622 )
...
* Move V2 Filter methods under /api/v2 prefix
* move over the tests too
2022-11-14 08:34:07 +01:00
Eugen Rochko
523e106cbf
Fix style of username in navigation bar above compose form in web UI ( #20628 )
...
Regression from #20540
2022-11-14 08:06:17 +01:00
Eugen Rochko
6da9df774e
Fix dropdown menu on profiles not being accessible on narrow screens in web UI ( #20620 )
2022-11-14 06:05:10 +01:00
Eugen Rochko
d0b7bd4250
Fix wrong cut-off point for "Read more" in web UI ( #20599 )
2022-11-14 00:43:24 +01:00
Eugen Rochko
24b2c60beb
Fix icons having an image role ( #20600 )
2022-11-14 00:38:56 +01:00
trwnh
07229089a6
Change in-app links to keep you in-app ( #20540 )
...
* Change in-app links to keep you in-app
* refactor Permalink into Link
* rewrite link hrefs in status content
* please linter
* please linter again
2022-11-13 21:10:20 +01:00
Samuel Kaiser
e62b514e95
Stick batch table toolbar to the top ( #20442 )
...
Fixes #20441
2022-11-13 21:02:28 +01:00
Eugen Rochko
cf36ee99bb
New Crowdin updates ( #20476 )
...
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations en.json (Japanese)
* New translations en.yml (Czech)
* New translations en.json (Esperanto)
* New translations en.yml (Norwegian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Latvian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Norwegian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Malayalam)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Thai)
* New translations devise.en.yml (Welsh)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.yml (Irish)
* New translations en.json (Norwegian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Norwegian)
* New translations en.json (Finnish)
* New translations en.json (Norwegian)
* New translations simple_form.en.yml (Norwegian)
* New translations en.yml (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Arabic)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.yml (Greek)
* New translations en.yml (German)
* New translations en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Finnish)
* New translations en.yml (Basque)
* New translations en.yml (Frisian)
* New translations en.yml (Danish)
* New translations en.yml (Catalan)
* New translations en.yml (Bulgarian)
* New translations en.yml (Arabic)
* New translations en.yml (Afrikaans)
* New translations en.yml (French)
* New translations en.yml (Romanian)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations en.yml (Armenian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Swedish)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Slovak)
* New translations en.yml (Japanese)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations en.yml (Punjabi)
* New translations en.yml (Norwegian)
* New translations en.yml (Dutch)
* New translations en.yml (Macedonian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Korean)
* New translations en.yml (Georgian)
* New translations en.yml (Italian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Turkish)
* New translations en.yml (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sinhala)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Burmese)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Bengali)
* New translations en.yml (Hindi)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Malay)
* New translations en.yml (Malayalam)
* New translations en.yml (Telugu)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Igbo)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Afrikaans)
* New translations en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Catalan)
* New translations en.yml (Greek)
* New translations en.yml (Italian)
* New translations en.yml (Slovenian)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Basque)
* New translations en.yml (Norwegian)
* New translations en.yml (Portuguese)
* New translations en.yml (Icelandic)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (French)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Esperanto)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Hebrew)
* New translations en.yml (Norwegian)
* New translations en.yml (German)
* New translations en.json (Spanish)
* New translations en.yml (Finnish)
* New translations en.json (Norwegian)
* New translations en.yml (Latvian)
* New translations en.yml (Esperanto)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Esperanto)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-14 01:14:31 +09: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
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
2022-11-12 14:01:47 +01:00
Cutls
e2315876f4
[Glitch] Do not show drag&drop dialog when not logined
...
Port 553b169d48
2022-11-12 13:59:03 +01:00
Claire
8ac4165c72
[Glitch] Remove “No description added” media warning in edit mode
...
Port 5e796dc6f8
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
2022-11-12 13:56:49 +01:00
Connor Shea
d525ae4bdd
[Glitch] Only remove padding when listing applications
...
Port cf4992c918
2022-11-12 13:55:43 +01:00
Yamagishi Kazutoshi
0071582c6d
[Glitch] Delay workbox import
...
Port 53d26cfc1c
2022-11-12 13:55:02 +01:00
Claire
5394ca6807
[Glitch] Fix unnecessary service worker registration and preloading when logged out
...
Port 894ce3726a
2022-11-12 13:54:09 +01:00
Claire
487689f062
[Glitch] Remove preview cards from fav and boost notifications
...
Port 99734ac936
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
2022-11-12 13:48:42 +01:00
Claire
93912f0498
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Conflict because we (glitch-soc) have disabled trending of posts without
review.
Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
Just an extra setting in glitch-soc.
Kept that extra setting.
2022-11-12 13:28:03 +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
2022-11-12 10:59:17 +01:00
Claire
fdfacb0ec0
Revert "Revert "Change "Allow trends without prior review" setting to include statuses ( #17977 )""
...
This reverts commit bfc539cfb4
2022-11-12 10:17:22 +01:00
Claire
73b68fcabb
Fix styling of advanced options dropdown ( #1916 )
...
Fixes #1914
2022-11-12 09:59:28 +01:00
Eugen Rochko
e1af21cfd0
New Crowdin updates ( #20258 )
...
* New translations en.json (Asturian)
* New translations en.yml (Telugu)
* New translations en.yml (Tamil)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.json (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Asturian)
* New translations en.json (Occitan)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Sinhala)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Sanskrit)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Croatian)
* New translations activerecord.en.yml (Icelandic)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Romanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Irish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Corsican)
* New translations en.yml (Burmese)
* New translations en.yml (Igbo)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.json (Hungarian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Slovenian)
* New translations en.json (Swedish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Korean)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Romanian)
* New translations en.json (Catalan)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Norwegian)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Arabic)
* New translations en.json (Catalan)
* New translations en.yml (Korean)
* New translations en.json (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Thai)
* New translations en.json (Bulgarian)
* New translations en.yml (Ukrainian)
* New translations en.json (Indonesian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (German)
* New translations en.json (Portuguese)
* New translations en.json (Spanish)
* New translations en.json (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Tamil)
* New translations en.json (Chinese Traditional)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.json (Norwegian)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Korean)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Basque)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Occitan)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.json (French)
* New translations en.yml (Hebrew)
* New translations en.json (Norwegian)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations en.json (Romanian)
* New translations en.json (Russian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Chinese Traditional)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-12 15:56:25 +09:00
Claire
93a6ebc83d
Fix WebUI crash when listing server blocks and rationale is not available ( #20408 )
...
Regression from #20391
Fixes #20405
2022-11-11 21:23:03 +01:00
Claire
31005aad12
Add the ability to edit media attachment metadata for any unattached media ( #20402 )
2022-11-11 21:22:17 +01:00
Cutls
553b169d48
Do not show drag&drop dialog when not logined ( #20400 )
...
* Cannot upload until login
* and do not fire upload
* change username props to context
2022-11-11 21:19:48 +01:00
Claire
5e796dc6f8
Remove “No description added” media warning in edit mode ( #20393 )
...
Editing media metadata is not currently possible in edit mode, the button would
open the modal but saving the changes would error out.
2022-11-11 09:20:24 +01:00
Eugen Rochko
53028af10e
Bump version to 4.0.0rc3 ( #20378 )
2022-11-11 08:39:38 +01:00
Eugen Rochko
6774c339b2
Fix domain blocks on about page not working well on small screens in web UI ( #20391 )
2022-11-11 08:26:58 +01:00
Connor Shea
cf4992c918
Only remove padding when listing applications ( #20382 )
...
This prevents styling issues on the Authorization page.
2022-11-11 02:55:20 +01:00
Yamagishi Kazutoshi
53d26cfc1c
Delay workbox import ( #20376 )
2022-11-11 01:33:59 +01:00
Jeremy Kescher
4886f1955b
Merge remote-tracking branch 'upstream/main' into develop
2022-11-10 21:11:05 +01:00
Claire
894ce3726a
Fix unnecessary service worker registration and preloading when logged out ( #20341 )
2022-11-10 20:26:04 +01:00
Claire
8e1e7fe2e0
Add old logo files back ( #20332 )
...
Fixes #20221
2022-11-10 20:25:12 +01:00
Claire
99734ac936
Remove preview cards from fav and boost notifications ( #20335 )
...
Fixes #20329
2022-11-10 19:36:12 +01:00
atsuchan
6df9d388e7
Update Flavour 'ja' Translation ( #1911 )
2022-11-10 17:26:28 +01:00
Claire
89a6b76f99
Fix color of the “No description added“ media upload warning on light theme ( #20328 )
2022-11-10 14:21:31 +01:00
Eugen Rochko
c4d2c72924
[Glitch] Add option to open original page in dropdowns of remote content in web UI
...
Port ef582dc4f2
2022-11-10 11:06:56 +01:00
Sasha Sorokin
099b3011aa
[Glitch] Remove aria-pressed where it's redundant
...
Port d055d75172
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
2022-11-10 10:15:21 +01:00
Effy Elden
c722c4cce8
[Glitch] Remove unused timeline_container to fix linter errors
...
Port 8fdbb4d00d
2022-11-10 09:54:19 +01:00
Eugen Rochko
41ea39903d
[Glitch] Fix confusing wording in interaction modal in web UI
...
Port 16122761c5
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
2022-11-10 09:51:46 +01:00
Claire
c118918520
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
Not a real conflict, just upstream changing a line too close to
a glitch-soc-specific validation.
Applied upstream changes.
- `app/models/public_feed.rb`:
Not a real conflict, just upstream changing a line too close to
a glitch-soc-specific parameter documentation.
Applied upstream changes.
2022-11-10 09:36:47 +01:00
Effy Elden
8fdbb4d00d
Remove unused timeline_container to fix linter errors ( #20305 )
2022-11-10 08:50:45 +01:00
Eugen Rochko
7bdb2433f1
Change larger reblogs/favourites numbers to be shortened in web UI ( #20303 )
2022-11-10 08:49:59 +01:00
Eugen Rochko
16122761c5
Fix confusing wording in interaction modal in web UI ( #20302 )
2022-11-10 08:49:48 +01:00
Eugen Rochko
ef582dc4f2
Add option to open original page in dropdowns of remote content in web UI ( #20299 )
...
Change profile picture click to open profile picture in modal in web UI
2022-11-10 08:49:35 +01:00
Eugen Rochko
e37e8deb0f
Fix profile header being cut off in light theme in web UI ( #20298 )
2022-11-10 07:32:37 +01:00
Eugen Rochko
cd0a87f170
New Crowdin updates ( #20016 )
...
* New translations en.json (Telugu)
* New translations en.yml (Telugu)
* New translations en.yml (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.yml (Kabyle)
* New translations en.json (Igbo)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Frisian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Silesian)
* New translations en.json (Silesian)
* New translations en.yml (Taigi)
* New translations en.json (Taigi)
* New translations en.json (Kabyle)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Sanskrit)
* New translations en.json (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.json (Sardinian)
* New translations en.yml (Corsican)
* New translations en.json (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Igbo)
* New translations en.json (Hebrew)
* New translations en.json (Polish)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Latvian)
* New translations en.json (Icelandic)
* New translations en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.json (Slovenian)
* New translations en.json (Russian)
* New translations en.json (Italian)
* New translations en.json (German)
* New translations en.yml (Hebrew)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.yml (Danish)
* New translations en.json (Afrikaans)
* New translations en.json (Spanish)
* New translations en.json (French)
* New translations en.json (Dutch)
* New translations simple_form.en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations en.json (Spanish, Argentina)
* New translations activerecord.en.yml (Hebrew)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Occitan)
* New translations en.json (Welsh)
* New translations en.yml (Chinese Traditional)
* New translations en.json (German)
* New translations en.json (Chinese Traditional)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese)
* New translations en.yml (Hebrew)
* New translations en.json (Finnish)
* New translations en.json (Japanese)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Thai)
* New translations en.json (Greek)
* New translations en.yml (Hebrew)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Occitan)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Thai)
* New translations en.json (Catalan)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Polish)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations en.json (Irish)
* New translations activerecord.en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (Danish)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Czech)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Albanian)
* New translations en.json (Arabic)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Bulgarian)
* New translations en.json (Macedonian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Bulgarian)
* New translations devise.en.yml (Polish)
* New translations en.json (Bulgarian)
* New translations en.json (Hungarian)
* New translations en.yml (Japanese)
* New translations en.json (Norwegian)
* New translations en.json (Bulgarian)
* New translations en.json (Korean)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Esperanto)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Vietnamese)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.yml (Romanian)
* New translations en.yml (Frisian)
* New translations en.json (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Norwegian)
* New translations en.json (Swedish)
* New translations en.json (Occitan)
* New translations en.json (Afrikaans)
* New translations en.json (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Swedish)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Welsh)
* New translations en.yml (Esperanto)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (French)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Norwegian)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (Norwegian)
* New translations activerecord.en.yml (Norwegian)
* New translations devise.en.yml (Norwegian)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Norwegian)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations doorkeeper.en.yml (English, United Kingdom)
* New translations activerecord.en.yml (English, United Kingdom)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.json (Bulgarian)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.json (Bulgarian)
* New translations en.yml (Irish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (Bulgarian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Igbo)
* New translations en.json (Thai)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Irish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations en.json (Esperanto)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Breton)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations en.yml (Czech)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Esperanto)
* New translations en.json (Breton)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Bulgarian)
* New translations en.json (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Occitan)
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-10 00:43:48 +09:00
Jeremy Kescher
5b797a34df
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 23:30:01 +01:00
Sasha Sorokin
d055d75172
Remove aria-pressed where it's redundant ( #19912 )
...
This commit removes aria-pressed attribute from all elements which
contents or other descriptive attributes change in active state,
effectively replacing the meaning of the button, in which case
aria-pressed, an attribute specified whether the button is currently
pressed, would create a confusion. (Spoiler: it's everywhere).
See https://github.com/mastodon/mastodon/issues/13545#issuecomment-1304886969
2022-11-08 17:31:32 +01:00
Claire
9b6d6a919f
[Glitch] Fix redrafting a currently-editing post not leaving edit mode
...
Port 782b6835f7
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
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
2022-11-08 15:47:48 +01:00
Claire
a8c854b3ea
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-08 15:44:57 +01:00
Jeremy Kescher
ffa93fa157
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 07:26:59 +01:00
Claire
782b6835f7
Fix redrafting a currently-editing post not leaving edit mode ( #20023 )
2022-11-08 04:06:54 +01:00
Claire
608343c135
Fix opening the language picker scrolling the single-column view to the top ( #19983 )
...
Fixes #19915
2022-11-08 03:52:52 +01:00
Zach Flanders
0beb095a4b
Fix spoiler buttons css not rendering correct color in light theme ( #19960 )
...
* Updating status__content__spoiler-link css for mastodon-light theme to ensure correct rendering precedence
* Adding focus css selector to status__content__spoiler-link mastodon-light theme
* reformatting code to match convention of having css selectors on separate lines
* fixing code format for scss linting issue
2022-11-07 22:37:36 +01:00
Claire
2bc22be66c
[Glitch] Add aria-expanded to content warning toggle button
...
Port 622f603ac7
2022-11-07 20:04:31 +01:00
Claire
be7032b9cf
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-07 19:53:30 +01:00
Eugen Rochko
86a80acf40
New Crowdin updates ( #19771 )
...
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Japanese)
* New translations en.yml (Armenian)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (Esperanto)
* New translations en.yml (Turkish)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Romanian)
* New translations en.yml (Hungarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Irish)
* New translations en.yml (Hebrew)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Malayalam)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Burmese)
* New translations en.yml (Breton)
* New translations en.yml (Tatar)
* New translations en.yml (Indonesian)
* New translations en.yml (Kazakh)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Estonian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Igbo)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Dutch)
* New translations en.yml (Polish)
* New translations en.yml (Swedish)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Dutch)
* New translations en.yml (Ukrainian)
* New translations en.yml (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations en.json (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations en.json (Japanese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations en.json (Afrikaans)
* New translations en.json (Galician)
* New translations en.yml (Turkish)
* New translations en.json (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Afrikaans)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (French)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (French)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations en.yml (Spanish)
* New translations en.yml (Japanese)
* New translations en.json (Occitan)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (Irish)
* New translations en.json (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (German)
* New translations en.yml (Spanish)
* New translations en.json (Greek)
* New translations en.json (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Asturian)
* New translations en.json (Danish)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Korean)
* New translations en.json (French)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Asturian)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations en.json (German)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (French)
* New translations en.yml (Dutch)
* New translations en.json (Welsh)
* New translations en.json (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.json (Dutch)
* New translations en.json (French)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (German)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations activerecord.en.yml (Ukrainian)
* New translations en.json (Russian)
* New translations en.json (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Bulgarian)
* New translations en.json (Japanese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Japanese)
* New translations devise.en.yml (Finnish)
* New translations en.json (Hebrew)
* New translations en.yml (German)
* New translations en.json (Bulgarian)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Japanese)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Hebrew)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.json (Danish)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.json (Bulgarian)
* New translations en.json (Frisian)
* New translations en.json (Russian)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Russian)
* New translations devise.en.yml (Frisian)
* New translations en.yml (Czech)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Frisian)
* New translations en.json (Italian)
* New translations en.json (Polish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-08 00:06:48 +09:00
Claire
622f603ac7
Add aria-expanded to content warning toggle button ( #19975 )
...
Fixes #19920
2022-11-07 15:48:46 +01:00
Sunny Ripert
8515bc7962
Add form element on focal point modal ( #19834 )
...
* Add form element on focal point modal
* Add type="button" for detection button
2022-11-07 15:41:42 +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
2022-11-07 07:55:44 +01:00
Sunny Ripert
71e68dac4e
[Glitch] Fix JavaScript console error on Getting Started column
...
Port ffe735344b
2022-11-07 07:54:18 +01:00
Sunny Ripert
d13a2f7901
[Glitch] Fix console log error on column settings load
...
Port 34c269310d
2022-11-07 07:53:20 +01:00
Claire
6c0a6097ff
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-07 07:50:47 +01:00
Sunny Ripert
4b7f32a2a6
Fix double button to clear emoji search input ( #19888 )
2022-11-07 03:40:54 +01:00
Sunny Ripert
ffe735344b
Fix JavaScript console error on Getting Started column ( #19891 )
...
* Fix JavaScript console error on Getting Started column
* Update app/javascript/mastodon/components/column_header.js
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
2022-11-07 03:40:04 +01:00
Sunny Ripert
34c269310d
Fix console log error on column settings load ( #19886 )
2022-11-07 03:39:48 +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
2022-11-06 17:29:04 +01:00
Eugen Rochko
cbfa5ad5dd
[Glitch] Fix wrong colors in the high-contrast theme
...
Port 1c3192df6b
2022-11-06 17:29:04 +01:00
Eugen Rochko
c883799a1f
[Glitch] Change design of link footer
...
Port 2d9a85db6e
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
2022-11-06 17:29:04 +01:00
Claire
b6c0ef70a2
[Glitch] Change sign-in banner to reflect disabled or moved account status
...
Port 312d616371
2022-11-06 17:29:04 +01:00
Eugen Rochko
0437159056
[Glitch] Fix showing profile's featured tags on individual statuses
...
Port bfafb114a2
2022-11-06 17:29:04 +01:00
Claire
fa293f03fa
[Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
...
Port 7c8e2b9859
2022-11-06 17:29:04 +01:00
Jeremy Kescher
996267fc8b
Fix vanilla flavor being broken due to incorrect imports
2022-11-06 13:03:02 +01:00
Eugen Rochko
01e0cb1cd5
[Glitch] Add assets from Twemoji 14.0
...
Port e02812d5b6
2022-11-06 10:50:23 +01:00
Sunny Ripert
8368f4857c
[Glitch] Fix JavaScript console warning when loading notifications
...
Port 887976814a
2022-11-06 10:47:31 +01:00
Sunny Ripert
93ccb4a29e
[Glitch] Fix JavaScript console error on upload editing status
...
Port c95d9aab56
2022-11-06 10:46:03 +01:00
Eugen Rochko
81334e2bfb
[Glitch] Fix limited account hint referencing "your" server when logged out
...
Port 139ea4c981
2022-11-06 10:45:00 +01:00
