444ac6d6e9
[Glitch] Remove unnused otherAccounts property
...
Port 2f6416db53
2022-06-02 11:08:05 +02:00
1db92b510d
[Glitch] Add lang html attr to each posts
...
Port dc7e2985e6
2022-06-02 10:58:54 +02:00
25a46d9e59
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/models/account.rb`:
Textual conflict only caused by glitch-soc using a different value
for character limits in a nearby line.
Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
Attribute added to a tag modified by glitch-soc.
Added upstream's attributes.
- `yarn.lock`:
Upstream added/updated dependencies close to glitch-soc-only ones.
Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
84266f87e7
Replace from Code Climate to Super-Linter ( #18587 )
2022-06-01 19:22:35 +02:00
628c177ebe
Change label of publish button to be "Publish" again ( #18583 )
2022-06-01 05:03:12 +02:00
bbda3592d8
Translate: Korean ( #1790 )
...
* Translate Korean: glitch frontend
* Translate Korean: backend
* Remove unused string
* Fix yaml
2022-05-31 11:41:30 +02:00
14d7cf39f4
Change language to be carried over on reply ( #18557 )
...
In most cases, replies to a toot are written in the same language as the
toot being replied to.
2022-05-31 05:53:43 +02:00
2f6416db53
Remove unnused otherAccounts property ( #18556 )
...
Leftover from before #11896
2022-05-30 17:10:13 +02:00
3238f570db
New Crowdin updates ( #18507 )
...
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Korean)
* New translations en.yml (Polish)
* New translations en.yml (Finnish)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Portuguese)
* New translations en.yml (Greek)
* New translations en.yml (Albanian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Basque)
* New translations en.yml (German)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.json (Catalan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Kabyle)
* New translations en.yml (Ido)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (German)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations en.yml (Sardinian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Asturian)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Arabic)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Welsh)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.yml (Sanskrit)
* New translations en.yml (Corsican)
* 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 (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Uyghur)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Asturian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (English, United Kingdom)
* New translations en.json (Bengali)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Marathi)
* New translations en.json (Albanian)
* New translations en.json (Thai)
* 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 (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Slovenian)
* New translations en.yml (English, United Kingdom)
* New translations en.json (Finnish)
* New translations en.json (Norwegian)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Basque)
* New translations en.json (Hebrew)
* New translations en.json (Russian)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Corsican)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Tatar)
* New translations en.json (Serbian (Latin))
* New translations en.json (Occitan)
* New translations en.json (Kannada)
* New translations en.json (Cornish)
* New translations en.json (Sinhala)
* New translations en.json (Breton)
* New translations en.json (Malayalam)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Dutch)
* New translations en.yml (Dutch)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Turkish)
* New translations en.json (Polish)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Dutch)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Latvian)
* New translations en.json (Latvian)
* New translations en.yml (Polish)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Catalan)
* New translations en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Icelandic)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Occitan)
* New translations en.json (Occitan)
* New translations en.json (Afrikaans)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Greek)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Czech)
* New translations en.json (Ukrainian)
* New translations en.json (Russian)
* New translations en.json (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Ido)
* New translations en.yml (Ido)
* New translations en.json (Polish)
* New translations en.yml (Spanish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Galician)
* New translations en.yml (Galician)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Italian)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.json (Russian)
* New translations en.json (Spanish)
* New translations en.yml (Spanish)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Vietnamese)
* New translations en.json (Thai)
* New translations en.json (French)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Chinese Simplified)
* New translations en.json (Korean)
* New translations en.json (Ido)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-30 15:49:43 +09:00
dc7e2985e6
Add lang html attr to each posts ( #18544 )
2022-05-28 15:50:36 +02:00
379a7a7ca7
Add support for webp uploads ( #18506 )
2022-05-27 20:06:40 +02:00
d21251f8fe
Remove unused assets ( #18541 )
2022-05-27 20:05:34 +02:00
53c89ee44b
Add language indicator icon and local settings for status icons ( #1788 )
...
* Add language indicator
* Add local settings for status icons
* Switch to text icon for language
2022-05-27 16:34:29 +02:00
f13d910f3e
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-26 18:34:27 +02:00
a4fa9e23fc
Change "dangerous" to "sensitive" in privacy policy and web UI ( #18515 )
...
Fix #18470
2022-05-26 17:55:05 +02:00
444b650094
Add checkmark on top of status icon buttons when they are active ( #1783 )
2022-05-25 15:09:45 +02:00
3fd2aadb23
Various code cleanup ( #1782 )
...
* Remove duplicate in_chosen_languages definition
* Use `DEFAULT_FIELDS_SIZE` instead of `MAX_FIELDS` to reduce code differences with upstream
* Remove duplicate annotation
* Fix incorrect cross-flavor imports
* Remove deprecated `hide_network` setting (replaced by account column)
* Remove unused KeywordMutesHelper
* Remove trailing spaces
* Remove commit_hash from InstancePresenter, as it has been unused since mid-2017
2022-05-25 12:27:11 +02:00
96f29ce91a
New Crowdin updates ( #18458 )
...
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Armenian)
* New translations en.json (Armenian)
* New translations en.json (Armenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Russian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-24 23:33:18 +09:00
4ab3ad3bef
Fix crash in glitch-soc search results when Elasticsearch is disabled ( #1780 )
2022-05-24 16:10:18 +02:00
228ec75048
[Glitch] Fix languages dropdown on light theme
...
Port e925b06721
2022-05-24 14:23:03 +02:00
22111914bf
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-24 13:59:21 +02:00
e925b06721
Fix languages dropdown on light theme ( #18460 )
2022-05-19 19:26:19 +02:00
9a0fa28993
New Crowdin updates ( #18419 )
...
* New translations en.json (German)
* New translations en.json (Welsh)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.json (Turkish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Asturian)
* New translations en.json (Irish)
* New translations en.json (Arabic)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Galician)
* New translations en.json (Czech)
* New translations en.json (Slovak)
* New translations en.json (Icelandic)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (English, United Kingdom)
* New translations en.json (Norwegian)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Malayalam)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Corsican)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Serbian (Latin))
* New translations en.json (Occitan)
* New translations en.json (Kannada)
* New translations en.json (Cornish)
* New translations en.json (Sinhala)
* New translations en.json (Breton)
* New translations en.json (Tatar)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Kazakh)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Icelandic)
* New translations en.json (German)
* New translations en.json (Turkish)
* New translations en.json (Icelandic)
* New translations en.json (Greek)
* New translations en.json (Chinese Traditional)
* New translations en.json (Catalan)
* New translations en.json (Latvian)
* New translations en.json (Czech)
* New translations en.json (Indonesian)
* New translations en.json (Korean)
* New translations en.json (Russian)
* New translations en.json (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (German)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Danish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Afrikaans)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations en.yml (Italian)
* New translations en.json (Catalan)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (French)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Catalan)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Korean)
* New translations en.json (Polish)
* New translations en.yml (Ido)
* New translations en.json (Czech)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Ido)
* New translations en.json (Russian)
* New translations en.json (Latvian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations devise.en.yml (Russian)
* New translations en.yml (Ido)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese)
* New translations en.yml (Ido)
* New translations en.json (Catalan)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* Run `yarn manage:translations`
* New translations en.json (Chinese Simplified)
* New translations en.yml (Slovenian)
* New translations en.json (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Spanish)
* New translations en.json (Greek)
* New translations en.json (Thai)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Italian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Afrikaans)
* New translations en.yml (Basque)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Chinese Simplified)
* New translations en.json (German)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations devise.en.yml (Galician)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Russian)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Ido)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (German)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.json (Ukrainian)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Russian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations devise.en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (French)
* New translations en.json (Indonesian)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Vietnamese)
* New translations en.json (Esperanto)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-19 19:58:16 +09:00
2e5fb45be5
[Glitch] Add language dropdown to compose in web UI
...
Port 0cdb077570
2022-05-16 23:06:29 +02:00
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
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
0cdb077570
Add language dropdown to compose in web UI ( #18420 )
2022-05-16 11:18:35 +02:00
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
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
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
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
bb1a3e902d
[Glitch] Remove Keybase integration
...
Port 7de0ee7aba
2022-05-11 11:09:20 +02:00
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
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
b4d373a3df
Add `limited` attribute to accounts in REST API and a warning in web UI ( #18344 )
2022-05-10 09:44:35 +02:00
662ed53c18
Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Fixes #601
2022-05-09 23:20:19 +02:00
dc1685c1e6
[Glitch] Fix streaming notifications not using quick filter logic
...
Port f17e73da09
2022-05-08 21:05:56 +02:00
703c7ae4b9
[Glitch] Fix floating action button obscuring last element
...
Port 5a448d0d71
2022-05-08 21:05:21 +02:00
22080786df
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-08 21:00:49 +02:00
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
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
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
99d7684dfd
Replace leftover `envelope` icons with `at` icons ( #18305 )
2022-05-06 00:41:56 +02:00
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
a01580f09f
Update translation strings for direct message ( #18300 )
2022-05-04 02:40:26 +02:00
e2d1d3b428
Change “Only people I mention” to “Mentioned people only” ( #18291 )
2022-05-03 12:30:40 +02:00
fa22b8ed22
Move DM conversation/timeline tab to column settings switch
2022-05-03 11:45:23 +02:00
3dd4f40a0e
Fix backend terms link not being used
2022-05-03 11:10:58 +02:00
3093ed1b7d
Refactor visibility icon using VisibilityIcon
2022-05-03 11:04:09 +02:00
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