mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
master
2937 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
gol-cha
|
8d33189104
|
Remove Rack::Deflater (#17937)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> |
||
|
Claire
|
3a9e3c1248 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
4b36e47474
|
New Crowdin updates (#18855)
* New translations en.json (Hebrew) * New translations en.json (Indonesian) * New translations activerecord.en.yml (Hebrew) * New translations activerecord.en.yml (Indonesian) * New translations en.yml (Hebrew) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Hebrew) * New translations activerecord.en.yml (Hebrew) * New translations en.yml (Hebrew) * New translations devise.en.yml (Hebrew) * New translations en.json (Chinese Simplified) * New translations en.json (Galician) * New translations en.json (Punjabi) * New translations en.json (Irish) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Georgian) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Norwegian) * New translations en.json (Polish) * New translations en.json (Basque) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Slovenian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Icelandic) * New translations en.json (Finnish) * New translations en.json (Frisian) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Albanian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Japanese) * New translations en.json (Dutch) * New translations en.json (Portuguese) * New translations en.json (Chinese Simplified) * New translations en.json (Vietnamese) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Romanian) * New translations en.json (Afrikaans) * New translations en.json (Arabic) * New translations en.json (Bulgarian) * New translations en.json (Catalan) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Sinhala) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Indonesian) * New translations en.json (Esperanto) * New translations en.json (Thai) * New translations en.json (Welsh) * New translations en.json (Persian) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Cornish) * 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 (Corsican) * New translations en.json (Malayalam) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations en.json (Ido) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Breton) * New translations en.json (Tatar) * New translations en.json (Tamil) * New translations en.json (Kazakh) * 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 (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 (English, United Kingdom) * New translations en.json (Uyghur) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (Thai) * New translations activerecord.en.yml (Thai) * New translations en.json (Spanish, Argentina) * New translations en.json (Chinese Traditional) * New translations en.json (Galician) * New translations en.json (Greek) * New translations en.json (Hungarian) * New translations activerecord.en.yml (Chinese Simplified) * New translations en.json (Polish) * New translations en.json (Latvian) * New translations en.json (Albanian) * New translations simple_form.en.yml (Turkish) * New translations activerecord.en.yml (Turkish) * New translations en.json (Russian) * New translations en.json (Turkish) * New translations en.json (Portuguese) * New translations en.json (Spanish) * New translations en.json (Danish) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Slovenian) * New translations en.json (Ukrainian) * New translations en.json (Portuguese) * New translations en.json (Italian) * New translations en.json (Polish) * New translations en.json (Swedish) * New translations en.json (Ukrainian) * New translations en.json (Tamil) * New translations en.json (Spanish, Argentina) * New translations en.json (Kabyle) * New translations en.json (Spanish, Argentina) * New translations en.json (Ido) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Hebrew) * New translations simple_form.en.yml (Hebrew) * New translations en.yml (Hebrew) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Polish) * New translations simple_form.en.yml (Polish) * New translations activerecord.en.yml (Polish) * New translations en.json (Korean) * New translations en.json (Spanish) * New translations en.json (Hindi) * New translations en.json (Vietnamese) * New translations activerecord.en.yml (Vietnamese) * New translations en.json (Hindi) * New translations en.json (German) * New translations en.json (German) * New translations en.yml (Esperanto) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Esperanto) * New translations activerecord.en.yml (French) * New translations en.json (French) * New translations en.json (French) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations activerecord.en.yml (Thai) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations activerecord.en.yml (Thai) * New translations en.json (Thai) * New translations activerecord.en.yml (Thai) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations doorkeeper.en.yml (Thai) * New translations simple_form.en.yml (Thai) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
d799fe2082 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Claire
|
726931fe4a
|
Fix /api/v1/tags/:id route constraints (#18854)
The constraint was applied prior to decoding, and rejected anything containing the '%' character, which would be used for anything with non-ASCII unicode characters. |
||
|
Eugen Rochko
|
f8b3e36929
|
New Crowdin updates (#18810)
* New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Chinese Simplified) * New translations en.yml (Esperanto) * New translations en.json (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Simplified) * New translations en.json (Thai) * New translations en.json (Thai) * New translations simple_form.en.yml (Thai) * New translations activerecord.en.yml (Thai) * New translations doorkeeper.en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations activerecord.en.yml (Dutch) * 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 (Chinese Traditional) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Galician) * New translations activerecord.en.yml (Icelandic) * 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 (Portuguese, Brazilian) * New translations activerecord.en.yml (German) * New translations activerecord.en.yml (Sinhala) * 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 (Greek) * New translations activerecord.en.yml (Korean) * 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 (Spanish, Mexico) * New translations activerecord.en.yml (Bengali) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Scottish Gaelic) * 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 (Malayalam) * New translations activerecord.en.yml (Marathi) * New translations activerecord.en.yml (Hindi) * 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 (Danish) * New translations activerecord.en.yml (Greek) * New translations activerecord.en.yml (Latvian) * New translations en.yml (Polish) * New translations simple_form.en.yml (Polish) * New translations activerecord.en.yml (Afrikaans) * New translations activerecord.en.yml (Korean) * New translations activerecord.en.yml (Polish) * New translations en.yml (Esperanto) * New translations activerecord.en.yml (Russian) * New translations activerecord.en.yml (Italian) * New translations activerecord.en.yml (Ukrainian) * New translations activerecord.en.yml (Slovenian) * New translations activerecord.en.yml (Portuguese) * New translations activerecord.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Galician) * New translations activerecord.en.yml (Polish) * New translations activerecord.en.yml (Hungarian) * New translations activerecord.en.yml (Albanian) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations devise.en.yml (Korean) * New translations activerecord.en.yml (Ido) * New translations activerecord.en.yml (Spanish) * New translations activerecord.en.yml (Chinese Simplified) * Run `bundle exec i18n-tasks normalize` * Fix syntax Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
cd87d7dcef |
Merge branch 'main' into glitch-soc/merge-upstream
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes. |
||
|
Eugen Rochko
|
c3f0621a59
|
Add ability to follow hashtags (#18809) | ||
|
Claire
|
ecb3bb3256
|
Add support for editing labelling of one's own role (#18812)
Still disallow edition of rank or permissions |
||
|
Eugen Rochko
|
bbb5f1917d
|
New Crowdin updates (#18781)
* New translations en.json (Malayalam) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Breton) * New translations en.json (Tatar) * New translations en.json (Tamil) * New translations en.json (Kazakh) * 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 (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 (English, United Kingdom) * New translations en.json (Welsh) * New translations en.json (Uyghur) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (Slovenian) * New translations simple_form.en.yml (Icelandic) * New translations en.json (Danish) * New translations en.json (Polish) * New translations en.json (Slovenian) * New translations en.json (Chinese Traditional) * New translations en.json (Ido) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations en.yml (Ido) * New translations simple_form.en.yml (Danish) * New translations activerecord.en.yml (Danish) * New translations en.yml (Ido) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations en.yml (Ido) * New translations en.json (Latvian) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.json (Greek) * New translations en.json (Hungarian) * New translations en.yml (Hungarian) * New translations en.json (Korean) * New translations en.json (Spanish, Argentina) * New translations en.yml (Hungarian) * New translations en.json (Italian) * New translations en.json (Russian) * New translations simple_form.en.yml (Hungarian) * New translations activerecord.en.yml (Hungarian) * New translations en.json (Hungarian) * New translations en.json (Turkish) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations activerecord.en.yml (Catalan) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Norwegian) * New translations simple_form.en.yml (Polish) * 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 (Albanian) * New translations simple_form.en.yml (Italian) * 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 (Ukrainian) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Indonesian) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Armenian) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Thai) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Esperanto) * New translations en.json (Ukrainian) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Czech) * 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 (Basque) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations simple_form.en.yml (Sorani (Kurdish)) * 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 (Corsican) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Sardinian) * 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 (Breton) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Ukrainian) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Latvian) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Russian) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Ido) * New translations en.json (Spanish) * New translations simple_form.en.yml (Polish) * New translations en.yml (Korean) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Hungarian) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Galician) * New translations en.json (Galician) * New translations simple_form.en.yml (Galician) * New translations en.json (Spanish) * New translations en.json (Vietnamese) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Vietnamese) * New translations en.json (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Latvian) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Latvian) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Korean) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Ukrainian) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.json (Sinhala) * New translations activerecord.en.yml (Sinhala) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations simple_form.en.yml (Italian) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Hungarian) * New translations en.json (Japanese) * New translations simple_form.en.yml (Polish) * New translations en.yml (Thai) * New translations en.yml (Portuguese) * New translations en.json (Portuguese) * New translations en.yml (Portuguese) * New translations simple_form.en.yml (Portuguese) * New translations activerecord.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (French) * New translations activerecord.en.yml (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations activerecord.en.yml (French) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.json (Dutch) * New translations devise.en.yml (Dutch) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations en.yml (Galician) * New translations simple_form.en.yml (Galician) * New translations en.json (Albanian) * New translations activerecord.en.yml (Albanian) * New translations en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations en.yml (Portuguese) * New translations en.json (Vietnamese) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Eugen Rochko
|
e7aa2be828
|
Change how hashtags are normalized (#18795)
* Change how hashtags are normalized * Fix tests |
||
|
Ondřej Pokorný
|
04cdfc0086
|
Fix a typo in user role priority (#18786)
"alower priority" -> "a lower priority" |
||
|
Claire
|
befbac3f1c
|
Fix various in the user role management UI (#18777)
* Reword priority description * Disable checkboxes for permissions you can't enable in role edition interface * Set max priority in HTML attribute * Explicitly link to role edition, do not link when you can't edit * Reword priority description based on review |
||
|
Eugen Rochko
|
c9d6571da8
|
New Crowdin updates (#18716)
* New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Croatian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.json (Spanish, Mexico) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Malayalam) * New translations en.yml (Sinhala) * New translations en.yml (Breton) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Welsh) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations en.yml (Occitan) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Kabyle) * New translations en.yml (Ido) * New translations simple_form.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Japanese) * New translations activerecord.en.yml (Finnish) * New translations doorkeeper.en.yml (Danish) * New translations activerecord.en.yml (German) * New translations doorkeeper.en.yml (German) * New translations activerecord.en.yml (Greek) * New translations doorkeeper.en.yml (Greek) * New translations activerecord.en.yml (Frisian) * New translations doorkeeper.en.yml (Frisian) * New translations activerecord.en.yml (Basque) * New translations doorkeeper.en.yml (Basque) * New translations doorkeeper.en.yml (Finnish) * New translations doorkeeper.en.yml (Czech) * New translations activerecord.en.yml (Hebrew) * New translations doorkeeper.en.yml (Hebrew) * New translations activerecord.en.yml (Hungarian) * New translations doorkeeper.en.yml (Hungarian) * New translations activerecord.en.yml (Armenian) * New translations doorkeeper.en.yml (Armenian) * New translations activerecord.en.yml (Italian) * New translations doorkeeper.en.yml (Italian) * New translations activerecord.en.yml (Danish) * New translations activerecord.en.yml (Czech) * New translations activerecord.en.yml (French) * New translations activerecord.en.yml (Romanian) * New translations doorkeeper.en.yml (Romanian) * New translations doorkeeper.en.yml (Catalan) * New translations doorkeeper.en.yml (French) * New translations activerecord.en.yml (Spanish) * New translations doorkeeper.en.yml (Spanish) * New translations activerecord.en.yml (Afrikaans) * New translations doorkeeper.en.yml (Afrikaans) * New translations activerecord.en.yml (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations activerecord.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations activerecord.en.yml (Catalan) * New translations doorkeeper.en.yml (Japanese) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Swedish) * New translations doorkeeper.en.yml (Swedish) * New translations activerecord.en.yml (Turkish) * New translations doorkeeper.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Vietnamese) * New translations doorkeeper.en.yml (Vietnamese) * New translations activerecord.en.yml (Galician) * New translations doorkeeper.en.yml (Galician) * New translations activerecord.en.yml (Icelandic) * New translations doorkeeper.en.yml (Icelandic) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Indonesian) * New translations doorkeeper.en.yml (Indonesian) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Albanian) * New translations activerecord.en.yml (Georgian) * New translations doorkeeper.en.yml (Georgian) * New translations activerecord.en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations doorkeeper.en.yml (Dutch) * New translations activerecord.en.yml (Norwegian) * New translations doorkeeper.en.yml (Norwegian) * New translations activerecord.en.yml (Albanian) * New translations activerecord.en.yml (Polish) * New translations doorkeeper.en.yml (Polish) * New translations activerecord.en.yml (Portuguese) * New translations doorkeeper.en.yml (Portuguese) * New translations activerecord.en.yml (Russian) * New translations doorkeeper.en.yml (Russian) * New translations activerecord.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations activerecord.en.yml (Slovenian) * New translations doorkeeper.en.yml (Slovenian) * New translations activerecord.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Tamil) * New translations doorkeeper.en.yml (Hindi) * New translations activerecord.en.yml (Hindi) * New translations doorkeeper.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations doorkeeper.en.yml (Estonian) * New translations activerecord.en.yml (Estonian) * New translations doorkeeper.en.yml (Kazakh) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Bengali) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Tamil) * New translations activerecord.en.yml (Spanish, Argentina) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Marathi) * New translations doorkeeper.en.yml (Marathi) * New translations activerecord.en.yml (Thai) * New translations doorkeeper.en.yml (Thai) * New translations activerecord.en.yml (Croatian) * New translations doorkeeper.en.yml (Croatian) * New translations doorkeeper.en.yml (Malayalam) * New translations activerecord.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Esperanto) * New translations activerecord.en.yml (Malayalam) * New translations doorkeeper.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Asturian) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations doorkeeper.en.yml (Kabyle) * New translations activerecord.en.yml (Kabyle) * New translations doorkeeper.en.yml (Sardinian) * New translations activerecord.en.yml (Occitan) * New translations activerecord.en.yml (Sardinian) * New translations doorkeeper.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Occitan) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Chinese Traditional) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Korean) * New translations activerecord.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Spanish, Argentina) * New translations en.yml (Galician) * New translations en.yml (Chinese Traditional) * New translations en.yml (Galician) * New translations simple_form.en.yml (Galician) * New translations en.yml (Chinese Traditional) * New translations activerecord.en.yml (Galician) * New translations en.yml (Catalan) * New translations en.yml (Slovenian) * New translations en.yml (Turkish) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Greek) * New translations simple_form.en.yml (Slovenian) * New translations activerecord.en.yml (Slovenian) * New translations en.yml (Turkish) * New translations en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Turkish) * New translations activerecord.en.yml (Russian) * New translations activerecord.en.yml (Turkish) * New translations en.yml (Hungarian) * New translations en.yml (Polish) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Polish) * New translations activerecord.en.yml (Icelandic) * New translations en.json (Esperanto) * New translations en.yml (Danish) * New translations en.yml (Italian) * New translations devise.en.yml (Esperanto) * New translations en.json (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Danish) * New translations en.yml (Italian) * New translations simple_form.en.yml (Italian) * New translations activerecord.en.yml (Italian) * New translations en.yml (Danish) * New translations simple_form.en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations activerecord.en.yml (Vietnamese) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations en.yml (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Icelandic) * New translations en.yml (Czech) * New translations simple_form.en.yml (Spanish) * New translations activerecord.en.yml (Spanish) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Esperanto) * New translations simple_form.en.yml (Czech) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Czech) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
92c06a1113 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line. |
||
|
Eugen Rochko
|
44b2ee3485
|
Add customizable user roles (#18641)
* Add customizable user roles * Various fixes and improvements * Add migration for old settings and fix tootctl role management |
||
|
Claire
|
fe5f6bc7ed |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property |
||
|
Claire
|
02851848e9
|
Revamp post filtering system (#18058)
* Add model for custom filter keywords * Use CustomFilterKeyword internally Does not change the API * Fix /filters/edit and /filters/new * Add migration tests * Remove whole_word column from custom_filters (covered by custom_filter_keywords) * Redesign /filters Instead of a list, present a card that displays more information and handles multiple keywords per filter. * Redesign /filters/new and /filters/edit to add and remove keywords This adds a new gem dependency: cocoon, as well as a npm dependency: cocoon-js-vanilla. Those are used to easily populate and remove form fields from the user interface when manipulating multiple keyword filters at once. * Add /api/v2/filters to edit filter with multiple keywords Entities: - `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context` `keywords` - `FilterKeyword`: `id`, `keyword`, `whole_word` API endpoits: - `GET /api/v2/filters` to list filters (including keywords) - `POST /api/v2/filters` to create a new filter `keywords_attributes` can also be passed to create keywords in one request - `GET /api/v2/filters/:id` to read a particular filter - `PUT /api/v2/filters/:id` to update a new filter `keywords_attributes` can also be passed to edit, delete or add keywords in one request - `DELETE /api/v2/filters/:id` to delete a particular filter - `GET /api/v2/filters/:id/keywords` to list keywords for a filter - `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a filter - `GET /api/v2/filter_keywords/:id` to read a particular keyword - `PUT /api/v2/filter_keywords/:id` to edit a particular keyword - `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword * Change from `irreversible` boolean to `action` enum * Remove irrelevent `irreversible_must_be_within_context` check * Fix /filters/new and /filters/edit with update for filter_action * Fix Rubocop/Codeclimate complaining about task names * Refactor FeedManager#phrase_filtered? This moves regexp building and filter caching to the `CustomFilter` class. This does not change the functional behavior yet, but this changes how the cache is built, doing per-custom_filter regexps so that filters can be matched independently, while still offering caching. * Perform server-side filtering and output result in REST API * Fix numerous filters_changed events being sent when editing multiple keywords at once * Add some tests * Use the new API in the WebUI - use client-side logic for filters we have fetched rules for. This is so that filter changes can be retroactively applied without reloading the UI. - use server-side logic for filters we haven't fetched rules for yet (e.g. network error, or initial timeline loading) * Minor optimizations and refactoring * Perform server-side filtering on the streaming server * Change the wording of filter action labels * Fix issues pointed out by linter * Change design of “Show anyway” link in accordence to review comments * Drop “irreversible” filtering behavior * Move /api/v2/filter_keywords to /api/v1/filters/keywords * Rename `filter_results` attribute to `filtered` * Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer * Fix systemChannelId value in streaming server * Simplify code by removing client-side filtering code The simplifcation comes at a cost though: filters aren't retroactively applied anymore. |
||
|
Eugen Rochko
|
2936f42a14
|
Add notifications for new reports (#18697) | ||
|
Eugen Rochko
|
829b978a89
|
New Crowdin updates (#18671)
* New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations activerecord.en.yml (Korean) * New translations en.yml (German) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations activerecord.en.yml (Dutch) * New translations en.yml (Dutch) * New translations en.yml (Icelandic) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations simple_form.en.yml (Thai) * New translations activerecord.en.yml (Thai) * New translations activerecord.en.yml (Indonesian) * New translations en.yml (Turkish) * New translations en.json (Galician) * New translations en.yml (Slovenian) * New translations en.yml (Galician) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Galician) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations simple_form.en.yml (Galician) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Ukrainian) * New translations en.yml (Ukrainian) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
35588d09e2
|
Add /api/v1/admin/domain_allows (#18668)
- `GET /api/v1/admin/domain_allows` lists allowed domains - `GET /api/v1/admin/domain_allows/:id` shows one by ID - `DELETE /api/v1/admin/domain_allows/:id` deletes a given domain from the list of allowed domains - `POST /api/v1/admin/domain_allows` to allow a new domain: if that domain is already allowed, the existing DomainAllow will be returned |
||
|
Claire
|
0e74d4da59 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes. |
||
|
Eugen Rochko
|
3f02157a94
|
New Crowdin updates (#18605)
* New translations doorkeeper.en.yml (Indonesian) * New translations simple_form.en.yml (Persian) * New translations activerecord.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations doorkeeper.en.yml (Tamil) * New translations activerecord.en.yml (Marathi) * New translations simple_form.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Spanish, Argentina) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations activerecord.en.yml (Bengali) * New translations activerecord.en.yml (Asturian) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations doorkeeper.en.yml (Sinhala) * New translations simple_form.en.yml (Occitan) * New translations activerecord.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Sinhala) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (English, United Kingdom) * New translations activerecord.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Sinhala) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations doorkeeper.en.yml (Tatar) * New translations simple_form.en.yml (Malayalam) * New translations activerecord.en.yml (Malayalam) * New translations doorkeeper.en.yml (Malayalam) * New translations simple_form.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations doorkeeper.en.yml (Breton) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations doorkeeper.en.yml (Kabyle) * New translations simple_form.en.yml (Corsican) * New translations activerecord.en.yml (Kabyle) * New translations simple_form.en.yml (Kabyle) * New translations doorkeeper.en.yml (Sardinian) * New translations activerecord.en.yml (Sardinian) * New translations simple_form.en.yml (Sardinian) * New translations doorkeeper.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * 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 (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * 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 (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Bulgarian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Kabyle) * New translations en.yml (Ido) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Russian) * New translations activerecord.en.yml (Russian) * New translations simple_form.en.yml (Slovenian) * New translations activerecord.en.yml (Slovenian) * New translations simple_form.en.yml (Ukrainian) * New translations activerecord.en.yml (Ukrainian) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Welsh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Malay) * New translations en.yml (Esperanto) * New translations en.yml (Asturian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Malayalam) * New translations activerecord.en.yml (Asturian) * New translations en.yml (Catalan) * New translations activerecord.en.yml (Catalan) * New translations en.yml (Chinese Simplified) * New translations en.yml (Danish) * New translations en.yml (Ido) * New translations simple_form.en.yml (Danish) * New translations activerecord.en.yml (Danish) * New translations activerecord.en.yml (Italian) * New translations activerecord.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations en.yml (Korean) * New translations en.yml (Chinese Traditional) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Chinese Traditional) * New translations en.yml (Chinese Simplified) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Spanish, Argentina) * New translations en.yml (Galician) * New translations simple_form.en.yml (Galician) * New translations activerecord.en.yml (Galician) * New translations en.yml (Greek) * New translations en.yml (Catalan) * New translations en.yml (Afrikaans) * New translations en.yml (Polish) * New translations simple_form.en.yml (Afrikaans) * New translations activerecord.en.yml (Afrikaans) * New translations simple_form.en.yml (Polish) * New translations activerecord.en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.json (German) * New translations simple_form.en.yml (Portuguese) * New translations activerecord.en.yml (Portuguese) * New translations en.yml (Italian) * New translations en.yml (Russian) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations activerecord.en.yml (Turkish) * New translations en.yml (Russian) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations activerecord.en.yml (Hungarian) * New translations en.yml (French) * New translations en.yml (Galician) * New translations en.yml (French) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (French) * New translations activerecord.en.yml (French) * New translations en.yml (Italian) * New translations simple_form.en.yml (Italian) * New translations en.yml (Latvian) * New translations en.json (Latvian) * New translations simple_form.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Latvian) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Chinese Traditional) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations activerecord.en.yml (Vietnamese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations activerecord.en.yml (Japanese) * New translations en.yml (Czech) * New translations en.yml (French) * New translations en.yml (Czech) * New translations en.json (Arabic) * New translations en.yml (Slovak) * New translations en.json (Slovak) * New translations en.yml (Indonesian) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations activerecord.en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Hebrew) * New translations en.json (Hebrew) * New translations simple_form.en.yml (Hebrew) * New translations en.yml (Albanian) * New translations en.json (Albanian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations en.yml (German) * New translations en.json (German) * New translations simple_form.en.yml (German) * New translations activerecord.en.yml (German) * New translations en.json (German) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations simple_form.en.yml (Spanish) * New translations activerecord.en.yml (Spanish) * New translations en.json (Ido) * New translations en.yml (Chinese Simplified) * New translations en.json (Occitan) * New translations en.json (Occitan) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * New translations en.yml (Albanian) * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
15929a3d59 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`. |
||
|
Claire
|
edaaf6a5e9 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
45aa5781ce
|
Change brand color and logotypes (#18592)
- Add rake task for generating Apple/Android icons and favicons from SVG - Add rake task for generating PNG icons and logos for e-mails from SVG - Remove obsolete Microsoft icons and configuration - Remove PWA shortcut icons |
||
|
Eugen Rochko
|
a2871cd747
|
Add administrative webhooks (#18510)
* Add administrative webhooks * Fix error when webhook is deleted before delivery worker runs |
||
|
Eugen Rochko
|
17ba5e1e61
|
New Crowdin updates (#18561)
* New translations en.yml (Portuguese) * New translations en.yml (Lithuanian) * 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 (Macedonian) * New translations en.yml (Korean) * New translations en.yml (Georgian) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * 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 (Armenian) * New translations en.yml (Vietnamese) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Galician) * New translations en.yml (Hungarian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Irish) * New translations en.json (Arabic) * New translations en.json (Irish) * New translations en.json (German) * New translations en.yml (Spanish, Mexico) * New translations en.json (Turkish) * 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 (Japanese) * New translations en.json (Korean) * New translations en.json (Vietnamese) * New translations en.json (Chinese Simplified) * New translations en.yml (Sardinian) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Asturian) * New translations en.json (Scottish Gaelic) * New translations en.json (Welsh) * New translations en.json (Galician) * New translations en.json (Slovak) * New translations en.json (Icelandic) * New translations en.yml (Sanskrit) * New translations en.yml (Corsican) * New translations en.yml (Bengali) * New translations en.yml (Esperanto) * 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 (Greek) * 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 (Basque) * New translations en.json (Finnish) * New translations en.json (Hebrew) * New translations en.json (Spanish, Mexico) * New translations en.json (Marathi) * New translations en.json (Bengali) * New translations en.json (English, United Kingdom) * New translations en.json (Spanish, Argentina) * New translations en.json (Tamil) * New translations en.json (Croatian) * New translations en.json (Persian) * New translations en.json (Thai) * New translations en.json (Malay) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Kazakh) * New translations en.json (Estonian) * New translations en.json (Latvian) * New translations en.json (Hindi) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Telugu) * New translations en.json (Esperanto) * New translations en.json (Indonesian) * New translations en.json (Slovenian) * New translations en.json (Chinese Traditional) * New translations en.json (Dutch) * New translations en.json (Norwegian) * 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 (Punjabi) * New translations en.json (Ukrainian) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.yml (English, United Kingdom) * New translations en.json (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * 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.json (Spanish, Argentina) * New translations en.json (Galician) * New translations en.json (Chinese Traditional) * New translations en.json (Greek) * New translations en.json (Swedish) * New translations en.json (Russian) * New translations en.json (Chinese Simplified) * New translations en.json (Catalan) * New translations en.json (Polish) * New translations en.json (Latvian) * New translations en.yml (Turkish) * New translations en.json (Turkish) * New translations en.json (Czech) * New translations en.json (Slovenian) * New translations en.json (Icelandic) * New translations en.json (Hungarian) * New translations en.json (Italian) * New translations en.json (Vietnamese) * New translations en.yml (Russian) * New translations doorkeeper.en.yml (Russian) * New translations en.yml (Japanese) * New translations en.json (Japanese) * New translations en.json (Danish) * New translations en.json (Dutch) * New translations en.json (Portuguese) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations simple_form.en.yml (Frisian) * New translations activerecord.en.yml (Frisian) * New translations devise.en.yml (Frisian) * New translations doorkeeper.en.yml (Frisian) * New translations en.json (Frisian) * New translations en.yml (Breton) * New translations en.json (Breton) * New translations en.yml (Polish) * New translations en.yml (Russian) * New translations en.yml (Catalan) * New translations en.yml (Korean) * New translations en.yml (Spanish, Argentina) * New translations en.json (Korean) * New translations en.yml (Greek) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Ukrainian) * New translations en.yml (Czech) * New translations en.json (Ukrainian) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese) * New translations en.yml (Latvian) * New translations en.yml (Hungarian) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations simple_form.en.yml (Galician) * New translations en.json (Frisian) * New translations en.json (Frisian) * New translations en.json (Frisian) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations activerecord.en.yml (Frisian) * New translations activerecord.en.yml (Frisian) * New translations en.json (Frisian) * New translations devise.en.yml (Frisian) * New translations doorkeeper.en.yml (Frisian) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations en.yml (Slovenian) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations doorkeeper.en.yml (Frisian) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations simple_form.en.yml (Frisian) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations en.json (Frisian) * New translations en.json (Frisian) * New translations en.json (Frisian) * New translations en.json (Frisian) * New translations en.yml (Indonesian) * New translations en.json (Indonesian) * New translations en.json (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Italian) * New translations en.yml (Ido) * New translations en.json (Ido) * New translations en.json (French) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Russian) * New translations en.yml (Russian) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * Fix default message Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
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. |
||
|
Claire
|
ae4f068a84
|
Fix CAS_DISPLAY_NAME, SAML_DISPLAY_NAME and OIDC_DISPLAY_NAME being ignored (#18568) | ||
|
Claire
|
28329ba62f
|
Add /api/v1/admin/domain_blocks (#18247)
* Add /api/v1/admin/domain_blocks Fixes #18140 - `GET /api/v1/admin/domain_blocks` lists domain blocks - `GET /api/v1/admin/domain_blocks/:id` shows one by ID - `DELETE /api/v1/admin/domain_blocks/:id` deletes a given domain block - `POST /api/v1/admin/domain_blocks` to create a new domain block: if it conflicts with an existing one, returns an error with an attribute `existing_domain_block` with the rendered domain block * Simplify conflict handling as suggested in review |
||
|
Claire
|
c1d0a6a798
|
Make “Flavour and skin” admin setting label translatable (#1791) | ||
|
Jeong Arm
|
bbda3592d8
|
Translate: Korean (#1790)
* Translate Korean: glitch frontend * Translate Korean: backend * Remove unused string * Fix yaml |
||
|
Eugen Rochko
|
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> |
||
|
Claire
|
7c6fff34d0 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
96129c2f10
|
Fix confirmation redirect to app without Location header (#18523)
|
||
|
Claire
|
f13d910f3e | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
a4fa9e23fc
|
Change "dangerous" to "sensitive" in privacy policy and web UI (#18515)
Fix #18470 |
||
|
Eugen Rochko
|
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> |
||
|
Claire
|
22111914bf | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
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> |
||
|
Eugen Rochko
|
679b7158e3
|
Change search indexing to use batches to minimize resource usage (#18451) | ||
|
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 |
||
|
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. |
||
|
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 |
||
|
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> |
||
|
Eugen Rochko
|
42c976fd65
|
Fix missing string for appeal validation error (#18410) | ||
|
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. |
||
|
tykayn
|
aa4b715513 |
Merge remote-tracking branch 'glitch-soc/main'
# Conflicts: # app/controllers/concerns/sign_in_token_authentication_concern.rb # app/javascript/mastodon/features/compose/components/action_bar.js # app/javascript/mastodon/features/compose/index.js |
||
|
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 |
||
|
Claire
|
22080786df | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Jeong Arm
|
d7eae4229c
|
Update Korean translation (#1765) | ||
|
Claire
|
991353682d
|
Fix ambiguous wording on appeal actions (#18328)
Fixes #18322 |
||
|
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> |
||
|
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. |
||
|
Eugen Rochko
|
6b7765a73b
|
New Crowdin updates (#18213)
* New translations activerecord.en.yml (Ido) * New translations en.json (Ido) * New translations activerecord.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.yml (Armenian) * New translations en.json (Armenian) * New translations en.yml (Russian) * New translations en.yml (Armenian) * New translations en.json (Armenian) * New translations en.yml (Armenian) * New translations en.json (Japanese) * New translations en.json (Armenian) * New translations en.yml (Armenian) * New translations en.json (Japanese) * New translations doorkeeper.en.yml (Armenian) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations en.json (Spanish) * New translations en.json (Portuguese) * New translations en.yml (Chinese Simplified) * New translations en.json (Portuguese) * New translations devise.en.yml (Chinese Simplified) * New translations en.json (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Polish) * New translations doorkeeper.en.yml (Japanese) * New translations activerecord.en.yml (Japanese) * New translations devise.en.yml (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.json (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.json (Japanese) * New translations en.json (Galician) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations devise.en.yml (Japanese) * New translations en.yml (Scottish Gaelic) * New translations en.json (Scottish Gaelic) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Icelandic) * New translations en.json (Icelandic) * New translations en.json (Icelandic) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.json (Icelandic) * New translations en.json (Icelandic) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Icelandic) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations doorkeeper.en.yml (Ido) * New translations en.json (Icelandic) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations en.yml (Korean) * New translations en.yml (Hungarian) * 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 (Albanian) * New translations en.yml (Basque) * 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 (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * 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 (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Occitan) * 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, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Cornish) * New translations en.yml (Irish) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * 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 (Chinese Traditional) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Ido) * New translations en.json (Chinese Simplified) * New translations doorkeeper.en.yml (Ido) * New translations en.yml (Korean) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations en.yml (Japanese) * New translations en.yml (Turkish) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Vietnamese) * New translations en.yml (Greek) * New translations en.yml (Catalan) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Polish) * New translations doorkeeper.en.yml (Persian) * New translations en.yml (Czech) * New translations en.yml (Icelandic) * New translations en.json (Icelandic) * New translations en.yml (Russian) * New translations en.yml (Hungarian) * New translations en.yml (Swedish) * New translations en.yml (Indonesian) * New translations en.yml (Swedish) * New translations en.yml (Welsh) * New translations en.json (Swedish) * New translations en.yml (Danish) * New translations en.yml (Galician) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Yamagishi Kazutoshi
|
fe6a5b0d5a
|
Add translatable string for #17431 (#18227)
* Add translatable string for #17431 * Update config/locales/en.yml Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> |
||
|
Claire
|
392ca0472a |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes. |
||
|
Eugen Rochko
|
ad084ce7db
|
New Crowdin updates (#18148)
* 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 (Esperanto) * New translations en.yml (Uyghur) * New translations en.yml (Tatar) * New translations en.yml (Sinhala) * New translations en.yml (Malayalam) * New translations en.yml (Breton) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.json (Asturian) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Asturian) * New translations en.yml (Corsican) * New translations en.json (Welsh) * New translations doorkeeper.en.yml (Armenian) * New translations en.json (Basque) * New translations doorkeeper.en.yml (Basque) * New translations en.json (Finnish) * New translations doorkeeper.en.yml (Finnish) * New translations en.json (Hebrew) * New translations doorkeeper.en.yml (Hebrew) * New translations en.json (Hungarian) * New translations doorkeeper.en.yml (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Greek) * New translations doorkeeper.en.yml (Italian) * New translations en.json (Georgian) * New translations doorkeeper.en.yml (Georgian) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations doorkeeper.en.yml (Norwegian) * New translations doorkeeper.en.yml (Greek) * New translations doorkeeper.en.yml (German) * New translations en.json (Galician) * New translations doorkeeper.en.yml (Romanian) * New translations doorkeeper.en.yml (Korean) * New translations en.json (Slovak) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations en.json (Icelandic) * New translations en.json (Norwegian) * New translations en.json (Romanian) * New translations en.json (French) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (French) * New translations en.json (Spanish) * New translations doorkeeper.en.yml (Spanish) * New translations en.json (Afrikaans) * New translations en.json (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations en.json (Czech) * New translations doorkeeper.en.yml (Czech) * New translations en.json (Danish) * New translations en.json (Punjabi) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Bengali) * New translations doorkeeper.en.yml (Indonesian) * New translations en.json (Persian) * New translations doorkeeper.en.yml (Persian) * New translations en.json (Tamil) * New translations doorkeeper.en.yml (Tamil) * New translations en.json (Spanish, Argentina) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations en.json (Spanish, Mexico) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations en.json (Marathi) * New translations doorkeeper.en.yml (Marathi) * New translations en.json (Thai) * New translations doorkeeper.en.yml (Thai) * New translations en.json (Croatian) * New translations doorkeeper.en.yml (Croatian) * New translations en.json (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations en.json (Kazakh) * New translations doorkeeper.en.yml (Kazakh) * New translations en.json (Indonesian) * New translations doorkeeper.en.yml (Icelandic) * New translations en.json (Polish) * New translations en.json (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Polish) * New translations en.json (Portuguese) * New translations doorkeeper.en.yml (Portuguese) * New translations en.json (Russian) * New translations doorkeeper.en.yml (Russian) * New translations doorkeeper.en.yml (Slovak) * New translations en.json (Slovenian) * New translations doorkeeper.en.yml (Slovenian) * New translations en.json (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Galician) * New translations en.json (Swedish) * New translations doorkeeper.en.yml (Swedish) * New translations doorkeeper.en.yml (Turkish) * New translations en.json (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations en.json (Kannada) * New translations en.json (Latvian) * New translations en.json (Cornish) * New translations doorkeeper.en.yml (Sinhala) * New translations en.json (Sinhala) * New translations doorkeeper.en.yml (Breton) * New translations en.json (Breton) * New translations doorkeeper.en.yml (Malayalam) * New translations en.json (Malayalam) * New translations doorkeeper.en.yml (Tatar) * New translations en.json (Tatar) * New translations en.json (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Latvian) * New translations doorkeeper.en.yml (Hindi) * New translations en.json (Malay) * New translations en.json (Hindi) * New translations en.json (Telugu) * New translations doorkeeper.en.yml (Welsh) * New translations en.json (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Uyghur) * New translations doorkeeper.en.yml (Sardinian) * New translations en.json (Silesian) * New translations en.json (Taigi) * New translations doorkeeper.en.yml (Ido) * New translations en.json (Ido) * New translations doorkeeper.en.yml (Kabyle) * New translations en.json (Kabyle) * New translations en.json (Sanskrit) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations en.json (Sardinian) * New translations doorkeeper.en.yml (Corsican) * New translations en.json (Corsican) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Serbian (Latin)) * New translations doorkeeper.en.yml (Occitan) * New translations en.json (Occitan) * New translations doorkeeper.en.yml (Asturian) * New translations en.json (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.json (Danish) * New translations en.json (Danish) * New translations en.json (Icelandic) * New translations en.json (Korean) * New translations en.json (Spanish, Argentina) * New translations en.json (Spanish, Argentina) * New translations en.json (Korean) * New translations en.json (Chinese Traditional) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Catalan) * New translations en.json (Catalan) * New translations en.json (Vietnamese) * New translations en.json (Chinese Traditional) * New translations en.json (Vietnamese) * New translations en.json (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Japanese) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * New translations en.json (Japanese) * New translations en.yml (Japanese) * Restore en locales * Run `bundle exec i18n-tasks normalize` * New translations en.json (Greek) * New translations en.json (Chinese Traditional) * New translations en.json (Greek) * New translations en.json (Chinese Traditional) * New translations en.json (Galician) * New translations en.json (Chinese Traditional) * New translations en.json (Russian) * New translations en.json (Chinese Traditional) * New translations en.json (Afrikaans) * New translations en.json (Russian) * New translations en.json (Afrikaans) * New translations en.yml (Swedish) * New translations en.json (Swedish) * New translations en.json (Welsh) * New translations en.json (Dutch) * New translations en.json (Turkish) * New translations en.json (Turkish) * New translations en.json (Scottish Gaelic) * New translations en.json (Catalan) * New translations en.json (Icelandic) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Thai) * New translations en.json (Hungarian) * New translations en.json (German) * New translations en.json (Portuguese, Brazilian) * New translations en.json (German) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.json (Indonesian) * New translations en.json (Tatar) * New translations en.json (Tatar) * New translations en.json (Turkish) * New translations en.json (Turkish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.yml (Arabic) * New translations en.json (Arabic) * New translations en.json (Czech) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations en.json (Japanese) * New translations en.json (Latvian) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations en.json (Albanian) * New translations en.yml (Albanian) * New translations en.json (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Eugen Rochko
|
f6d35ed57d
|
Remove IP matching from e-mail domain blocks (#18190)
Clear out e-mail domain blocks created from automatically resolved DNS records |
||
|
Eugen Rochko
|
7b0fe4aef9
|
Fix opening and closing Redis connections instead of using a pool (#18171)
* Fix opening and closing Redis connections instead of using a pool * Fix Redis connections not being returned to the pool in CLI commands |
||
|
Claire
|
f23f784f18 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Claire
|
8284110c55
|
Fix stoplight not using REDIS_NAMESPACE (#18160) | ||
|
Eugen Rochko
|
3917353645
|
Fix single Redis connection being used across all threads (#18135)
* Fix single Redis connection being used across all Sidekiq threads * Fix tests |
||
|
Eugen Rochko
|
d55154819e
|
New Crowdin updates (#18074)
* New translations en.yml (German) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations devise.en.yml (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Scottish Gaelic) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.yml (Irish) [ci skip] * New translations en.yml (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations activerecord.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Scottish Gaelic) [ci skip] * New translations en.json (Scottish Gaelic) [ci skip] * New translations simple_form.en.yml (Scottish Gaelic) [ci skip] * New translations activerecord.en.yml (Scottish Gaelic) [ci skip] * New translations devise.en.yml (Scottish Gaelic) [ci skip] * New translations doorkeeper.en.yml (Scottish Gaelic) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
002d2729fb | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
f47a9ddc9f
|
New Crowdin updates (#18062)
* New translations en.yml (Korean) * New translations en.yml (Portuguese) * 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 (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * 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 (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * 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 (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * 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 (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Sinhala) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Asturian) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Breton) * New translations en.yml (Marathi) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Catalan) * New translations en.yml (Japanese) * New translations en.json (Catalan) * New translations en.yml (Greek) * New translations en.yml (Chinese Traditional) * New translations en.yml (Turkish) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Latvian) * New translations en.yml (Czech) * New translations en.yml (Russian) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Korean) * New translations en.yml (Vietnamese) * New translations en.yml (Catalan) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Italian) * New translations en.yml (Hungarian) * New translations en.yml (Thai) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations simple_form.en.yml (Irish) * New translations activerecord.en.yml (Irish) * New translations devise.en.yml (Irish) * New translations doorkeeper.en.yml (Irish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations en.yml (Ukrainian) * New translations en.yml (Thai) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.yml (Vietnamese) * New translations en.yml (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 (Arabic) * New translations en.json (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations en.yml (Turkish) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Yamagishi Kazutoshi
|
4884e0ca41
|
Add missing locale (#18061) | ||
|
Eugen Rochko
|
ea0633e131
|
New Crowdin updates (#18032)
* New translations en.json (Vietnamese) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Japanese) * New translations en.yml (French) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Turkish) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.json (Vietnamese) * New translations en.json (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.json (Turkish) * New translations en.json (Turkish) * New translations en.yml (Turkish) * New translations en.json (Turkish) * New translations simple_form.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations en.yml (German) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations en.yml (French) * New translations en.json (Japanese) * New translations en.yml (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Chinese Simplified) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations en.yml (French) * New translations en.yml (Catalan) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Catalan) * New translations en.json (Vietnamese) * New translations doorkeeper.en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Portuguese) * 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 (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Serbian (Cyrillic)) * 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 (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (Spanish) * 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 (Thai) * 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 (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Bengali) * New translations en.yml (Malay) * New translations en.yml (Marathi) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Telugu) * New translations en.yml (Welsh) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Breton) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Sinhala) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Standard Moroccan Tamazight) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Yamagishi Kazutoshi
|
5781d1db84
|
Fix parsing TRUSTED_PROXY_IP (#18051)
|
||
|
Claire
|
e06b0234df | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
07994cf4f6
|
New Crowdin updates (#17995)
* 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.yml (Sanskrit) * New translations en.yml (Asturian) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Kabyle) * New translations en.yml (Cornish) * 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 (Czech) * New translations en.json (Hungarian) * New translations en.yml (Kannada) * New translations en.yml (Sinhala) * New translations en.yml (Bengali) * New translations en.yml (Hindi) * New translations en.yml (Marathi) * New translations en.yml (Croatian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Malay) * New translations en.yml (Breton) * New translations en.yml (Telugu) * 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.json (Icelandic) * New translations en.json (Vietnamese) * New translations en.yml (Korean) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Icelandic) * New translations en.json (Korean) * New translations en.json (Polish) * New translations en.yml (Albanian) * New translations en.json (Albanian) * New translations en.yml (Vietnamese) * New translations en.yml (Chinese Traditional) * New translations en.json (Chinese Traditional) * New translations en.json (Vietnamese) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.json (Latvian) * New translations en.yml (Spanish, Argentina) * New translations en.json (Spanish, Argentina) * New translations en.yml (Danish) * New translations en.yml (Latvian) * New translations en.yml (Spanish) * New translations en.json (Spanish) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Chinese Traditional) * 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 (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 (Ukrainian) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Indonesian) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Norwegian) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Polish) * 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 (Czech) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Armenian) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Kabyle) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Asturian) * New translations simple_form.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Breton) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Esperanto) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Polish) * New translations en.json (Swedish) * New translations en.yml (Italian) * New translations en.json (Italian) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Portuguese) * New translations en.json (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Arabic) * New translations en.yml (Arabic) * New translations simple_form.en.yml (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations en.yml (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Turkish) * New translations en.json (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Czech) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Greek) * New translations en.json (Greek) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Czech) * New translations en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations simple_form.en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations simple_form.en.yml (Danish) * New translations en.yml (Galician) * New translations en.json (Galician) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (French) * New translations en.yml (Indonesian) * New translations en.json (Indonesian) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Indonesian) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Armenian) * New translations en.json (Armenian) * New translations en.yml (Italian) * New translations en.json (Italian) * New translations en.yml (Catalan) * New translations en.json (Catalan) * New translations en.yml (Spanish, Argentina) * New translations en.json (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Hungarian) * New translations en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.json (Polish) * New translations doorkeeper.en.yml (Polish) * New translations doorkeeper.en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations simple_form.en.yml (Polish) * New translations en.json (Polish) * New translations en.json (Polish) * New translations en.json (Catalan) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
ff73d43b35 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change. |
||
|
Eugen Rochko
|
8e20e16cf0
|
Change e-mail notifications to only be sent when recipient is offline (#17984)
* Change e-mail notifications to only be sent when recipient is offline Change the default for follow and mention notifications back on * Add preference to always send e-mail notifications * Change wording |
||
|
dependabot[bot]
|
6b72641641
|
Bump i18n-tasks from 0.9.37 to 1.0.8 (#17993)
* Bump i18n-tasks from 0.9.37 to 1.0.8 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.37 to 1.0.8. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.37...v1.0.8) --- updated-dependencies: - dependency-name: i18n-tasks dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Run `bundle exec i18n-tasks normalize` * Add `admin_mailer.new_appeal.actions.*` to ignore_unused Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Eugen Rochko
|
f06a3b56a3
|
New Crowdin updates (#17897)
* New translations en.yml (Danish) * New translations en.yml (German) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Hungarian) * New translations en.yml (Hebrew) * New translations en.yml (Catalan) * New translations en.yml (Spanish) * New translations en.yml (French) * New translations en.yml (Arabic) * New translations en.yml (Armenian) * New translations en.yml (Afrikaans) * New translations en.yml (Polish) * New translations en.yml (Punjabi) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Portuguese) * New translations en.yml (Albanian) * New translations en.yml (Dutch) * New translations en.yml (Turkish) * 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 (Spanish, Argentina) * New translations en.yml (Norwegian) * New translations en.yml (Korean) * New translations en.yml (Macedonian) * New translations en.yml (Slovenian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Vietnamese) * New translations en.yml (Lithuanian) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Galician) * New translations en.yml (Georgian) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Sinhala) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Asturian) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Breton) * New translations en.yml (Marathi) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (German) * New translations en.yml (Icelandic) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Italian) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Danish) * New translations en.json (Czech) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Czech) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Latvian) * New translations doorkeeper.en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Indonesian) * New translations en.yml (Czech) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Korean) * New translations en.yml (Spanish) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Portuguese) * New translations en.yml (Polish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Chinese Traditional) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.json (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Italian) * New translations en.yml (Galician) * New translations en.yml (French) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations simple_form.en.yml (Galician) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * 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 (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * 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 (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Kabyle) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Breton) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Latvian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Catalan) * New translations en.yml (Latvian) * New translations en.yml (Catalan) * New translations en.yml (Latvian) * New translations en.yml (Icelandic) * New translations en.yml (Chinese Traditional) * New translations en.yml (Swedish) * New translations en.yml (Russian) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Turkish) * New translations en.yml (Polish) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Italian) * New translations en.yml (Spanish) * New translations en.yml (Arabic) * New translations en.json (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.json (Arabic) * New translations en.json (Arabic) * New translations en.json (Arabic) * New translations en.json (Breton) * New translations en.yml (Arabic) * New translations en.json (Arabic) * New translations en.yml (Vietnamese) * New translations en.yml (Korean) * New translations en.yml (Vietnamese) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalzie` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Eugen Rochko
|
6e418bf346
|
Fix cookies secure flag being set when served over Tor (#17992) | ||
|
Claire
|
489f250877 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
8c03b45fff
|
Fix unset SMTP_RETURN_PATH environment variable causing e-mail not to send (#17982)
|
||
|
Claire
|
b368c75029 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did. |
||
|
Eugen Rochko
|
6221b36b27
|
Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) | ||
| 7c32e3bc98 | Merge remote-tracking branch 'glitch-soc/main' | |||
|
Claire
|
d01c5b0b8c | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Ondřej Pokorný
|
80ded02a4b
|
Update en.yml (#17942)
typo |
||
|
Holger
|
39b489ba4c
|
fix: s3_force_single_request not parsed (#17922)
|
||
|
Claire
|
44b7be45f1
|
Fix assets failing to build with OpenSSL 3 because of deprecated hash algorithm (#17930)
Fixes #17924 |
||
| 034466d82c | Merge remote-tracking branch 'glitch-soc/main' | |||
|
Claire
|
51a297e128 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
dependabot[bot]
|
5b83733d32
|
Bump capistrano from 3.16.0 to 3.17.0 (#17774)
* Bump capistrano from 3.16.0 to 3.17.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.16.0 to 3.17.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.16.0...v3.17.0) --- updated-dependencies: - dependency-name: capistrano dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * 3.17.0 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
| 8f91509323 | up from glitch | |||
|
Eugen Rochko
|
1e46c29047
|
New Crowdin updates (#17864)
* New translations doorkeeper.en.yml (Kazakh) * New translations doorkeeper.en.yml (Estonian) * New translations doorkeeper.en.yml (Latvian) * New translations doorkeeper.en.yml (Hindi) * New translations doorkeeper.en.yml (Welsh) * New translations doorkeeper.en.yml (Serbian (Latin)) * 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 (Breton) * New translations doorkeeper.en.yml (Sinhala) * New translations doorkeeper.en.yml (Occitan) * New translations activerecord.en.yml (Czech) * New translations devise.en.yml (Polish) * New translations activerecord.en.yml (Dutch) * New translations devise.en.yml (Dutch) * New translations activerecord.en.yml (Norwegian) * New translations devise.en.yml (Norwegian) * New translations activerecord.en.yml (Polish) * New translations activerecord.en.yml (Portuguese) * New translations devise.en.yml (Portuguese) * New translations activerecord.en.yml (Russian) * New translations devise.en.yml (Russian) * New translations activerecord.en.yml (Slovak) * New translations devise.en.yml (Slovak) * New translations activerecord.en.yml (Slovenian) * New translations devise.en.yml (Slovenian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations devise.en.yml (Korean) * New translations devise.en.yml (Czech) * New translations activerecord.en.yml (Hebrew) * New translations activerecord.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations activerecord.en.yml (German) * New translations devise.en.yml (German) * New translations activerecord.en.yml (Greek) * New translations devise.en.yml (Greek) * New translations activerecord.en.yml (Basque) * New translations devise.en.yml (Basque) * New translations activerecord.en.yml (Finnish) * New translations devise.en.yml (Finnish) * New translations devise.en.yml (Hebrew) * New translations activerecord.en.yml (Korean) * New translations activerecord.en.yml (Hungarian) * New translations devise.en.yml (Hungarian) * New translations activerecord.en.yml (Armenian) * New translations devise.en.yml (Armenian) * New translations activerecord.en.yml (Italian) * New translations devise.en.yml (Italian) * New translations activerecord.en.yml (Japanese) * New translations devise.en.yml (Japanese) * New translations activerecord.en.yml (Georgian) * New translations devise.en.yml (Georgian) * New translations devise.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Swedish) * New translations devise.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Bengali) * New translations devise.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations activerecord.en.yml (Thai) * New translations activerecord.en.yml (Croatian) * New translations devise.en.yml (Croatian) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Spanish, Mexico) * New translations devise.en.yml (Kazakh) * New translations activerecord.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations activerecord.en.yml (Hindi) * New translations devise.en.yml (Hindi) * New translations devise.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Argentina) * New translations devise.en.yml (Swedish) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations devise.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations devise.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations devise.en.yml (Vietnamese) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Galician) * New translations devise.en.yml (Galician) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Indonesian) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations devise.en.yml (Welsh) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations activerecord.en.yml (Kabyle) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kabyle) * New translations devise.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Esperanto) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations devise.en.yml (Breton) * New translations activerecord.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations devise.en.yml (Kannada) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Albanian) * New translations en.json (Albanian) * New translations en.json (Albanian) * New translations en.yml (Scottish Gaelic) * New translations en.json (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Scottish Gaelic) * New translations en.yml (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Polish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (Portuguese) * New translations en.yml (Italian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations en.yml (Indonesian) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.yml (Czech) * New translations en.yml (Thai) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Icelandic) * New translations en.yml (Indonesian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Galician) * 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 (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Latvian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Chinese Traditional) * New translations en.yml (Catalan) * New translations en.yml (Korean) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Spanish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (Hungarian) * New translations en.yml (Icelandic) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Czech) * New translations en.yml (Albanian) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.json (Persian) * New translations en.yml (Persian) * New translations simple_form.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations en.yml (Indonesian) * New translations en.json (Persian) * New translations en.yml (Persian) * New translations simple_form.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations en.yml (Italian) * New translations en.yml (Vietnamese) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
894956e20c
|
Fix /api/v1/admin/accounts (#17887)
* Fix /api/v1/admin/accounts Compatibility was broken since #17009 which changed the underlying filter class without changing the controller. This commits restore support for the old parameters. * Add /api/v2/admin/accounts with the new parameters * Add tests * Add missing filter for `silenced` status Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> |
||
|
Claire
|
f313bf3e97 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
56edc6552f
|
Add SMTP_RETURN_PATH environment variable to set bounce domain (#17886)
|
||
|
Claire
|
e6a159a648
|
Fix extra “zero” key in some plural translation strings (#17883) | ||
|
Claire
|
aaa9ec340b |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. |
||
|
Eugen Rochko
|
cefa526c6d
|
Refactor formatter (#17828)
* Refactor formatter * Move custom emoji pre-rendering logic to view helpers * Move more methods out of Formatter * Fix code style issues * Remove Formatter * Add inline poll options to RSS feeds * Remove unused helper method * Fix code style issues * Various fixes and improvements * Fix test |
||
|
Eugen Rochko
|
f572a68a0c
|
Chore: i18n-tasks normalize (#17873) | ||
|
Claire
|
f65eaa5aae
|
Add admin dashboard checks for Elasticsearch version (#17863) | ||
|
Eugen Rochko
|
9565b17d5d
|
New Crowdin updates (#17829)
* New translations en.json (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations doorkeeper.en.yml (Indonesian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * 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 (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * 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 (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * 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 (German) * New translations en.yml (Vietnamese) * 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 (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Bengali) * New translations en.yml (Marathi) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Asturian) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Sinhala) * New translations en.yml (Breton) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Catalan) * New translations en.yml (Chinese Traditional) * New translations en.yml (Latvian) * New translations en.yml (Icelandic) * New translations en.yml (Swedish) * New translations en.yml (Thai) * New translations en.yml (Portuguese) * New translations en.yml (Thai) * New translations en.yml (Russian) * New translations en.yml (Russian) * New translations en.yml (Thai) * New translations en.yml (Danish) * New translations en.yml (Spanish) * New translations en.yml (Spanish, Argentina) * New translations en.json (Japanese) * New translations en.yml (German) * New translations en.yml (Hungarian) * New translations en.yml (Italian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Chinese Simplified) * New translations en.yml (Indonesian) * New translations en.yml (Turkish) * New translations en.json (Persian) * New translations simple_form.en.yml (Persian) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Persian) * New translations en.yml (Thai) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.json (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.json (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations activerecord.en.yml (Dutch) * New translations en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations en.yml (Korean) * New translations en.yml (Galician) * Run `bundle exec i18n-tasks normalize` * Run `yarn manage:translations` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
276b26b614 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Claire
|
749fe73ec4
|
Add tooltip for instance delivery warnings (#17854) | ||
|
Claire
|
59864ff495 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted. |
||
|
Eugen Rochko
|
410989e081
|
Change frequency of trends review notifications from 2 hours to 6 hours (#17850) | ||
|
Eugen Rochko
|
392b367835
|
Fix IDN domains not being rendered correctly in a few left-over places (#17848) | ||
|
Yamagishi Kazutoshi
|
584d8b977b
|
Format JSON and YAML using Prettier (#17823)
* Format JSON and YAML using Prettier * Add prettier to devDep |
||
|
Eugen Rochko
|
c0e3b20c58
|
New Crowdin updates (#17817)
* New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations doorkeeper.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Russian) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.json (Japanese) * New translations en.yml (Japanese) * New translations en.json (Catalan) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations en.json (Catalan) * New translations en.json (Slovak) * New translations en.json (Catalan) * New translations simple_form.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations devise.en.yml (Catalan) * New translations devise.en.yml (Catalan) * New translations doorkeeper.en.yml (Catalan) * New translations devise.en.yml (Catalan) * New translations doorkeeper.en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Ukrainian) * New translations devise.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations en.yml (Vietnamese) * New translations doorkeeper.en.yml (Danish) * New translations en.yml (Vietnamese) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations en.json (Persian) * New translations en.json (Persian) * New translations en.yml (Japanese) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations en.json (Russian) * New translations en.json (Russian) * New translations en.json (Russian) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * Run `bundle exec i18n-tasks normalize` * Run `yarn manage:translations` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
4e3c68e025 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code. |
||
|
Claire
|
588d2b27a7
|
Remove old files for renamed translation (#17818)
Follow-up to #17812 in which `kmr` has been renamed to `ku` |
||
|
Claire
|
b07906bdb0
|
Fix wrong language code for Kurdish languages (#17812) | ||
|
Eugen Rochko
|
779efc7656
|
New Crowdin updates (#17771)
* New translations en.json (Cornish) * New translations en.json (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Serbian (Latin)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations en.json (Ido) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Albanian) * New translations doorkeeper.en.yml (Asturian) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sinhala) * 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 (Sorani (Kurdish)) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Malayalam) * 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 (Breton) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Esperanto) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * 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 (Russian) * New translations doorkeeper.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovenian) * New translations doorkeeper.en.yml (Albanian) * New translations doorkeeper.en.yml (Swedish) * New translations doorkeeper.en.yml (Turkish) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations doorkeeper.en.yml (Galician) * New translations doorkeeper.en.yml (Persian) * New translations doorkeeper.en.yml (Georgian) * New translations activerecord.en.yml (Welsh) * New translations doorkeeper.en.yml (Bulgarian) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Asturian) * New translations doorkeeper.en.yml (Korean) * New translations devise.en.yml (Asturian) * New translations doorkeeper.en.yml (Romanian) * New translations doorkeeper.en.yml (French) * New translations doorkeeper.en.yml (Spanish) * New translations doorkeeper.en.yml (Arabic) * New translations doorkeeper.en.yml (Catalan) * New translations doorkeeper.en.yml (Japanese) * New translations doorkeeper.en.yml (Czech) * New translations doorkeeper.en.yml (Danish) * New translations doorkeeper.en.yml (German) * New translations doorkeeper.en.yml (Greek) * New translations doorkeeper.en.yml (Finnish) * New translations doorkeeper.en.yml (Hebrew) * New translations doorkeeper.en.yml (Hungarian) * New translations doorkeeper.en.yml (Armenian) * New translations doorkeeper.en.yml (Italian) * New translations doorkeeper.en.yml (Tamil) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Romanian) * New translations doorkeeper.en.yml (Sardinian) * New translations doorkeeper.en.yml (Kabyle) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations activerecord.en.yml (French) * New translations devise.en.yml (Esperanto) * New translations devise.en.yml (Romanian) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (French) * New translations activerecord.en.yml (Spanish) * New translations devise.en.yml (Spanish) * New translations activerecord.en.yml (Arabic) * New translations devise.en.yml (Arabic) * New translations activerecord.en.yml (Bulgarian) * New translations devise.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Corsican) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * 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 (Kazakh) * New translations doorkeeper.en.yml (Estonian) * New translations doorkeeper.en.yml (Latvian) * New translations doorkeeper.en.yml (Hindi) * New translations doorkeeper.en.yml (Welsh) * New translations doorkeeper.en.yml (Serbian (Latin)) * 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 (Breton) * New translations doorkeeper.en.yml (Sinhala) * New translations doorkeeper.en.yml (Occitan) * New translations activerecord.en.yml (Czech) * New translations devise.en.yml (Polish) * New translations activerecord.en.yml (Dutch) * New translations devise.en.yml (Dutch) * New translations activerecord.en.yml (Norwegian) * New translations devise.en.yml (Norwegian) * New translations activerecord.en.yml (Polish) * New translations activerecord.en.yml (Portuguese) * New translations devise.en.yml (Portuguese) * New translations activerecord.en.yml (Russian) * New translations devise.en.yml (Russian) * New translations activerecord.en.yml (Slovak) * New translations devise.en.yml (Slovak) * New translations activerecord.en.yml (Slovenian) * New translations devise.en.yml (Slovenian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations devise.en.yml (Korean) * New translations devise.en.yml (Czech) * New translations activerecord.en.yml (Hebrew) * New translations activerecord.en.yml (German) * New translations devise.en.yml (German) * New translations activerecord.en.yml (Greek) * New translations devise.en.yml (Greek) * New translations activerecord.en.yml (Basque) * New translations devise.en.yml (Basque) * New translations activerecord.en.yml (Finnish) * New translations devise.en.yml (Finnish) * New translations devise.en.yml (Hebrew) * New translations activerecord.en.yml (Korean) * New translations activerecord.en.yml (Hungarian) * New translations devise.en.yml (Hungarian) * New translations activerecord.en.yml (Armenian) * New translations devise.en.yml (Armenian) * New translations activerecord.en.yml (Italian) * New translations devise.en.yml (Italian) * New translations activerecord.en.yml (Japanese) * New translations devise.en.yml (Japanese) * New translations activerecord.en.yml (Georgian) * New translations devise.en.yml (Georgian) * New translations devise.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Swedish) * New translations devise.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Bengali) * New translations devise.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations devise.en.yml (Thai) * New translations activerecord.en.yml (Croatian) * New translations devise.en.yml (Croatian) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Spanish, Mexico) * New translations devise.en.yml (Kazakh) * New translations activerecord.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations activerecord.en.yml (Hindi) * New translations devise.en.yml (Hindi) * New translations devise.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Argentina) * New translations devise.en.yml (Swedish) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations devise.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations devise.en.yml (Vietnamese) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Galician) * New translations devise.en.yml (Galician) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Indonesian) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations devise.en.yml (Welsh) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations activerecord.en.yml (Kabyle) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kabyle) * New translations devise.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Esperanto) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations devise.en.yml (Breton) * New translations activerecord.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations devise.en.yml (Kannada) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations devise.en.yml (Standard Moroccan Tamazight) * Run `bundle exec i18n-tasks normalize` * Run `yarn manage:translations` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
c79a03b319 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README. |
||
|
Claire
|
895212bb2f
|
Fix PgHero suggesting migrations (#17807)
* Fix PgHero suggesting migrations Fixes #17768 * Keep migration suggestions in development env |
||
|
Claire
|
9b139d4ef9
|
Fix “edited at” in public pages not being properly localized (#17806)
Fixes #17804 |
||
|
Yamagishi Kazutoshi
|
eb9a7e3626
|
Fix LetterOpennerWeb CSP (#17770) | ||
|
Eugen Rochko
|
d182470c9d
|
New Crowdin updates (#17742)
* New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Macedonian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Ukrainian) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Galician) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Tamil) * New translations en.json (Lithuanian) * New translations en.json (Georgian) * New translations en.json (Slovenian) * New translations en.json (French) * New translations en.json (Persian) * New translations en.json (Arabic) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Norwegian) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.json (Japanese) * New translations en.json (Afrikaans) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Armenian) * New translations en.json (Occitan) * New translations en.json (Bengali) * New translations en.json (Telugu) * New translations en.json (Marathi) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Uyghur) * New translations en.json (Welsh) * New translations en.json (Esperanto) * New translations en.json (Malay) * New translations en.json (Hindi) * New translations en.json (Estonian) * New translations en.json (Kazakh) * New translations en.json (Croatian) * New translations en.json (Sorani (Kurdish)) * 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 (Sinhala) * New translations en.json (Serbian (Latin)) * New translations en.json (Asturian) * New translations en.json (Scottish Gaelic) * New translations en.json (Kannada) * New translations en.json (Cornish) * New translations en.json (Breton) * New translations en.json (Malayalam) * New translations en.json (Tatar) * New translations en.json (Standard Moroccan Tamazight) * New translations en.json (Vietnamese) * New translations en.json (Spanish, Argentina) * New translations en.yml (Japanese) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Argentina) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Japanese) * New translations en.json (Chinese Traditional) * New translations en.json (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations en.json (Catalan) * New translations en.json (Greek) * New translations en.json (German) * New translations en.json (Icelandic) * New translations en.json (Russian) * New translations en.json (Swedish) * New translations en.json (Russian) * New translations en.yml (Indonesian) * New translations en.json (Russian) * New translations en.json (Indonesian) * New translations doorkeeper.en.yml (Russian) * New translations en.yml (Indonesian) * New translations en.json (Russian) * New translations en.json (Latvian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.json (Asturian) * New translations en.yml (Danish) * New translations en.yml (Asturian) * New translations en.json (Danish) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Danish) * New translations en.json (Portuguese) * New translations en.yml (Danish) * New translations simple_form.en.yml (Danish) * New translations doorkeeper.en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Italian) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.json (Spanish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * 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 (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * 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 (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * 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 (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * 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 (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Sinhala) * New translations en.yml (Silesian) * New translations en.yml (Taigi) * New translations en.yml (Ido) * New translations en.yml (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kannada) * New translations en.yml (Cornish) * New translations en.yml (Breton) * New translations en.yml (Marathi) * New translations en.yml (Malayalam) * New translations en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Telugu) * New translations en.yml (Malay) * New translations en.yml (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.yml (Kazakh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Croatian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Greek) * New translations en.yml (Chinese Traditional) * New translations en.yml (Latvian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Japanese) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (Icelandic) * New translations en.yml (Slovenian) * New translations en.json (Slovenian) * New translations simple_form.en.yml (Slovenian) * New translations en.yml (Catalan) * New translations en.yml (Russian) * New translations en.yml (Italian) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Spanish) * New translations en.yml (French) * New translations en.yml (Turkish) * New translations en.yml (Indonesian) * New translations en.json (Turkish) * New translations en.yml (Indonesian) * New translations en.yml (Hungarian) * New translations en.json (Hungarian) * New translations en.yml (Tatar) * New translations en.json (Tatar) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations en.yml (Tatar) * New translations en.json (Tatar) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
80c4db160e
|
Fix blank screen when trying to copy emoji with a too large file size (#1718)
Fixes #1714 |
||
|
Claire
|
a945182b56 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
91616004fe
|
Fix not being able to upload GIF emojis in admin UI (#17759) | ||
|
Claire
|
bb9a6fb5c2 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
dependabot[bot]
|
46ad7fea9d
|
Bump rack-attack from 6.5.0 to 6.6.0 (#17405)
* Bump rack-attack from 6.5.0 to 6.6.0 Bumps [rack-attack](https://github.com/rack/rack-attack) from 6.5.0 to 6.6.0. - [Release notes](https://github.com/rack/rack-attack/releases) - [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack-attack/compare/v6.5.0...v6.6.0) --- updated-dependencies: - dependency-name: rack-attack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix usage of deprecated API Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> |
||
|
Eugen Rochko
|
1745b71840
|
New Crowdin updates (#17674)
* New translations devise.en.yml (Hindi) * New translations devise.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Argentina) * New translations devise.en.yml (Swedish) * New translations activerecord.en.yml (Vietnamese) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations devise.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations devise.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations devise.en.yml (Vietnamese) * New translations activerecord.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Galician) * New translations devise.en.yml (Galician) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Indonesian) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations devise.en.yml (Welsh) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations activerecord.en.yml (Kabyle) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kabyle) * New translations devise.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Esperanto) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations devise.en.yml (Breton) * New translations activerecord.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations devise.en.yml (Kannada) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Catalan) * New translations en.json (Norwegian) * New translations en.yml (Catalan) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Catalan) * New translations en.json (Slovenian) * New translations en.json (Persian) * New translations en.json (Occitan) * New translations en.json (Arabic) * New translations en.json (Thai) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Latvian) * New translations en.json (Indonesian) * New translations en.json (Tamil) * 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 (Kazakh) * New translations en.json (Estonian) * New translations en.json (Hindi) * New translations en.json (Icelandic) * New translations en.json (Malay) * New translations en.json (Welsh) * New translations en.json (Esperanto) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Tatar) * New translations en.json (Malayalam) * New translations en.json (Breton) * New translations en.json (Sinhala) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Galician) * New translations en.json (Basque) * New translations en.json (Polish) * New translations en.json (Finnish) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Portuguese) * New translations en.json (Vietnamese) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Cornish) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations en.json (Standard Moroccan Tamazight) * New translations en.json (Swedish) * New translations en.json (Catalan) * New translations en.json (Polish) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.json (Turkish) * New translations simple_form.en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations en.yml (French) * New translations en.json (Russian) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations en.yml (Hungarian) * New translations en.json (Hungarian) * New translations en.yml (French) * New translations en.yml (Hungarian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (German) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Turkish) * New translations en.yml (Icelandic) * New translations en.yml (Turkish) * New translations en.yml (Icelandic) * New translations en.json (Icelandic) * New translations en.yml (Spanish) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.json (Spanish) * New translations en.json (Chinese Traditional) * New translations en.yml (Spanish) * New translations en.yml (Chinese Traditional) * New translations en.json (Indonesian) * New translations en.yml (Italian) * New translations en.yml (Danish) * New translations en.json (Italian) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.json (Slovenian) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Latvian) * New translations en.json (Portuguese) * New translations simple_form.en.yml (Portuguese) * New translations en.yml (Danish) * New translations en.yml (Portuguese) * New translations en.yml (Latvian) * New translations en.json (Portuguese) * New translations en.json (Latvian) * New translations en.yml (Danish) * New translations en.yml (Portuguese) * New translations en.yml (Latvian) * New translations en.yml (Danish) * New translations en.json (Spanish, Argentina) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.json (Spanish, Mexico) * New translations en.yml (Russian) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Russian) * New translations en.json (Sinhala) * New translations en.yml (Sinhala) * New translations en.json (Greek) * New translations doorkeeper.en.yml (Sinhala) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Japanese) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Turkish) * New translations en.yml (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Slovak) * New translations en.json (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Slovak) * New translations en.json (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.json (Esperanto) * New translations en.yml (Danish) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * New translations en.yml (Danish) * Fix * Run `bundle exec i18n-tasks normalize -l da` * New translations en.yml (Danish) * Run `bundle exec i18n-tasks normalize -l da` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
24e83246f9 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/status.rb`: Upstream updated media and edit-related code textually close to glitch-soc additions (local-only and content-type). Ported upstream changes. - `app/models/status_edit.rb`: Upstream changes textually close to glitch-soc additions (content-type). Ported upstream changes. - `app/serializers/activitypub/note_serializer.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (directMessage attribute). Ported upstream changes. - `app/services/remove_status_service.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (DM timeline). Ported upstream changes. - `app/services/update_status_service.rb`: Upstream fixed an issue with language selection. Not really a conflict, but textually close to glitch-soc additions (content-type). Ported upstream changes. - `db/schema.rb`: Upstream added columns to the `status_edits` table, the conflict is because of an additional column (`content-type`) in glitch-soc. Ported upstream changes. - `package.json`: Upstream dependency (express) textually adjacent to a glitch-soc-specific one (favico.js) got updated. Updated it as well. |
||
|
Claire
|
3bc0aeed50
|
Change text version of warning mail to mention appeals instead of mails (#17725)
Also, the instruction to reply to e-mail would probably not work in many cases where the notifications e-mail address is not able to receive incoming emails or the mailbox is not actively monitored. |
||
|
chandrn7
|
a6ed6845c9
|
Allow login through OpenID Connect (#16221)
* added OpenID Connect as an SSO option * minor fixes * added comments, removed an option that shouldn't be set * fixed Gemfile.lock * added newline to end of Gemfile.lock * removed tab from Gemfile.lock * remove chomp * codeclimate changes and small name change to make function's purpose clearer * codeclimate fix * added SSO buttons to /about page * minor refactor * minor style change * removed spurious change * removed unecessary conditional from ensure_valid_username and added support for auth.info.name in user_params_from_auth * minor changes |
||
|
Eugen Rochko
|
bd53dd5210
|
Change design of federation pages in admin UI (#17704)
* Change design of federation pages in admin UI * Fix query performance in instance media attachments measure * Fix reblogs being included in instance languages dimension |
||
|
Claire
|
1fbd1fa5c4 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`. |
||
|
Eugen Rochko
|
dba4be1038
|
Change appearance of account cards in web UI (#17689)
* Change appearance of account cards in web UI * Various fixes and improvements * Various fixes and improvements |
||
|
Eugen Rochko
|
edf09ec747
|
Add /api/v1/accounts/familiar_followers to REST API (#17700)
* Add `/api/v1/accounts/familiar_followers` to REST API * Change hide network preference to be stored consistently for local and remote accounts * Add dummy classes to migration * Apply suggestions from code review Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com> |
||
|
Josh Soref
|
b5329e0035
|
Spelling (#17705)
* spelling: account Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: affiliated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: appearance Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: autosuggest Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: cacheable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: component Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: conversations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: domain.example Clarify what's distinct and use RFC friendly domain space. Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: environment Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: exceeds Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: functional Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: inefficiency Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: not Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: notifications Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: occurring Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: position Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: progress Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: promotable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: reblogging Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: repetitive Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: resolve Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: saturated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: similar Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: strategies Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: success Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: targeting Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: thumbnails Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unauthorized Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unsensitizes Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: validations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: various Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com> |
||
|
Claire
|
d9c3109bb6 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Claire
|
02dbc59c91
|
Add option to automatically delete toots after one week (#17691)
Fixes #17658 |
||
|
Claire
|
6d3fa7828e
|
Redesign /about when already logged in (#17348)
* Redesign /about when already logged in * Fix sign up form still showing when OMNIAUTH_ONLY is set * Fix tests * Change wording based on suggestions Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> |
||
|
Claire
|
8743b1ea40 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. |
||
|
Eugen Rochko
|
9b58fb1ea4
|
Add descriptions to trending features in admin UI (#17677) | ||
|
Claire
|
425a6c90c4 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Eugen Rochko
|
462a6f7d72
|
Fix notification about deleted statuses being too threatening (#17679) | ||
|
Eugen Rochko
|
25d3dc4373
|
Add ability to mark statuses as sensitive from reports in admin UI (#17668)
* Add ability to mark statuses as sensitive from reports in admin UI * Allow mark as sensitive action on statuses with preview cards |
||
|
Claire
|
14919fe11e
|
Change old moderation strikes to be displayed in a separate page (#17566)
* Change old moderation strikes to be displayed in a separate page Fixes #17552 This changes the moderation strikes displayed on `/auth/edit` to be those from the past 3 months, and make all moderation strikes targeting the current user available in `/disputes`. * Add short description of what the strikes page is for * Move link to list of strikes to “Account status” instead of navigation item * Normalize i18n file * Fix layout and styling of strikes link * Revert highlights_on regexp * Reintroduce account status summary - this way, “Account status” is never empty - account status is not necessarily bound to strikes, or recent strikes |
||
|
Eugen Rochko
|
50ea54b3ed
|
Change authorized applications page (#17656)
* Change authorized applications page * Hide revoke button for superapps and suspended accounts * Clean up db/schema.rb |
||
|
Eugen Rochko
|
233f7e6174
|
New Crowdin updates (#17628)
* New translations en.yml (Swedish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Latvian) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Portuguese) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Turkish) * New translations en.yml (Italian) * New translations en.json (Spanish, Argentina) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations en.yml (Welsh) * New translations en.json (Welsh) * New translations activerecord.en.yml (Welsh) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations en.yml (Finnish) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Kabyle) * New translations en.json (Kabyle) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.yml (Indonesian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Greek) * New translations en.yml (Turkish) * New translations en.yml (Latvian) * New translations en.yml (Catalan) * New translations en.yml (Portuguese) * New translations en.yml (Italian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Russian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Japanese) * New translations en.yml (Chinese Traditional) * New translations en.yml (Italian) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Spanish) * New translations en.yml (Thai) * New translations en.yml (French) * New translations en.yml (Thai) * New translations en.yml (Indonesian) * New translations en.yml (Danish) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Indonesian) * New translations en.yml (German) * New translations en.yml (Thai) * New translations en.yml (Icelandic) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Hungarian) * New translations en.json (Norwegian) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Catalan) * New translations en.json (Slovenian) * New translations en.json (Persian) * New translations en.json (Occitan) * New translations en.json (Arabic) * New translations en.json (Thai) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * 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.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Latvian) * New translations en.json (Indonesian) * New translations en.json (Tamil) * 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 (Kazakh) * New translations en.json (Estonian) * New translations en.json (Hindi) * New translations en.json (Icelandic) * New translations en.json (Malay) * New translations en.json (Telugu) * New translations en.json (Welsh) * New translations en.json (Esperanto) * New translations en.json (Uyghur) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Tatar) * New translations en.json (Malayalam) * New translations en.json (Breton) * New translations en.json (Sinhala) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Galician) * New translations en.json (Basque) * New translations en.json (Polish) * New translations en.json (Finnish) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Georgian) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Punjabi) * New translations en.json (Portuguese) * New translations en.json (Vietnamese) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Cornish) * New translations en.json (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Serbian (Latin)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Ido) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations en.json (Catalan) * New translations en.json (French) * New translations en.json (Catalan) * New translations en.json (French) * New translations en.json (Albanian) * New translations en.json (Catalan) * New translations en.yml (Albanian) * New translations en.json (French) * New translations en.json (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.json (French) * New translations en.json (Danish) * New translations en.json (Danish) * New translations en.json (Icelandic) * New translations en.json (Danish) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Hungarian) * New translations en.json (Ukrainian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Hungarian) * New translations en.json (Greek) * New translations en.json (Finnish) * New translations en.json (Russian) * New translations en.json (Greek) * New translations en.json (Hungarian) * New translations en.json (Finnish) * New translations en.json (Hungarian) * New translations en.json (Finnish) * New translations en.json (Chinese Traditional) * New translations en.json (Finnish) * New translations en.json (Chinese Traditional) * New translations en.yml (Finnish) * New translations en.json (Finnish) * New translations en.json (Chinese Traditional) * New translations en.json (German) * New translations en.json (German) * New translations en.json (Chinese Simplified) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.json (Thai) * New translations en.json (Turkish) * New translations en.json (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Thai) * New translations en.json (Spanish) * New translations en.json (Spanish) * New translations en.json (Latvian) * New translations en.json (Latvian) * New translations en.json (Latvian) * New translations en.yml (Swedish) * New translations en.json (Swedish) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations activerecord.en.yml (Asturian) * New translations en.json (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Danish) * New translations en.json (Turkish) * New translations en.json (Turkish) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * Run `bundle exec i18n-tasks normalize` * Fix Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
8158b04d18 | Merge branch 'main' into glitch-soc/merge-upstream | ||
|
Claire
|
57814a98a9
|
Fix remote reports with comments revealing remote reporter (#17652)
* Display username rather than display name in report comment For consistency with report notes and appeals * Fix remote reports with comments revealing remote reporter * Display instance name in placeholder * Make instance name in report comment a link to the federation admin page * Normalize i18n file |
||
|
Claire
|
756f1b6615 | Add option (on by default) to allow toots with content warnings to trend | ||
|
Claire
|
c6df6686af | Disable notifications for trending links and trending statuses by default | ||
|
Claire
|
be493b6c0d |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly. |
||
|
sasanquaneuf
|
21e80a9792
|
Escape database passwords in config/database.yml (#17627)
* Add double quotes for using passwords that start with a comma * Escape database password in yml |
||
|
Eugen Rochko
|
27965ce5ed
|
Add trending statuses (#17431)
* Add trending statuses * Fix dangling items with stale scores in localized sets * Various fixes and improvements - Change approve_all/reject_all to approve_accounts/reject_accounts - Change Trends::Query methods to not mutate the original query - Change Trends::Query#skip to offset - Change follow recommendations to be refreshed in a transaction * Add tests for trending statuses filtering behaviour * Fix not applying filtering scope in controller |
||
|
Eugen Rochko
|
a29a982eaa
|
Change e-mail domain blocks to block IPs dynamically (#17635)
* Change e-mail domain blocks to block IPs dynamically * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
||
|
Claire
|
3d25fe0426 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr. |
