Age | Commit message (Collapse) | Author |
|
statuses (#17977)"
This reverts commit 546672e292dc3218e996048464c4c52e5d00f766.
|
|
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.
|
|
|
|
* 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>
|
|
|
|
|
|
|
|
|
|
* 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>
|
|
Fix #19237
|
|
* 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>
|
|
|
|
|
|
* 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>
|
|
|
|
* Bump babel-jest from 28.1.3 to 29.0.3
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 28.1.3 to 29.0.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.3/packages/babel-jest)
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump jest-environment-jsdom from 28.1.3 to 29.0.3
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 28.1.3 to 29.0.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.3/packages/jest-environment-jsdom)
---
updated-dependencies:
- dependency-name: jest-environment-jsdom
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump jest from 28.1.3 to 29.0.3
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 28.1.3 to 29.0.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.0.3/packages/jest)
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
|
* 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>
|
|
|
|
|
|
|
|
The “filters” page was removed, but not from the navigation, which would offset
everything.
|
|
Caused by using JSX features without importing React
|
|
Caused by using JSX features without importing React
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
* Add regexp filter field to public timeline column settings
This has accidentally been removed while porting an upstream change years ago.
* Remove dead code
* Fix regexp filter not working for local and public TLs when using non-default settings
|
|
Port 81e1cc5fece9a431c28ca648c2dd4b1b5f643f13 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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.
|
|
* Change "Allow trends without prior review" setting to include posts
* Fix i18n-tasks
|
|
|
|
* Update timeline_hint.js
* Update timeline_hint.js
|
|
|
|
|
|
incorrect list
Port 55bef1e34fc3b07ed7f762d565a161e74e128016 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 2cae5f5b8d4d0702fe9835a0ce2782f238755d0c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
list (#19052)
Follow-up to #18960
The aforementioned PR fixed an issue in which switching notification filters
while notifications were loading prevented the query for the new filter from
running, but another issue remained: if the first query completed after the
second one, its results would override the second one, thus leading to the
same issue.
This commit cancels the first request if it is still running, before issuing
the second one.
|
|
|
|
* 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>
|
|
|
|
|
|
Port 50487db1224851a49ee523bbc013d5f8686a7a55 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 66b8abf218a87e65fab8a7fae6fc6ea73c41d750 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port a233a9bfb5f384e89bdaef6e519fa20db2a99ae5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 3c24f19afedc2169a7a343c5af4a8f892d863f0b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port front-end changes from 02851848e964675bb59919fa5fd1bdee2c1c29db to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
incorrect list
Port afb8bc97d08c2738da7873ca42fea68e4672d65b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port ba745ca99a4ce4b953e11776827aabb68d621e79 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 5d70a16a1417e53b0c6cc97def9688fda21f337c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
|