Age | Commit message (Collapse) | Author |
|
Conflicts:
- `package.json`:
Upstream updated `jest`, moving its config in a separate file.
This config was modified in glitch-soc, so the corresponding changes have
been ported to `jest.config.js`
|
|
|
|
|
|
|
|
|
|
|
|
Port part of be0bc9acbffe2d6126f382b946be0469d756048c and 7e244879feaa8de9894e1147ff49a7e762fe462a
to glitch-soc
|
|
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
|
|
(#18289)
Partially reverts #18146
|
|
* New translations activerecord.en.yml (Ido)
* New translations en.json (Ido)
* New translations activerecord.en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Russian)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Armenian)
* New translations en.json (Japanese)
* New translations en.json (Armenian)
* New translations en.yml (Armenian)
* New translations en.json (Japanese)
* New translations doorkeeper.en.yml (Armenian)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations en.json (Spanish)
* New translations en.json (Portuguese)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Portuguese)
* New translations devise.en.yml (Chinese Simplified)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Galician)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.json (Czech)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Ido)
* New translations en.json (Icelandic)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.yml (Hungarian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Cornish)
* New translations en.yml (Irish)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Marathi)
* New translations en.yml (Malay)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Telugu)
* New translations en.yml (Breton)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (Chinese Simplified)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Japanese)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Vietnamese)
* New translations en.yml (Greek)
* New translations en.yml (Catalan)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Persian)
* New translations en.yml (Czech)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Russian)
* New translations en.yml (Hungarian)
* New translations en.yml (Swedish)
* New translations en.yml (Indonesian)
* New translations en.yml (Swedish)
* New translations en.yml (Welsh)
* New translations en.json (Swedish)
* New translations en.yml (Danish)
* New translations en.yml (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
Port a8e27ac4d10b55f9fe252c2ffcc1b54c5179fb04 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `app/javascript/packs/admin.js`:
Conflicts due to glitch-soc's theming system.
Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
Minor conflict due to glitch-soc's option to allow CWed toots in trends.
Ported upstream changes.
|
|
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Tatar)
* New translations en.yml (Sinhala)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.json (Asturian)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Corsican)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (Armenian)
* New translations en.json (Basque)
* New translations doorkeeper.en.yml (Basque)
* New translations en.json (Finnish)
* New translations doorkeeper.en.yml (Finnish)
* New translations en.json (Hebrew)
* New translations doorkeeper.en.yml (Hebrew)
* New translations en.json (Hungarian)
* New translations doorkeeper.en.yml (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Greek)
* New translations doorkeeper.en.yml (Italian)
* New translations en.json (Georgian)
* New translations doorkeeper.en.yml (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (German)
* New translations en.json (Galician)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Slovak)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.json (Icelandic)
* New translations en.json (Norwegian)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Spanish)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.json (Danish)
* New translations en.json (Punjabi)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Bengali)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.json (Persian)
* New translations doorkeeper.en.yml (Persian)
* New translations en.json (Tamil)
* New translations doorkeeper.en.yml (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations en.json (Marathi)
* New translations doorkeeper.en.yml (Marathi)
* New translations en.json (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations en.json (Croatian)
* New translations doorkeeper.en.yml (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations doorkeeper.en.yml (Kazakh)
* New translations en.json (Indonesian)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.json (Polish)
* New translations en.json (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Polish)
* New translations en.json (Portuguese)
* New translations doorkeeper.en.yml (Portuguese)
* New translations en.json (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.json (Slovenian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations en.json (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Galician)
* New translations en.json (Swedish)
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Kannada)
* New translations en.json (Latvian)
* New translations en.json (Cornish)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.json (Sinhala)
* New translations doorkeeper.en.yml (Breton)
* New translations en.json (Breton)
* New translations doorkeeper.en.yml (Malayalam)
* New translations en.json (Malayalam)
* New translations doorkeeper.en.yml (Tatar)
* New translations en.json (Tatar)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Hindi)
* New translations en.json (Malay)
* New translations en.json (Hindi)
* New translations en.json (Telugu)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Uyghur)
* New translations doorkeeper.en.yml (Sardinian)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations doorkeeper.en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Kabyle)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations en.json (Sardinian)
* New translations doorkeeper.en.yml (Corsican)
* New translations en.json (Corsican)
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Serbian (Latin))
* New translations doorkeeper.en.yml (Occitan)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Danish)
* New translations en.json (Danish)
* New translations en.json (Icelandic)
* New translations en.json (Korean)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.json (Chinese Traditional)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Catalan)
* New translations en.json (Catalan)
* New translations en.json (Vietnamese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Vietnamese)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Japanese)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* Restore en locales
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Greek)
* New translations en.json (Chinese Traditional)
* New translations en.json (Greek)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (Chinese Traditional)
* New translations en.json (Russian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Afrikaans)
* New translations en.json (Russian)
* New translations en.json (Afrikaans)
* New translations en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.json (Welsh)
* New translations en.json (Dutch)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Catalan)
* New translations en.json (Icelandic)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Thai)
* New translations en.json (Hungarian)
* New translations en.json (German)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (German)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Indonesian)
* New translations en.json (Tatar)
* New translations en.json (Tatar)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Czech)
* New translations en.json (Italian)
* New translations en.json (Italian)
* New translations en.json (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Japanese)
* New translations en.json (Latvian)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.json (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
- Change name of conversations column in web UI
- Change hotkey for opening conversations column from `g d` to `g c` in web UI
- Remove shortcuts for creating direct-visibility statuses from web UI
|
|
|
|
Port eed5a4bf9c7e41a03ebab92dd45ebc1b899dc768 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
|
|
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations devise.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.yml (Irish)
[ci skip]
* New translations en.yml (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations activerecord.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations activerecord.en.yml (Scottish Gaelic)
[ci skip]
* New translations devise.en.yml (Scottish Gaelic)
[ci skip]
* New translations doorkeeper.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
https://cybre.tech/cybrespace/mastodon/raw/branch/cybrespace-3.3/app/javascript/styles/win95.scss
|
|
|
|
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Sinhala)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Marathi)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Catalan)
* New translations en.yml (Japanese)
* New translations en.json (Catalan)
* New translations en.yml (Greek)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Turkish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Latvian)
* New translations en.yml (Czech)
* New translations en.yml (Russian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Korean)
* New translations en.yml (Vietnamese)
* New translations en.yml (Catalan)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Italian)
* New translations en.yml (Hungarian)
* New translations en.yml (Thai)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (Irish)
* New translations activerecord.en.yml (Irish)
* New translations devise.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Thai)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Turkish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
* New translations en.json (Vietnamese)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Japanese)
* New translations en.yml (French)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Turkish)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Vietnamese)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.yml (Turkish)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations devise.en.yml (Turkish)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.yml (German)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.yml (French)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.yml (French)
* New translations en.yml (Catalan)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Catalan)
* New translations en.json (Vietnamese)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (Spanish)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Bengali)
* New translations en.yml (Malay)
* New translations en.yml (Marathi)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Breton)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Sinhala)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Standard Moroccan Tamazight)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
|
|
* New translations en.json (Catalan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Sanskrit)
* New translations en.yml (Asturian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Kabyle)
* New translations en.yml (Cornish)
* New translations en.yml (Ido)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Czech)
* New translations en.json (Hungarian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Bengali)
* New translations en.yml (Hindi)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Malay)
* New translations en.yml (Breton)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.json (Icelandic)
* New translations en.json (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Icelandic)
* New translations en.json (Korean)
* New translations en.json (Polish)
* New translations en.yml (Albanian)
* New translations en.json (Albanian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.json (Vietnamese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Latvian)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Latvian)
* New translations en.yml (Spanish)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Swedish)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Turkish)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Czech)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Greek)
* New translations en.json (Greek)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Czech)
* New translations en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (French)
* New translations en.yml (Indonesian)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Catalan)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
Websocket/EventSource stream
Port a39bf04fe6b6a98547737cc15f42727428376e67 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port ebe01ea194104b14af6cd6abe6d20637f1a3e140 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
Upstream added settings where we had extra glitch-soc-specific settings.
Added upstream's new settings.
- `app/models/user.rb`:
Upstream added settings where we had extra glitch-soc-specific settings.
Added upstream's new settings.
- `config/i18n-tasks.yml`:
Not a real conflict, just a new upstream line too textually close to
a glitch-soc-only line.
Ported upstream's change.
|
|
stream (#17987)
|
|
* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Basque)
* New translations en.yml (Finnish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Catalan)
* New translations en.yml (Spanish)
* New translations en.yml (French)
* New translations en.yml (Arabic)
* New translations en.yml (Armenian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Polish)
* New translations en.yml (Punjabi)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Portuguese)
* New translations en.yml (Albanian)
* New translations en.yml (Dutch)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Norwegian)
* New translations en.yml (Korean)
* New translations en.yml (Macedonian)
* New translations en.yml (Slovenian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Vietnamese)
* New translations en.yml (Lithuanian)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Galician)
* New translations en.yml (Georgian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Sinhala)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Marathi)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (German)
* New translations en.yml (Icelandic)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Italian)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Latvian)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Indonesian)
* New translations en.yml (Czech)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Korean)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Italian)
* New translations en.yml (Galician)
* New translations en.yml (French)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Breton)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Latvian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Catalan)
* New translations en.yml (Latvian)
* New translations en.yml (Catalan)
* New translations en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Swedish)
* New translations en.yml (Russian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Turkish)
* New translations en.yml (Polish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Italian)
* New translations en.yml (Spanish)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Breton)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Vietnamese)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalzie`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
* Fix potentially missing statuses when reconnecting to websocket
* Add gap on reconnect rather than maintaining it constantly
|
|
Port 1b91359a4508b3068207ef4fd798a56549575591 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
In some rare cases, when receiving statuses out of order from the streaming
API then polling from the REST API, it was possible for the
`expandNormalizedTimeline` function to remove older items from the timeline.
This commit ensures that any item from the replaced slice that is older
than the oldest item retrieved from the API gets added back to the replaced
slice.
|
|
|
|
Port dd4c156f33a24b8bb89b45b2697aa4036c3ae5be to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
Upstream removed this file, while glitch-soc had changes to deal with
its theming system.
Removed the file like upstream did.
|
|
In some rare cases, when receiving statuses out of order from the streaming
API then polling from the REST API, it was possible for the
`expandNormalizedTimeline` function to insert duplicates in the timeline,
which would then result in several bugs.
This commits ensures that there are no duplicates inserted in the
timeline.
|
|
(#17970)
|
|
Port 0ec695e036dab45d57598f451266bd0b176df9fd to glitch-soc
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
|
|
|
|
* Replace deprecated String.prototype.substr()
.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated
* Change String.prototype.substring() to String.prototype.slice()
.substring() and .slice() work very similary but .slice() is a bit faster and stricter
* Add ESLint rule to forbid usage of .substr and .substring
.substr() is deprecated and .substring() is very similar to .slice() so better to use .slice() at all times
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
|
|
|