mirror of https://github.com/Siphonay/mastodon
2822 Commits
Author | SHA1 | Message | Date |
---|---|---|---|
Eugen Rochko | bf3cb42da7 |
Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)
Cherry-picked
|
|
Claire | 46224385e2 | Merge branch 'main' into glitch-soc/merge-upstream | |
Eugen Rochko |
240beed171
|
New Crowdin updates (#19255)
* New translations en.yml (Thai) * New translations en.yml (Greek) * New translations en.yml (Afrikaans) * New translations en.json (Arabic) * New translations en.yml (Arabic) * New translations en.yml (Bulgarian) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Spanish) * New translations en.yml (Frisian) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.json (Finnish) * New translations en.yml (Finnish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.json (Hungarian) * New translations en.yml (Hungarian) * New translations en.json (Afrikaans) * New translations en.yml (French) * New translations en.json (Hebrew) * New translations en.json (Czech) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Ido) * New translations en.json (Bulgarian) * New translations en.json (Ido) * New translations en.json (German) * New translations en.json (Tamil) * New translations en.json (Esperanto) * New translations en.yml (Spanish) * New translations en.json (French) * New translations en.yml (Turkish) * New translations en.json (Dutch) * New translations en.json (Albanian) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.json (Japanese) * New translations en.json (Indonesian) * New translations en.json (Sinhala) * New translations en.json (Romanian) * New translations en.yml (Romanian) * New translations en.json (Armenian) * New translations en.yml (Armenian) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.yml (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.yml (Chinese Traditional) * New translations en.yml (Urdu (Pakistan)) * New translations en.json (Slovenian) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Galician) * New translations en.yml (Galician) * New translations en.json (Icelandic) * New translations en.yml (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.json (Persian) * New translations en.yml (Slovenian) * New translations en.yml (Slovak) * New translations en.json (Italian) * New translations en.yml (Dutch) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.json (Georgian) * New translations en.yml (Georgian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.json (Lithuanian) * New translations en.yml (Lithuanian) * New translations en.json (Macedonian) * New translations en.yml (Macedonian) * New translations simple_form.en.yml (Dutch) * New translations en.json (Slovak) * New translations en.json (Norwegian) * New translations en.yml (Norwegian) * New translations en.json (Punjabi) * New translations en.yml (Punjabi) * New translations en.json (Polish) * New translations en.yml (Polish) * New translations en.json (Portuguese) * New translations en.yml (Portuguese) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Malayalam) * New translations en.yml (Welsh) * New translations en.yml (Esperanto) * New translations en.json (Uyghur) * New translations en.yml (Uyghur) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.json (Tatar) * New translations en.yml (Tatar) * New translations en.json (Malayalam) * New translations en.json (Breton) * New translations en.yml (English, United Kingdom) * New translations en.yml (Breton) * New translations en.yml (Sinhala) * New translations en.json (Cornish) * New translations en.yml (Cornish) * New translations en.json (Kannada) * New translations en.yml (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.yml (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Welsh) * New translations en.json (English, United Kingdom) * New translations en.json (Spanish, Argentina) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Spanish, Argentina) * New translations en.json (Spanish, Mexico) * New translations en.yml (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.yml (Bengali) * New translations en.json (Marathi) * New translations en.yml (Marathi) * New translations en.json (Croatian) * New translations en.yml (Croatian) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Kazakh) * New translations en.yml (Telugu) * New translations en.yml (Kazakh) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations en.json (Latvian) * New translations en.yml (Latvian) * New translations en.json (Hindi) * New translations en.yml (Hindi) * New translations en.json (Malay) * New translations en.yml (Malay) * New translations en.json (Telugu) * New translations en.json (Occitan) * New translations en.yml (Occitan) * New translations en.json (Sanskrit) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (Silesian) * New translations en.json (Silesian) * New translations en.yml (Taigi) * New translations en.json (Taigi) * New translations en.yml (Kabyle) * New translations en.json (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.json (Serbian (Latin)) * New translations en.json (Sardinian) * New translations en.yml (Corsican) * New translations en.json (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.json (Dutch) * New translations en.json (Japanese) * New translations en.json (Catalan) * New translations en.json (Italian) * New translations en.json (Korean) * New translations en.yml (Dutch) * New translations en.json (Slovenian) * New translations en.json (Ukrainian) * New translations en.json (Icelandic) * New translations activerecord.en.yml (Dutch) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Japanese) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations activerecord.en.yml (Dutch) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.json (Spanish, Argentina) * New translations en.json (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Vietnamese) * New translations en.json (Czech) * New translations simple_form.en.yml (Czech) * New translations en.json (Latvian) * New translations en.yml (Asturian) * New translations en.json (Chinese Simplified) * New translations en.json (Ido) * New translations en.json (Chinese Traditional) * New translations en.json (Danish) * New translations en.json (Galician) * New translations en.json (Turkish) * New translations en.json (Albanian) * New translations en.json (Italian) * New translations en.json (Russian) * New translations en.json (Portuguese) * New translations en.yml (Portuguese) * New translations en.json (Spanish) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.json (Hungarian) * New translations en.yml (Hungarian) * New translations en.json (Hungarian) * New translations en.yml (Hungarian) * New translations en.json (Polish) * New translations en.yml (Polish) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Claire | bfc539cfb4 |
Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"
This reverts commit
|
|
Claire | 221580a3af |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings. |
|
Eugen Rochko |
cf5d27c3b7
|
New Crowdin updates (#19252)
* New translations en.yml (Thai) * New translations en.yml (Greek) * New translations en.yml (Afrikaans) * New translations en.json (Arabic) * New translations en.yml (Arabic) * New translations en.yml (Bulgarian) * New translations en.yml (Catalan) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.json (Finnish) * New translations en.yml (Finnish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.yml (Hungarian) * New translations en.json (Afrikaans) * New translations en.yml (French) * New translations en.json (Hebrew) * New translations en.json (Czech) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Ido) * New translations en.json (Bulgarian) * New translations en.json (Tamil) * New translations en.json (Esperanto) * New translations en.yml (Spanish) * New translations en.json (French) * New translations en.yml (Turkish) * New translations en.json (Dutch) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.json (Japanese) * New translations en.json (Indonesian) * New translations en.json (Sinhala) * New translations en.json (Romanian) * New translations en.yml (Romanian) * New translations en.json (Armenian) * New translations en.yml (Armenian) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.yml (Slovenian) * New translations en.yml (Vietnamese) * New translations en.json (Galician) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.json (Persian) * New translations en.yml (Persian) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Dutch) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.json (Georgian) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.json (Lithuanian) * New translations en.yml (Lithuanian) * New translations en.json (Macedonian) * New translations en.yml (Macedonian) * New translations en.json (Norwegian) * New translations en.yml (Slovak) * New translations en.yml (Norwegian) * New translations en.json (Punjabi) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Russian) * New translations en.json (Slovak) * New translations en.yml (Tamil) * New translations en.json (Breton) * New translations en.yml (Esperanto) * New translations en.json (Uyghur) * New translations en.yml (Uyghur) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.json (Tatar) * New translations en.yml (Tatar) * New translations en.json (Malayalam) * New translations en.yml (Malayalam) * New translations en.yml (Breton) * New translations en.json (Welsh) * New translations en.yml (Sinhala) * New translations en.json (Cornish) * New translations en.yml (Cornish) * New translations en.json (Kannada) * New translations en.yml (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.yml (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Occitan) * New translations en.yml (Welsh) * New translations en.yml (English, United Kingdom) * New translations en.yml (Spanish, Argentina) * New translations en.json (Kazakh) * New translations en.json (Spanish, Mexico) * New translations en.yml (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.yml (Bengali) * New translations en.json (Marathi) * New translations en.yml (Marathi) * New translations en.json (Croatian) * New translations en.yml (Croatian) * New translations en.json (Norwegian Nynorsk) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.json (English, United Kingdom) * New translations en.json (Estonian) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.json (Hindi) * New translations en.yml (Hindi) * New translations en.json (Malay) * New translations en.yml (Malay) * New translations en.json (Telugu) * New translations en.yml (Telugu) * New translations en.yml (Occitan) * New translations en.json (Serbian (Latin)) * New translations en.json (Sardinian) * New translations en.yml (Kabyle) * New translations en.json (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Sardinian) * New translations en.json (Sanskrit) * New translations en.yml (Corsican) * New translations en.json (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Taigi) * New translations en.yml (Taigi) * New translations en.json (Silesian) * New translations en.yml (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Ido) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Catalan) * New translations en.yml (Greek) * New translations en.yml (Korean) * New translations en.json (Galician) * New translations en.yml (Galician) * New translations en.yml (Italian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Albanian) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (Polish) * New translations en.yml (Vietnamese) * New translations en.yml (Icelandic) * New translations en.yml (Latvian) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations activerecord.en.yml (Czech) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Turkish) * New translations en.yml (Danish) * New translations en.yml (Japanese) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Eugen Rochko |
36f4c32a38
|
Change path of privacy policy page (#19249) | |
Eugen Rochko |
ce5d092a86
|
New Crowdin updates (#19229)
* New translations en.json (Romanian) * New translations en.json (French) * New translations en.json (Afrikaans) * New translations en.json (Spanish) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Norwegian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.json (Hebrew) * New translations en.json (Italian) * 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 Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Vietnamese) * New translations en.json (Galician) * New translations en.json (Georgian) * New translations en.json (Irish) * New translations en.json (Armenian) * New translations en.json (Indonesian) * New translations en.json (Bulgarian) * New translations en.json (Ido) * New translations en.json (German) * New translations en.json (Tamil) * New translations en.json (Esperanto) * New translations en.json (Czech) * New translations en.json (Dutch) * New translations en.json (Albanian) * New translations en.json (Japanese) * New translations en.json (Sinhala) * New translations en.json (Hungarian) * New translations en.json (Arabic) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.json (Danish) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Thai) * New translations en.json (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Kurmanji (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 (Sorani (Kurdish)) * 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 (Persian) * 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.json (Greek) * New translations en.json (Portuguese) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Chinese Simplified) * New translations en.yml (Ukrainian) * New translations en.json (Spanish) * New translations en.json (Korean) * New translations en.json (Ukrainian) * New translations en.json (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.json (Danish) * New translations en.json (Italian) * New translations en.json (Russian) * New translations en.json (Chinese Traditional) * New translations en.json (Czech) * New translations en.json (Hungarian) * New translations en.json (Latvian) * New translations en.json (Turkish) * New translations en.json (Albanian) * New translations en.json (German) * New translations en.json (Polish) * New translations en.json (Slovenian) * New translations en.json (Vietnamese) * New translations en.json (Ido) * New translations en.json (French) * New translations en.json (Icelandic) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Eugen Rochko |
5c9abdeff1
|
Add retention policy for cached content and media (#19232) | |
Eugen Rochko |
3e0999cd11
|
New Crowdin updates (#19208)
* New translations en.json (Chinese Traditional) * New translations en.json (Spanish, Argentina) * New translations en.json (Galician) * New translations en.json (Ukrainian) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Spanish) * New translations en.json (Arabic) * New translations en.json (Greek) * New translations en.json (Italian) * New translations en.json (Portuguese) * New translations en.json (Hungarian) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Icelandic) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Russian) * New translations en.json (Spanish) * New translations en.json (Slovenian) * New translations en.json (Turkish) * New translations en.json (Latvian) * New translations en.json (Thai) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.yml (Ukrainian) * New translations en.json (Sinhala) * New translations en.yml (Sinhala) * New translations simple_form.en.yml (Sinhala) * New translations en.json (Vietnamese) * New translations en.json (German) * New translations activerecord.en.yml (Galician) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations en.json (Sinhala) * New translations en.json (Kurmanji (Kurdish)) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * New translations en.yml (Polish) * New translations simple_form.en.yml (Polish) * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Eugen Rochko |
0d6b878808
|
Add user content translations with configurable backends (#19218) | |
Eugen Rochko |
7191db0e43
|
New Crowdin updates (#19167)
* New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.json (Czech) * New translations en.yml (Czech) * New translations en.json (Czech) * New translations en.yml (Spanish) * New translations en.yml (Turkish) * New translations en.json (Thai) * New translations en.json (Thai) * New translations en.json (Dutch) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations activerecord.en.yml (Czech) * New translations en.json (Thai) * New translations en.yml (Czech) * New translations en.json (Albanian) * New translations en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.yml (Ukrainian) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.json (Bulgarian) * New translations en.json (Bulgarian) * New translations en.yml (Thai) * New translations en.json (Japanese) * New translations en.json (Indonesian) * New translations en.json (Sinhala) * New translations en.json (Sinhala) * New translations en.json (Sinhala) * New translations en.json (Sinhala) * New translations en.json (Sinhala) * New translations en.yml (Greek) * New translations en.yml (Afrikaans) * New translations en.json (Arabic) * New translations en.yml (Arabic) * New translations en.yml (Bulgarian) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.yml (Frisian) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.yml (Hungarian) * New translations en.json (Afrikaans) * New translations en.yml (French) * New translations en.json (Hebrew) * New translations en.json (French) * New translations en.yml (German) * New translations en.yml (Chinese Simplified) * New translations en.json (Tamil) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.yml (Romanian) * New translations en.json (Armenian) * New translations en.json (Ido) * New translations en.yml (Ido) * New translations en.yml (Armenian) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Serbian (Cyrillic)) * New translations en.yml (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.json (Persian) * New translations en.yml (Slovenian) * New translations en.yml (Slovak) * New translations en.yml (Dutch) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.json (Georgian) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.json (Lithuanian) * New translations en.yml (Lithuanian) * New translations en.json (Macedonian) * New translations en.yml (Macedonian) * New translations simple_form.en.yml (Dutch) * New translations en.json (Slovak) * New translations en.json (Norwegian) * New translations en.yml (Norwegian) * New translations en.json (Punjabi) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Russian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.json (Estonian) * New translations en.yml (English, United Kingdom) * New translations en.yml (Telugu) * New translations en.json (Telugu) * New translations en.yml (Malay) * New translations en.json (Malay) * New translations en.yml (Hindi) * New translations en.json (Hindi) * New translations en.yml (Latvian) * New translations en.yml (Estonian) * New translations en.json (English, United Kingdom) * New translations en.yml (Kazakh) * New translations en.yml (Bengali) * New translations en.json (Kazakh) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.json (Spanish, Mexico) * New translations en.json (Marathi) * New translations en.yml (Marathi) * New translations en.json (Croatian) * New translations en.yml (Croatian) * New translations en.json (Norwegian Nynorsk) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Breton) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Scottish Gaelic) * New translations en.json (Scottish Gaelic) * New translations en.yml (Kannada) * New translations en.json (Kannada) * New translations en.yml (Cornish) * New translations en.json (Cornish) * New translations en.yml (Sinhala) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Breton) * New translations en.yml (Malayalam) * New translations en.json (Malayalam) * New translations en.yml (Tatar) * New translations en.json (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Uyghur) * New translations en.json (Uyghur) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.json (Welsh) * New translations en.json (Occitan) * New translations en.yml (Occitan) * New translations en.json (Sanskrit) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (Silesian) * New translations en.json (Silesian) * New translations en.yml (Taigi) * New translations en.json (Taigi) * New translations en.yml (Kabyle) * New translations en.json (Kabyle) * New translations en.yml (Sanskrit) * New translations en.yml (Sardinian) * New translations en.json (Serbian (Latin)) * New translations en.json (Sardinian) * New translations en.yml (Corsican) * New translations en.json (Corsican) * New translations en.yml (Sorani (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.json (Dutch) * New translations en.json (Danish) * New translations en.json (Korean) * New translations en.yml (Dutch) * New translations en.json (Spanish, Argentina) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Eugen Rochko |
b312f35d24
|
New Crowdin updates (#19049)
* New translations en.yml (Spanish, Argentina) * New translations en.yml (Croatian) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Malay) * 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 (Ido) * New translations en.yml (Ukrainian) * New translations en.yml (Spanish) * New translations en.yml (Ido) * New translations simple_form.en.yml (Ido) * New translations en.yml (Portuguese) * New translations en.yml (Spanish, Argentina) * New translations en.json (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.yml (Latvian) * New translations en.yml (Latvian) * New translations en.yml (Hungarian) * New translations en.yml (Polish) * New translations en.yml (Turkish) * New translations en.yml (Italian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Icelandic) * New translations en.json (Galician) * New translations en.json (Galician) * New translations en.yml (Galician) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.json (Scottish Gaelic) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Thai) * New translations simple_form.en.yml (Norwegian) * 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 (Dutch) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Slovak) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations 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 (Basque) * New translations en.yml (Finnish) * New translations en.yml (Japanese) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Frisian) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * New translations 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 (Greek) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Sardinian) * 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 (Malayalam) * New translations simple_form.en.yml (Kabyle) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Ukrainian) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations simple_form.en.yml (Breton) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Thai) * 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 (Croatian) * 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 (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Arabic) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Chinese Simplified) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Welsh) * New translations en.yml (Chinese Traditional) * New translations en.yml (Turkish) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Greek) * New translations en.yml (Basque) * New translations en.yml (Hebrew) * New translations en.yml (Hungarian) * New translations en.yml (Italian) * New translations en.yml (Korean) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Slovenian) * New translations en.yml (Albanian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Ido) * New translations en.yml (Sardinian) * New translations en.yml (Corsican) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Sinhala) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Spanish, Argentina) * New translations en.yml (Vietnamese) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Latvian) * New translations en.yml (Latvian) * New translations en.json (Asturian) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Catalan) * New translations activerecord.en.yml (Russian) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Hungarian) * New translations en.yml (Spanish) * New translations en.yml (Hungarian) * New translations doorkeeper.en.yml (Russian) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Portuguese) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Czech) * New translations en.json (Russian) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations en.yml (Danish) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Czech) * New translations en.yml (Chinese Traditional) * New translations en.yml (Czech) * New translations simple_form.en.yml (Slovenian) * New translations en.yml (Slovenian) * New translations en.yml (Russian) * New translations simple_form.en.yml (Italian) * New translations en.yml (Italian) * New translations simple_form.en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (Korean) * New translations en.yml (German) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Polish) * New translations en.yml (Polish) * New translations en.json (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Icelandic) * New translations en.yml (Czech) * New translations en.yml (German) * New translations en.json (Hebrew) * New translations simple_form.en.yml (Hebrew) * New translations en.yml (Chinese Simplified) * New translations en.json (Bulgarian) * New translations en.json (Bulgarian) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (Ido) * New translations simple_form.en.yml (Ido) * New translations en.yml (Ido) * New translations en.json (Ido) * New translations en.yml (German) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.json (German) * New translations devise.en.yml (German) * New translations doorkeeper.en.yml (German) * New translations en.json (Tamil) * New translations en.json (Tamil) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Claire | 077183a121 |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change. |
|
Eugen Rochko |
546672e292
|
Change "Allow trends without prior review" setting to include statuses (#17977)
* Change "Allow trends without prior review" setting to include posts * Fix i18n-tasks |
|
Eugen Rochko |
2a7766dcc9
|
Add admin API for managing e-mail domain blocks (#19066) | |
Eugen Rochko |
c556c3a0d1
|
Add admin API for managing canonical e-mail blocks (#19067) | |
Eugen Rochko |
b399d79545
|
Add admin API for managing IP blocks (#19065) | |
Eugen Rochko |
0b3e4fd5de
|
Remove digest e-mails (#17985)
* Remove digest e-mails * Remove digest-related code |
|
Eugen Rochko |
5b0e8cc92b
|
Add ability to select all accounts matching search for batch actions (#19053) | |
Eugen Rochko |
0396acf39e
|
Add audit log entries for user roles (#19040)
* Refactor audit log schema * Add audit log entries for user roles |
|
Yamagishi Kazutoshi |
81e1cc5fec
|
Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409) | |
Claire | 3ff340c790 | Merge branch 'main' into glitch-soc/merge-upstream | |
Claire |
63adef2021
|
Change wording of a few filter-related strings (#19050)
Follow-up on #18945 addressing review comments |
|
Eugen Rochko |
3efa8da2d6
|
New Crowdin updates (#18972)
* 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.json (Dutch) * New translations en.json (Portuguese) * New translations en.json (Ukrainian) * New translations en.json (Chinese Traditional) * New translations en.json (Chinese Simplified) * New translations en.json (Danish) * New translations en.json (Spanish, Argentina) * New translations en.json (Korean) * New translations en.json (Catalan) * New translations en.json (Hungarian) * New translations en.json (Slovenian) * New translations en.json (Galician) * New translations en.json (Greek) * New translations en.json (Polish) * New translations en.json (Turkish) * New translations devise.en.yml (Turkish) * New translations doorkeeper.en.yml (Turkish) * New translations en.json (Albanian) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Icelandic) * New translations en.json (Latvian) * New translations en.json (Spanish) * New translations en.json (German) * New translations en.json (Italian) * New translations en.json (Ido) * New translations en.json (Russian) * New translations en.json (Vietnamese) * New translations en.yml (Esperanto) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.json (Thai) * New translations en.json (Russian) * New translations en.json (Chinese Simplified) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Turkish) * 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 (Slovak) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (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 (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 (Dutch) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Korean) * 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 (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 (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * 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 (Corsican) * New translations simple_form.en.yml (Breton) * 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 (Sinhala) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Thai) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Ukrainian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Korean) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Albanian) * New translations en.yml (Korean) * 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 (Portuguese) * New translations en.yml (Slovenian) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Italian) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Traditional) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Georgian) * New translations en.yml (Armenian) * New translations en.yml (Spanish) * New translations en.yml (Japanese) * New translations en.yml (German) * New translations en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (Afrikaans) * New translations en.yml (Hungarian) * New translations en.yml (Arabic) * New translations en.yml (Bulgarian) * New translations en.yml (Catalan) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Greek) * New translations en.yml (Frisian) * New translations en.yml (Basque) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Cornish) * New translations en.yml (Kannada) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations en.yml (Occitan) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Corsican) * New translations en.yml (Breton) * New translations en.yml (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Kabyle) * New translations en.yml (Ido) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Sinhala) * New translations en.yml (Malayalam) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Latvian) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Marathi) * New translations en.yml (Croatian) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Hindi) * New translations en.yml (Tatar) * New translations en.yml (Malay) * New translations en.yml (Telugu) * New translations en.yml (English, United Kingdom) * New translations en.yml (Welsh) * New translations en.yml (Uyghur) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Galician) * New translations en.yml (Chinese Simplified) * New translations en.yml (Galician) * New translations simple_form.en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations simple_form.en.yml (Slovenian) * New translations en.yml (Polish) * New translations en.yml (Slovenian) * New translations en.yml (Chinese Simplified) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Polish) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Vietnamese) * New translations en.yml (Spanish) * New translations en.yml (Danish) * New translations en.yml (Korean) * New translations en.yml (Vietnamese) * New translations en.yml (Icelandic) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Claire | 2d1d4210f9 | Merge branch 'main' into glitch-soc/merge-upstream | |
Jeong Arm |
861b35dd54
|
Support "http_hidden_proxy" ENV var for hidden service only proxy (#18427)
* Support "http_hidden_proxy" ENV var for hidden service only proxy * Fallback to http_proxy if http_hidden_proxy is not set |
|
Arya K |
af9c9936dd
|
Fix I2P HTTPS redirect (#18929) | |
Claire |
50487db122
|
Add ability to filter individual posts (#18945)
* Add database table for status-specific filters * Add REST endpoints, entities and attributes * Show status filters in /filters interface * Perform server-side filtering for individual posts filters * Fix filtering on context mismatch * Refactor `toServerSideType` by moving it to its own module * Move loupe and delete icons to their own module * Add ability to filter individual posts from WebUI * Replace keyword list by warnings (expired, context mismatch) * Refactor server-side filtering code * Add tests |
|
Eugen Rochko |
d83faa1a89
|
Add ability to block sign-ups from IP (#19037) | |
Claire | e2a7a458d6 | Merge branch 'main' into glitch-soc/merge-upstream | |
dependabot[bot] |
c384430ba0
|
Bump capistrano from 3.17.0 to 3.17.1 (#18949)
* Bump capistrano from 3.17.0 to 3.17.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.17.0 to 3.17.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.17.0...v3.17.1) --- updated-dependencies: - dependency-name: capistrano dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * 3.17.1 Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
Eugen Rochko |
aa33c7f26e
|
New Crowdin updates (#18905)
* New translations doorkeeper.en.yml (Chinese Traditional) * New translations en.yml (Urdu (Pakistan)) * New translations devise.en.yml (Urdu (Pakistan)) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Spanish, Argentina) * New translations devise.en.yml (Spanish, Argentina) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations activerecord.en.yml (Bengali) * New translations doorkeeper.en.yml (Tamil) * New translations devise.en.yml (Bengali) * New translations en.yml (Marathi) * New translations activerecord.en.yml (Marathi) * New translations doorkeeper.en.yml (Marathi) * New translations devise.en.yml (Thai) * New translations en.yml (Croatian) * New translations simple_form.en.yml (Croatian) * New translations en.yml (Spanish, Argentina) * New translations devise.en.yml (Tamil) * New translations devise.en.yml (Vietnamese) * New translations devise.en.yml (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Vietnamese) * New translations en.yml (Galician) * New translations simple_form.en.yml (Galician) * New translations devise.en.yml (Galician) * New translations doorkeeper.en.yml (Galician) * New translations devise.en.yml (Icelandic) * New translations doorkeeper.en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Tamil) * New translations simple_form.en.yml (Indonesian) * New translations devise.en.yml (Indonesian) * New translations doorkeeper.en.yml (Indonesian) * New translations en.yml (Persian) * New translations simple_form.en.yml (Persian) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations en.yml (Tamil) * New translations simple_form.en.yml (Tamil) * New translations activerecord.en.yml (Croatian) * New translations devise.en.yml (Croatian) * New translations en.yml (English, United Kingdom) * New translations en.yml (Telugu) * New translations doorkeeper.en.yml (Hindi) * New translations devise.en.yml (English, United Kingdom) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations en.yml (Malay) * New translations devise.en.yml (Hindi) * New translations doorkeeper.en.yml (Croatian) * New translations en.yml (Estonian) * New translations en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations devise.en.yml (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations simple_form.en.yml (Kazakh) * New translations activerecord.en.yml (Kazakh) * New translations devise.en.yml (Kazakh) * New translations doorkeeper.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations activerecord.en.yml (Hindi) * New translations activerecord.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations doorkeeper.en.yml (Latvian) * New translations en.yml (Hindi) * New translations devise.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations doorkeeper.en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Kannada) * New translations en.yml (Sinhala) * New translations devise.en.yml (Kannada) * New translations en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations activerecord.en.yml (Asturian) * New translations simple_form.en.yml (Sinhala) * New translations doorkeeper.en.yml (Breton) * New translations en.yml (Uyghur) * New translations simple_form.en.yml (Tatar) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Breton) * New translations devise.en.yml (Tatar) * New translations doorkeeper.en.yml (Tatar) * New translations en.yml (Malayalam) * New translations simple_form.en.yml (Malayalam) * New translations activerecord.en.yml (Malayalam) * New translations devise.en.yml (Malayalam) * New translations doorkeeper.en.yml (Malayalam) * New translations en.yml (Breton) * New translations simple_form.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations devise.en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations simple_form.en.yml (Kabyle) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations doorkeeper.en.yml (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Kabyle) * New translations activerecord.en.yml (Kabyle) * New translations en.yml (Sardinian) * New translations devise.en.yml (Kabyle) * New translations doorkeeper.en.yml (Kabyle) * New translations en.yml (Ido) * New translations simple_form.en.yml (Ido) * New translations devise.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations en.yml (Taigi) * New translations simple_form.en.yml (Sardinian) * New translations doorkeeper.en.yml (Corsican) * New translations en.yml (Occitan) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Occitan) * New translations activerecord.en.yml (Occitan) * New translations devise.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations devise.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Corsican) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Sorani (Kurdish)) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations simple_form.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Vietnamese) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (Ido) * New translations en.yml (German) * New translations en.yml (German) * New translations en.json (Hebrew) * New translations en.json (Hebrew) * New translations en.yml (Hebrew) * New translations activerecord.en.yml (German) * New translations en.yml (Hebrew) * New translations en.json (Scottish Gaelic) * New translations en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.json (Spanish) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations activerecord.en.yml (German) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations devise.en.yml (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.json (Slovak) * New translations en.json (Finnish) * New translations en.json (Finnish) * New translations simple_form.en.yml (Finnish) * New translations activerecord.en.yml (Finnish) * New translations doorkeeper.en.yml (Finnish) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.yml (German) * New translations en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Norwegian Nynorsk) * New translations en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations devise.en.yml (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations en.yml (Norwegian Nynorsk) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Albanian) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Japanese) * New translations en.yml (Japanese) * New translations activerecord.en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Esperanto) * New translations en.json (Slovak) * New translations en.yml (Slovak) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> |
|
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 |