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
2 years ago
Jeremy Kescher
996267fc8b
Fix vanilla flavor being broken due to incorrect imports
2 years ago
0ad919b192
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
glitch-soc change because of having changed the default number of
available poll options.
Applied upstream's changes while keeping glitch-soc's default number of
poll options.
- `public/oops.png`:
We had a minor graphics change, probably not worth diverging from upstream.
Took upstream version.
2 years ago
Jeremy Kescher
5ab1ac972b
Show about tab if explore tab wouldn't show any statuses
2 years ago
Jeremy Kescher
b0be4764b4
Keep showing explore tab, only statuses are hidden
2 years ago
Jeremy Kescher
da8c3bed5c
Don't show trending statuses in public web UI
2 years ago
ca8d52c2a4
Change design of new list form in web UI ( #19801 )
2 years ago
d1de7fb7fa
Fix rendering empty avatar in web UI ( #19798 )
2 years ago
a442f481f8
Fix missing interpolation of domain in disabled account banner in web UI ( #19788 )
2 years ago
7c65f52692
Change design of moved account banner in web UI ( #19790 )
2 years ago
312d616371
Change sign-in banner to reflect disabled or moved account status ( #19773 )
2 years ago
887976814a
Fix JavaScript console warning when loading notifications ( #19772 )
2 years ago
c95d9aab56
Fix JavaScript console error on upload editing status ( #19769 )
2 years ago
9616f5bb22
Fix compose form submission reloading web interface ( #19762 )
...
* Fix compose form submission reloading web interface
Fix regression introduced by #19742
* Fix various compose form buttons being handled like submit buttons
* Fix coding style issue
* Fix missing onClick prop check
2 years ago
1e7ea50f4c
New Crowdin updates ( #19627 )
...
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Armenian)
* New translations en.yml (Irish)
* New translations en.json (Thai)
* New translations en.json (Sinhala)
* New translations en.json (Bulgarian)
* New translations en.json (Ido)
* New translations en.json (German)
* New translations en.json (Tamil)
* New translations en.json (Esperanto)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Albanian)
* New translations en.json (Japanese)
* New translations en.json (Indonesian)
* New translations en.json (Romanian)
* New translations en.json (Irish)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Corsican)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Sardinian)
* New translations en.json (Breton)
* New translations en.json (Sanskrit)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations en.json (Burmese)
* New translations en.json (Cornish)
* New translations en.json (Malayalam)
* New translations en.json (Persian)
* New translations en.json (Estonian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Latvian)
* New translations en.json (Tatar)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Welsh)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Japanese)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Portuguese)
* New translations en.json (Chinese Simplified)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations activerecord.en.yml (Irish)
* New translations devise.en.yml (Irish)
* New translations en.json (Greek)
* New translations en.json (Irish)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (Italian)
* New translations en.json (Vietnamese)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Esperanto)
* New translations en.json (Albanian)
* New translations en.json (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Slovenian)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (German)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Breton)
* New translations en.json (Dutch)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.json (French)
* 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 (Korean)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* 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 simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Afrikaans)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Basque)
* 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 (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 (Indonesian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.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 (Sardinian)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* 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 (Latvian)
* 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 en.json (Persian)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Irish)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations activerecord.en.yml (Irish)
* New translations en.json (Polish)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Dutch)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations doorkeeper.en.yml (Swedish)
* New translations activerecord.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Norwegian Nynorsk)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Swedish)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Polish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Czech)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
0165449e3a
A11y: Explicit <form> element around compose area ( #19742 )
2 years ago
e02812d5b6
Add assets from Twemoji 14.0 ( #19733 )
2 years ago
139ea4c981
Fix limited account hint referencing "your" server when logged out ( #19711 )
2 years ago
bfafb114a2
Fix showing profile's featured tags on individual statuses ( #19712 )
2 years ago
5825402ed5
Fix design of verified links in web UI ( #19709 )
2 years ago
7c8e2b9859
Fix handling of duplicate and out-of-order notifications in WebUI ( #19693 )
...
* Fix handling of duplicate notifications from streaming server
* Fix handling of duplicate and out-of-order notifications when polling/expanding
Fixes #19615
2 years ago
cbb440bbc2
Fix being unable to withdraw follow request when confirmation modal is disabled ( #19687 )
...
* Fix being unable to withdraw follow request when unfollow confirmation modal is disabled
Fixes #19569
* Fix “unfollow” being inadequately used for withdrawing follow requests from account card
2 years ago
Jeremy Kescher
c3bffb95b6
Vanilla flavor: Reduce amount of data stored in initial state for min_options on polls
2 years ago
Jeremy Kescher
3d2fc73ecb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# app/javascript/mastodon/initial_state.js
2 years ago
74d40c7d8f
Fix edits not being immediately reflected ( #19673 )
...
Fixes #19546
2 years ago
56eb1da0f5
Fix CharacterCount in vanilla UI ( #1883 )
2 years ago
fea142fb9a
New Crowdin updates ( #19517 )
...
* New translations en.json (Persian)
* New translations en.json (Spanish, Argentina)
* New translations simple_form.en.yml (Arabic)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Turkish)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations activerecord.en.yml (Spanish)
* New translations en.json (Czech)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Catalan)
* New translations en.json (Greek)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Polish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Basque)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Polish)
* New translations en.yml (German)
* New translations en.json (Vietnamese)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (German)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Romanian)
* New translations en.json (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Afrikaans)
* New translations en.json (German)
* New translations en.json (Romanian)
* New translations en.json (Afrikaans)
* New translations en.json (German)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations en.yml (German)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations en.json (Polish)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Portuguese)
* New translations simple_form.en.yml (German)
* New translations en.json (Bulgarian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Danish)
* New translations en.json (Finnish)
* New translations en.json (Dutch)
* New translations en.json (Danish)
* New translations simple_form.en.yml (Danish)
* New translations activerecord.en.yml (Danish)
* New translations en.json (Dutch)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Chinese Simplified)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.yml (German)
* New translations en.json (French)
* New translations en.json (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations en.json (Kabyle)
* New translations en.yml (Kabyle)
* New translations simple_form.en.yml (Kabyle)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.json (French)
* New translations en.yml (Catalan)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations en.yml (German)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.yml (Italian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Greek)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Portuguese)
* New translations en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Polish)
* New translations en.yml (Latvian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Asturian)
* New translations simple_form.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Basque)
* New translations en.json (Chinese Simplified)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Basque)
* New translations en.yml (Spanish)
* New translations en.json (Spanish)
* New translations en.yml (Basque)
* New translations activerecord.en.yml (Spanish)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Ukrainian)
* New translations activerecord.en.yml (Ukrainian)
* New translations en.json (German)
* New translations en.yml (Ukrainian)
* New translations en.json (Slovenian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Japanese)
* New translations en.json (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.json (Japanese)
* New translations en.json (Indonesian)
* New translations simple_form.en.yml (German)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Indonesian)
* New translations en.yml (Russian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations simple_form.en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations devise.en.yml (Burmese)
* New translations doorkeeper.en.yml (Burmese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations activerecord.en.yml (Indonesian)
* New translations en.json (Burmese)
* New translations en.json (German)
* New translations en.json (Indonesian)
* New translations en.json (Swedish)
* New translations en.json (Icelandic)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.json (Hungarian)
* New translations en.json (German)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (German)
* New translations en.yml (Arabic)
* New translations en.json (Hindi)
* New translations en.json (Scottish Gaelic)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Danish)
* New translations en.json (German)
* New translations en.json (Scottish Gaelic)
* New translations en.json (German)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations en.json (Persian)
* New translations activerecord.en.yml (Persian)
* New translations en.json (Igbo)
* New translations en.yml (Igbo)
* New translations simple_form.en.yml (Igbo)
* New translations activerecord.en.yml (Igbo)
* New translations devise.en.yml (Igbo)
* New translations doorkeeper.en.yml (Igbo)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Spanish, Argentina)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Igbo)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Jeremy Kescher
9c8fb2d475
Improve min poll options, expose value in API
2 years ago
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2 years ago
2d9a85db6e
Change design of link footer ( #19562 )
2 years ago
eee36267d6
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
Upstream change too close to a glitch-soc-specific string.
The glitch-soc-specific string should not have been in this file, so it
has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
Upstream refactored a part, that as usual is split and duplicated in various
pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
Upstream fixed custom.css path in a different way than we did, went with
upstream's change.
2 years ago
30ef110224
Fix upload progress not communicating processing phase in web UI ( #19530 )
2 years ago
55af04b253
Fix logged out search and changed logged-in search placeholder ( #19514 )
2 years ago
e6d415bb1f
New Crowdin updates ( #19425 )
...
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Armenian)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (Frisian)
* New translations doorkeeper.en.yml (Basque)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Georgian)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Polish)
* New translations doorkeeper.en.yml (Portuguese)
* New translations doorkeeper.en.yml (Czech)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.yml (Serbian (Latin))
* 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 (Kabyle)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Spanish)
* New translations doorkeeper.en.yml (Afrikaans)
* New translations doorkeeper.en.yml (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations doorkeeper.en.yml (Breton)
* New translations doorkeeper.en.yml (Welsh)
* New translations doorkeeper.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Tatar)
* New translations doorkeeper.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Asturian)
* New translations doorkeeper.en.yml (Occitan)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Corsican)
* New translations doorkeeper.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Hindi)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Galician)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Persian)
* New translations doorkeeper.en.yml (Tamil)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Marathi)
* New translations doorkeeper.en.yml (Thai)
* New translations doorkeeper.en.yml (Croatian)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Czech)
* New translations en.json (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.yml (Polish)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Vietnamese)
* New translations en.yml (Finnish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Turkish)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Dutch)
* New translations en.yml (Catalan)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* 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 en.yml (Greek)
* New translations en.yml (Italian)
* New translations en.yml (Dutch)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Dutch)
* New translations en.yml (Slovenian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Galician)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.json (French)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Spanish)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Breton)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations en.yml (German)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations en.yml (German)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Greek)
* 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 (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Icelandic)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Portuguese)
* New translations en.yml (Korean)
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations activerecord.en.yml (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
b514998dc1
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
5fa340931e
Fix closed registrations message not appearing in web UI ( #19508 )
...
Regression from #19486
2 years ago
cb19be67d1
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
923f06a07c
Fix number of uses being shown again on trending hashtags in web UI ( #19484 )
2 years ago
8dfe5179ee
Fix avatars not using image tags in web UI ( #19488 )
...
Fix #19483
2 years ago
371d969403
Fix missing delete and redraft link in web UI ( #19485 )
2 years ago
d2eb726962
Fix notifications about deleted reports not being also deleted ( #19475 )
...
* Fix notifications about deleted reports not being also deleted
* Fix notification with empty report crashing web UI
Fix #18909
2 years ago
2277913f3f
Add closed registrations modal ( #19437 )
2 years ago
eebbc5439a
Disable media cache on service worker ( #19471 )
2 years ago
8ebff0efcb
Change post editing to be enabled in web UI ( #19103 )
2 years ago
f8ca3bb2a1
Add ability to view previous edits of a status in admin UI ( #19462 )
...
* Add ability to view previous edits of a status in admin UI
* Change moderator access to posts to be controlled by a separate policy
2 years ago
267978d4fe
Remove navigation links to /explore when trends are disabled ( #19415 )
...
* Remove navigation links to /explore when trends are disabled
* Do not display trends interface when trends are disabled
2 years ago
0ca29eaa3f
Change layout of posts in web UI ( #19423 )
2 years ago
fcca781aae
Change design of translations in web UI ( #19453 )
2 years ago
9757c917da
Fix `nofollow` rel being removed in web UI ( #19455 )
2 years ago
30453fab80
Add mention of the translation provider when translating a post ( #19433 )
2 years ago
Jeremy Kescher
Claire