Age | Commit message (Collapse) | Author |
|
Port ec0c104bf25f2689c31bb79f9f447be1a9b3da7f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 9ef9974ff207fe91291c81c7a9b9bb83e0df8e16 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port cd14f712ad9f5a6ebdbec8c9b87740cd76d949e7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port aa136cf2fa177af1fea59279cb8bab0b2a042b2b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c0886dee1480cecedb7e8b152c848f061ab7f81e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d7b8c6db7ec4d9b3fe39cbf8f1b32d152e70b8f1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
animations
Port ffd5b2eea4503c2ee389c7aa5dff9c51dbf9f846 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 17b2fd217730e6fd598aa6664373d8d7779c28c1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 927b2fd1386bce6fda1d2ff53ceadd82289d77ce to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port ab3f23da916c8578148fe92fe008da19b8a7ed02 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port a425915ce7d1148e9505c87889936c4c497061dd to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
|
|
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
|
|
(#24354)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Port fa98363a2789f23e110312f23bf4c00234dcd59a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
|
|
Port 77bd32a26abbf8b49caf35dcdf170e312e48a277 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
|
|
|
|
|
|
|
|
Port 74f56c64fc0aa0dce0dc2c267aa8a212569e9673 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port ddb769f0b84d4bcff22472f236a4ec74c631d0a6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
|
|
|
|
|
|
|
|
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
Port d1b057a0ac41a5756b6a416d2f290b086cb59220 to glitch-soc
|
|
Port b46125224c26bc0144659b4319ea416b01289961 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|