Jeremy Kescher
4d1c07e80f
Merge remote-tracking branch 'upstream/main'
2022-05-17 21:11:48 +02:00
Eugen Rochko
2e5fb45be5
[Glitch] Add language dropdown to compose in web UI
...
Port 0cdb077570
2022-05-16 23:06:29 +02:00
Claire
4415005de7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict caused because of minor code style change upstream, while glitch-soc
has different code for handling variable maximum chars.
Ported the change.
- `app/serializers/initial_state_serializer.rb`:
Conflict because glitch-soc had two extra attributes where upstream added
one.
Added upstream's attribute.
2022-05-16 22:29:05 +02:00
Eugen Rochko
6c699b1723
Fix preferred posting language returning unusable value in REST API ( #18428 )
2022-05-16 19:13:36 +02:00
Claire
b91196f4b7
Add confirmation page when importing blocked domains ( #1773 )
...
* Move glitch-soc-specific strings to glitch-soc-specific locale files
* Add confirmation page when importing blocked domains
2022-05-16 18:26:49 +02:00
Jeremy Kescher
df99208718
Merge remote-tracking branch 'upstream/main'
2022-05-16 17:36:04 +02:00
Eugen Rochko
0cdb077570
Add language dropdown to compose in web UI ( #18420 )
2022-05-16 11:18:35 +02:00
Claire
040b7d37a4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict due to glitch-soc having extra code for a proper direct visibility
timeline, in a part of the code upstream refactored.
Restored glitch-soc's extra code in the refactored bit.
2022-05-16 09:42:32 +02:00
Levi Bard
94e98864e3
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
2022-05-16 09:29:01 +02:00
Yamagishi Kazutoshi
c3fac61f56
Fix Mastodon::RaceConditionError that occurs when external status is reblogged ( #18424 )
...
* Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged
* Replace to `@object`
2022-05-16 01:00:09 +02:00
Jeremy Kescher
07c2a11959
Merge remote-tracking branch 'upstream/main'
2022-05-15 21:32:31 +02:00
Claire
dc350be6f5
Use upstream's settings for CW auto-expand and column swiping ( #1770 )
...
* Use Mastodon server-side settings for automatically expanding toots with CWs
* Add modal warning about settings changes
* Use Mastodon server-side settings for disabling swiping
2022-05-15 17:30:40 +02:00
Eugen Rochko
95a036c598
New Crowdin updates ( #18339 )
...
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Marathi)
* New translations en.yml (Malay)
* 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 (Telugu)
* New translations en.yml (Breton)
* 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 (Malayalam)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Korean)
* New translations en.yml (Russian)
* New translations en.yml (Turkish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Swedish)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Spanish)
* New translations en.yml (Greek)
* New translations en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (German)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.yml (Asturian)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Persian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Japanese)
* New translations en.yml (Latvian)
* New translations en.yml (Galician)
* New translations en.yml (Thai)
* New translations en.yml (Italian)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Korean)
* New translations en.yml (Hungarian)
* New translations en.yml (Welsh)
* New translations en.yml (French)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.yml (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Ido)
* New translations en.json (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Catalan)
* New translations en.json (Catalan)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Catalan)
* New translations en.yml (Afrikaans)
* New translations en.yml (Latvian)
* New translations en.yml (Italian)
* New translations en.yml (Greek)
* New translations en.yml (Hungarian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Ido)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Korean)
* New translations en.yml (Russian)
* New translations en.yml (Hungarian)
* New translations en.yml (Turkish)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Portuguese)
* New translations en.yml (Icelandic)
* New translations en.yml (Albanian)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Polish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Ukrainian)
* New translations en.yml (Indonesian)
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.yml (German)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.yml (French)
* New translations en.json (Galician)
* New translations en.yml (French)
* New translations en.yml (Welsh)
* New translations en.yml (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Slovenian)
* New translations en.yml (Hungarian)
* New translations en.json (English, United Kingdom)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.json (Croatian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Tatar)
* New translations en.json (Tatar)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations devise.en.yml (Catalan)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Swedish)
* New translations en.yml (Spanish)
* New translations en.yml (Turkish)
* New translations en.yml (Welsh)
* New translations en.yml (Latvian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Slovak)
* New translations en.yml (Czech)
* New translations en.yml (Portuguese)
* New translations en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Ido)
* New translations en.json (Spanish, Argentina)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Polish)
* New translations en.yml (Indonesian)
* New translations en.yml (Korean)
* New translations en.yml (Italian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Polish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-15 18:04:59 +09:00
Jeremy Kescher
fae11ac949
Merge remote-tracking branch 'upstream/main'
2022-05-14 08:36:01 +02:00
Claire
aa08399e6f
Fix setting for trending tags and trending links notifications being swapped ( #1771 )
2022-05-13 22:57:47 +02:00
Eugen Rochko
6cf57c6765
Refactor how Redis locks are created ( #18400 )
...
* Refactor how Redis locks are created
* Fix autorelease duration on account deletion lock
2022-05-13 00:02:35 +02:00
Jeong Arm
12535568f7
Fix rss view on hashtag ( #18406 )
2022-05-12 22:40:54 +02:00
Jeremy Kescher
16c8a45c81
Merge remote-tracking branch 'upstream/main'
2022-05-11 17:32:34 +02:00
Eugen Rochko
6fb837aa1d
[Glitch] Add limited attribute to accounts in REST API and a warning in web UI
...
Port b4d373a3df
2022-05-11 11:59:08 +02:00
Eugen Rochko
bb1a3e902d
[Glitch] Remove Keybase integration
...
Port 7de0ee7aba
2022-05-11 11:09:20 +02:00
Claire
b356a995c1
[Glitch] Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Port 662ed53c18
2022-05-11 09:44:27 +02:00
Claire
5fd8780b14
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
Eugen Rochko
b4d373a3df
Add limited attribute to accounts in REST API and a warning in web UI ( #18344 )
2022-05-10 09:44:35 +02:00
Claire
662ed53c18
Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Fixes #601
2022-05-09 23:20:19 +02:00
Eugen Rochko
2b8dc58b7f
Change RSS feeds ( #18356 )
...
* Change RSS feeds
- Use date and time for titles instead of ellipsized text
- Use full content in body, even when there is a content warning
- Use media extensions
* Change feed icons and add width and height attributes to custom emojis
* Fix custom emoji animate on hover breaking
* Fix tests
2022-05-09 07:43:08 +02:00
Jeremy Kescher
89b01152a7
Merge remote-tracking branch 'upstream/main'
2022-05-09 06:52:28 +02:00
Claire
dc1685c1e6
[Glitch] Fix streaming notifications not using quick filter logic
...
Port f17e73da09
2022-05-08 21:05:56 +02:00
Claire
703c7ae4b9
[Glitch] Fix floating action button obscuring last element
...
Port 5a448d0d71
2022-05-08 21:05:21 +02:00
Claire
22080786df
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-08 21:00:49 +02:00
Claire
f17e73da09
Fix streaming notifications not using quick filter logic ( #18316 )
...
Fixes #18309
The quickFilter logic was used on display and to request new notification
pages, but not for live updates. The main issue this caused is bump the unread
notifications count regardless of the quickFilter setting.
Since notifications are re-fetched when changing quickFilter settings, it is
safe to drop live notifications that do not match the selected filter.
2022-05-07 04:50:40 +02:00
Claire
991353682d
Fix ambiguous wording on appeal actions ( #18328 )
...
Fixes #18322
2022-05-06 21:41:34 +02:00
Claire
5a448d0d71
Fix floating action button obscuring last element ( #18332 )
...
Fixes #18331
Add some padding below the last element of scrollable lists when the FAB is
shown in order for users to always be able to fully see the last element.
2022-05-06 21:40:49 +02:00
Claire
a53003c6f1
Fix account warnings not being recorded in audit log ( #18338 )
...
* Fix account warnings not being recorded in audit log
Fixes #18334
* Only record warnings if they are not associated to another action
2022-05-06 21:40:20 +02:00
Eugen Rochko
9250578e6b
New Crowdin updates ( #18255 )
...
* 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 (Breton)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Chinese Traditional)
* New translations en.json (Catalan)
* New translations en.json (Japanese)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Korean)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Korean)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.json (Vietnamese)
* New translations en.json (Turkish)
* New translations en.json (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* Add whitelist_en-GB.json [ci skip]
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.json (Thai)
* New translations en.yml (Hebrew)
* New translations en.yml (Ukrainian)
* New translations en.json (Polish)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (Thai)
* New translations en.yml (Hebrew)
* New translations en.yml (Ukrainian)
* New translations en.json (Danish)
* New translations en.json (Hebrew)
* New translations en.json (Ido)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Danish)
* New translations en.json (Ido)
* New translations en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hebrew)
* New translations en.json (Ido)
* New translations en.yml (Hebrew)
* New translations en.yml (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.yml (Hebrew)
* New translations en.json (Afrikaans)
* New translations en.json (Hebrew)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Hebrew)
* New translations en.json (Slovenian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (German)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Hungarian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.json (Czech)
* New translations en.yml (Hebrew)
* New translations en.json (Czech)
* New translations en.yml (Spanish)
* New translations en.yml (Hebrew)
* New translations en.json (Spanish)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.json (Portuguese)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.json (Danish)
* New translations activerecord.en.yml (Japanese)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Welsh)
* New translations en.yml (Slovenian)
* New translations en.json (Italian)
* New translations en.yml (Slovenian)
* New translations en.json (Indonesian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Danish)
* New translations en.json (Swedish)
* New translations en.yml (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Slovenian)
* New translations en.yml (Welsh)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Danish)
* New translations en.yml (Slovenian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Slovenian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Slovenian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Welsh)
* New translations en.json (French)
* New translations en.json (Welsh)
* New translations en.json (French)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations simple_form.en.yml (Welsh)
* New translations en.json (French)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (German)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Arabic)
* New translations en.json (Asturian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (German)
* New translations en.json (Ido)
* New translations en.json (Welsh)
* New translations en.json (Ido)
* New translations en.json (Welsh)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Albanian)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.json (German)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-06 21:53:22 +09:00
Stefano Pigozzi
99d7684dfd
Replace leftover envelope icons with at icons ( #18305 )
2022-05-06 00:41:56 +02:00
Sara Golemon
336c23336a
Allow VerifyLinkService to accept backlinks with differing case ( #18320 )
2022-05-06 00:41:42 +02:00
Jeremy Kescher
c58c13822a
Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc ( #1763 )
2022-05-05 19:11:56 +02:00
Jeremy Kescher
328121d974
Merge branch 'fix-incorrect-custom-emojis-size-limit-hint'
2022-05-05 18:20:45 +02:00
Jeremy Kescher
0495ac2651
Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc
2022-05-05 18:15:30 +02:00
Jeremy Kescher
d69e3b3eca
Merge remote-tracking branch 'upstream/main'
2022-05-05 01:02:11 +02:00
Claire
c85c3fb708
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated `jest`, moving its config in a separate file.
This config was modified in glitch-soc, so the corresponding changes have
been ported to `jest.config.js`
2022-05-04 19:15:50 +02:00
Jeremy Kescher
4bfc4068aa
Merge remote-tracking branch 'upstream/main'
2022-05-04 17:40:13 +02:00
mayaeh
a01580f09f
Update translation strings for direct message ( #18300 )
2022-05-04 02:40:26 +02:00
Claire
e2d1d3b428
Change “Only people I mention” to “Mentioned people only” ( #18291 )
2022-05-03 12:30:40 +02:00
Claire
fa22b8ed22
Move DM conversation/timeline tab to column settings switch
2022-05-03 11:45:23 +02:00
Claire
3dd4f40a0e
Fix backend terms link not being used
2022-05-03 11:10:58 +02:00
Claire
3093ed1b7d
Refactor visibility icon using VisibilityIcon
2022-05-03 11:04:09 +02:00
Claire
e4bec702ac
[Glitch] Rename toots to posts in various places, add or reword DM warnings
...
Port part of be0bc9acbf7e244879fe
2022-05-03 10:59:23 +02:00
Claire
3869daef09
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
Eugen Rochko
7e244879fe
Change "Conversations" back to "Direct messages" and add warning in web UI ( #18289 )
...
Partially reverts #18146
2022-05-03 09:09:09 +02:00
