Age | Commit message (Collapse) | Author |
|
|
|
web UI
Port 0e41d360c068deb8655dc1b9facfa4c15985c271 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 99a43f0282d5115b75a564205ca7d2db31a3a945 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d2528b26b6da34f34b5d7a392e263428d3c09d69 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Cherry-picked d2528b26b6da34f34b5d7a392e263428d3c09d69
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream changed stuff, we had extra attributes.
Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
so updated that file by keeping our extra attributes, and took upstream's
version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
Took upstream's version.
|
|
Port 7fb738c8372a700e1b42534cb202005b8c73b946 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d4b0aa74500419730525025b05513235aa477841 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port part of e2b561e3a521ff893943c0e9e32952e35934ca54 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port fc3d248df770024b5ce0f33d93029d71f5051e43 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 216dbaedaf587db834cfdd53b896e9c7e1284d9c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port part of 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e623c302d5d4dfc05689eb8fb8e051e30fc38ec8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port fixes from e623c302d5d4dfc05689eb8fb8e051e30fc38ec8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port part of 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c8245e64c5173f34401c562fe32551dcab8e68b7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Partial port from 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port part of 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
Port f382192862893c48cf97f13e9fbfb85b80cdc97d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 8751c3c4954799aec24cecc1cae68df27d19ceee to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
layout in web UI (#17760)
Port fa47c37f13c7fa4d38edd83818f681cf99d6ea9c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e38a01c41add3dbbb0a9a7a68e591ce8313aa13a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e52085246f86809ec32f3edc5be226ce15b03457 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port remaining changes from dba4be1038063845a74e83aaa85d6ab08d5625dd to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 54d4ece7432a34a2ba24617851f04801e5a389d8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port cb2e198d89dfb86a81fff8e11eac531b658e9ef2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d4592bbfcd091c4eaef8c8f24c47d5c2ce1bacd3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 18ca4e0e9a3f74a6f21d329882b429f8f5227b0f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port SCSS changes from 5b0e8cc92b9ca0ab0dc24366d95f67a88c470173
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
|
|
|
|
Fixes #1852
This was an oversight from last upstream merge, failing to account for
glitch-soc's theming system.
|
|
|
|
* New translations en.yml (Thai)
* New translations en.yml (Greek)
* New translations en.yml (Afrikaans)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Bulgarian)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Spanish)
* New translations en.yml (Frisian)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Hebrew)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Afrikaans)
* New translations en.yml (French)
* New translations en.json (Hebrew)
* New translations en.json (Czech)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (Bulgarian)
* New translations en.json (Ido)
* New translations en.json (German)
* New translations en.json (Tamil)
* New translations en.json (Esperanto)
* New translations en.yml (Spanish)
* New translations en.json (French)
* New translations en.yml (Turkish)
* New translations en.json (Dutch)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.json (Japanese)
* New translations en.json (Indonesian)
* New translations en.json (Sinhala)
* New translations en.json (Romanian)
* New translations en.yml (Romanian)
* New translations en.json (Armenian)
* New translations en.yml (Armenian)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Serbian (Cyrillic))
* New translations en.yml (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.json (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.json (Persian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovak)
* New translations en.json (Italian)
* New translations en.yml (Dutch)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.json (Georgian)
* New translations en.yml (Georgian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Lithuanian)
* New translations en.yml (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.yml (Macedonian)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Slovak)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.json (Punjabi)
* New translations en.yml (Punjabi)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Malayalam)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.json (Uyghur)
* New translations en.yml (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.yml (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Breton)
* New translations en.yml (Sinhala)
* New translations en.json (Cornish)
* New translations en.yml (Cornish)
* New translations en.json (Kannada)
* New translations en.yml (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Welsh)
* New translations en.json (English, United Kingdom)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.yml (Bengali)
* New translations en.json (Marathi)
* New translations en.yml (Marathi)
* New translations en.json (Croatian)
* New translations en.yml (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.yml (Telugu)
* New translations en.yml (Kazakh)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.json (Hindi)
* New translations en.yml (Hindi)
* New translations en.json (Malay)
* New translations en.yml (Malay)
* New translations en.json (Telugu)
* New translations en.json (Occitan)
* New translations en.yml (Occitan)
* New translations en.json (Sanskrit)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Silesian)
* New translations en.json (Silesian)
* New translations en.yml (Taigi)
* New translations en.json (Taigi)
* New translations en.yml (Kabyle)
* New translations en.json (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Sardinian)
* New translations en.yml (Corsican)
* New translations en.json (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Dutch)
* New translations en.json (Japanese)
* New translations en.json (Catalan)
* New translations en.json (Italian)
* New translations en.json (Korean)
* New translations en.yml (Dutch)
* New translations en.json (Slovenian)
* New translations en.json (Ukrainian)
* New translations en.json (Icelandic)
* New translations activerecord.en.yml (Dutch)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.json (Japanese)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations activerecord.en.yml (Dutch)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.json (Latvian)
* New translations en.yml (Asturian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Ido)
* New translations en.json (Chinese Traditional)
* New translations en.json (Danish)
* New translations en.json (Galician)
* New translations en.json (Turkish)
* New translations en.json (Albanian)
* New translations en.json (Italian)
* New translations en.json (Russian)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Spanish)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Port 50948b46aabc0756d85bc6641f0bd3bcc09bf7d4 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 36f4c32a38ed85e5e658b34d36eac40a6147bc0c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d2f7e30a283a1dca1f7974884ac0c237b93903ad to glitch-soc
|
|
|
|
statuses (#17977)"
This reverts commit 546672e292dc3218e996048464c4c52e5d00f766.
|
|
This reverts commit c57907737a35d05d4bb936acd662df6ce725456f.
|
|
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.
|
|
|