Age | Commit message (Collapse) | Author |
|
|
|
|
|
Merge upstream changes
|
|
Port 0c9d455ea5540e854c2d879cd1df015ea493f622 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port db2c58d47ae0db8490a30cd3846f30e615c382b5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port eddfb33dfea6a17e71377d95498b557dd0194477 to glitch-soc
|
|
|
|
|
|
|
|
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
Co-authored-by: Matthew Ford <matt@bitzesty.com>
|
|
|
|
Port 4da5f77d929d6b83c134cae1eefbc8ba2db752f8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port bae17ebe5eab02879599ae8516cf6b3f6736b450 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `.prettierignore`:
Upstream added a line at the end, glitch-soc had extra entries at the end.
Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
Not a real conflict, upstream added a parameter (`allowed_mentions`) where
glitch-soc already had an extra one (`content_type`).
Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
|
|
|
|
|
|
|
|
|
|
/admin/accounts/:id page (#23467)
|
|
|
|
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
|
|
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
|
|
|
|
* Add a limit to how many posts can get fetched as a result of a single request
* Add tests
* Always pass `request_id` when processing `Announce` activities
---------
Co-authored-by: nametoolong <nametoolong@users.noreply.github.com>
|
|
|
|
* New translations en.json (Esperanto)
* New translations en.yml (Slovak)
* New translations en.json (Burmese)
* New translations en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.json (Burmese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Catalan)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Belarusian)
* New translations en.json (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Welsh)
* 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 en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Silesian)
* New translations en.yml (Occitan)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Occitan)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* Normalize
* Remove unused locales
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
Fixes #23472
|
|
|
|
Port e8cb3ee827d3bd20b0ad28dfc7358afaa43b4dad to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c1f32c9c1470d7d38342e211ff5ca326e12494fb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 67744ee779b97ea07e91dd076e1df25e362ff33d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 8f590b0a211716bcbfc0f2278a452469f3346f55 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `README.md`:
Minor upstream change, our README is completely different.
Kept ours.
- `lib/tasks/assets.rake`:
glitch-soc has extra code to deal with its theming system,
upstream changed a line that exists in glitch-soc.
Applied upstream changes.
|
|
collections (#23460)
|
|
* Apply Rubocop Rails/WhereNot
* Update spec for where.not
|
|
* Apply Rubocop Performance/BlockGivenWithExplicitBlock
* Unprefix used block parameter
|
|
|
|
|
|
|
|
|