prplecake
426c456a59
Clarify language RE secondary toot button ( #1851 )
2 years ago
Eugen Rochko
c6920e1cdc
New Crowdin updates ( #19289 )
...
* New translations devise.en.yml (Tamil)
* New translations doorkeeper.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Marathi)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations activerecord.en.yml (Bengali)
* New translations devise.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Hindi)
* New translations devise.en.yml (Malayalam)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Tatar)
* New translations doorkeeper.en.yml (Tatar)
* New translations simple_form.en.yml (Malayalam)
* New translations activerecord.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Malayalam)
* New translations simple_form.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations devise.en.yml (Breton)
* New translations doorkeeper.en.yml (Breton)
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Sinhala)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Hindi)
* New translations doorkeeper.en.yml (Hindi)
* 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 simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations doorkeeper.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Sardinian)
* New translations devise.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations devise.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Occitan)
* New translations devise.en.yml (Kannada)
* 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 simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations devise.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Romanian)
* New translations en.json (Arabic)
* New translations en.yml (Afrikaans)
* New translations en.json (Spanish)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.json (Catalan)
* New translations en.json (Romanian)
* New translations en.yml (Catalan)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Greek)
* New translations en.yml (Greek)
* New translations en.yml (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.yml (Spanish)
* New translations en.yml (Arabic)
* New translations en.yml (Basque)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations en.json (Irish)
* New translations en.json (Basque)
* New translations en.json (Frisian)
* New translations en.yml (Hebrew)
* New translations en.yml (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Sinhala)
* New translations en.json (Indonesian)
* New translations en.json (Japanese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.json (Albanian)
* New translations en.json (Dutch)
* New translations en.yml (Turkish)
* New translations en.json (Esperanto)
* New translations en.json (Tamil)
* New translations en.json (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Thai)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Slovenian)
* New translations en.yml (Slovenian)
* 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.yml (Chinese Traditional)
* New translations en.json (Slovak)
* New translations en.json (Urdu (Pakistan))
* 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 (Slovak)
* New translations en.yml (Russian)
* New translations en.json (Armenian)
* New translations en.json (Macedonian)
* New translations en.yml (Armenian)
* New translations en.json (Italian)
* 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.yml (Lithuanian)
* New translations en.json (Russian)
* New translations en.yml (Dutch)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Malayalam)
* New translations en.yml (Telugu)
* New translations en.yml (Malayalam)
* New translations en.json (Breton)
* New translations en.yml (Breton)
* New translations en.yml (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Telugu)
* New translations en.yml (Persian)
* New translations en.yml (Croatian)
* New translations en.yml (Tamil)
* New translations en.json (Spanish, Argentina)
* 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 (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Malay)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* 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.json (Malay)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Occitan)
* New translations en.yml (Sardinian)
* New translations en.yml (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.yml (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.json (Corsican)
* New translations en.yml (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Kabyle)
* New translations en.yml (Kabyle)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Greek)
* New translations en.json (Slovenian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Czech)
* New translations en.json (Russian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Ido)
* New translations en.json (Ukrainian)
* New translations en.json (Icelandic)
* New translations en.json (Korean)
* New translations en.json (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko
284d6d313a
Change font size of active users in server banner to be larger in web UI ( #19295 )
2 years ago
Eugen Rochko
85a10f182e
Change public timelines to be filtered by current locale by default ( #19291 )
...
In the absence of an opt-in to multiple specific languages in the
preferences, it makes more sense to filter by the user's presumed
language only (interface language or `lang` override)
2 years ago
Eugen Rochko
c603978cf6
Add server banner to web app, add `GET /api/v2/instance` to REST API ( #19294 )
2 years ago
Claire
c2c59a75cb
Fix deleted pinned posts potentially counting towards the pinned posts limit ( #19005 )
...
Fixes #18938
2 years ago
Eugen Rochko
58c367fb47
Remove code for rendering public and hashtag timelines outside the web UI ( #19257 )
2 years ago
Eugen Rochko
2d634b669b
Fix logged-out web UI on smaller screens ( #19263 )
2 years ago
Eugen Rochko
e0e9eef5e3
New Crowdin updates ( #19255 )
...
* 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>
2 years ago
Yamagishi Kazutoshi
782154a762
Fix missing await ( #19273 )
2 years ago
Yamagishi Kazutoshi
c745b1caf0
Disable push notification when not logged in ( #19272 )
2 years ago
Claire
750c9cf5b3
Fix clicking bookmark column header not scrolling to top in single-column
2 years ago
Claire
1c0f550cf3
Fix clicking List timeline header not scrolling to top in single-column
2 years ago
Claire
6c495231b2
Fix “Change subscribed languages” crashing in some situations ( #19268 )
2 years ago
Claire
ea36d0f294
Fix “Change subscribed languages” crashing in some situations
2 years ago
Eugen Rochko
699be6d185
[Glitch] Add ability to filter followed accounts' posts by language
...
Port f4e91041b2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
f833894675
[Glitch] Change path of privacy policy page
...
Port c04359a63b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
45bfc39a81
[Glitch] Add privacy icons to report modal
...
Port 12cb437127
to glitch-soc
2 years ago
Claire
735498abe9
Revert server-side part of "Add logged-out access to the web UI"
2 years ago
Claire
4e066c5e1e
Revert "Change "Allow trends without prior review" setting to include statuses ( #17977 )"
...
This reverts commit ecddc06474
.
2 years ago
Claire
6b9e47b82b
Revert "Change search API to be accessible without being logged in ( #18963 )"
...
This reverts commit 4207f3d8fc
.
2 years ago
Claire
a4fc7ac922
Merge branch 'main' into glitch-soc/merge-upstream
...
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.
2 years ago
Eugen Rochko
93ef719ce2
Remove volume number from hashtags in web UI ( #19253 )
2 years ago
Eugen Rochko
9f43753cb5
New Crowdin updates ( #19252 )
...
* 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>
2 years ago
Eugen Rochko
ab49ef4a74
Fix wrong logo on start screen in web UI ( #19254 )
2 years ago
Eugen Rochko
c04359a63b
Change path of privacy policy page ( #19249 )
2 years ago
Eugen Rochko
cd9a0f136d
Add sign-up button to logged-out web UI ( #19250 )
2 years ago
Eugen Rochko
babebc4e8a
Add logged-out access to the web UI ( #18961 )
2 years ago
Eugen Rochko
195560b03a
Fix content retention policy settings not accepting a blank value ( #19248 )
2 years ago
Eugen Rochko
8dcb50e11b
New Crowdin updates ( #19229 )
...
* 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>
2 years ago
Eugen Rochko
f6f08aa610
Fix language dropdown sometimes not appearing in web UI ( #19246 )
...
When user has no locale preference saved (such as never changing it
from the default), the preferred posting language is nil, and
the dropdown is not visible
2 years ago
Eugen Rochko
798ed9890d
Fix translations not being formatted, other issues in web UI ( #19245 )
...
Fix #19237
2 years ago
Yamagishi Kazutoshi
18159affbf
Fix auto detect language for translate service ( #19244 )
2 years ago
Eugen Rochko
7a482567f8
Add retention policy for cached content and media ( #19232 )
2 years ago
Eugen Rochko
6312658fb7
New Crowdin updates ( #19208 )
...
* 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>
2 years ago
Claire
ff4cd068a3
Fix crash in FetchRemoteKeyService ( #19225 )
...
Fix regression from #19212
2 years ago
Eugen Rochko
a593188ded
Add user content translations with configurable backends ( #19218 )
2 years ago
Claire
12cb437127
Add privacy icons to report modal ( #19190 )
2 years ago
Claire
e1d78575c4
Refactor ActivityPub handling to prepare for non-Account actors ( #19212 )
...
* Move ActivityPub::FetchRemoteAccountService to ActivityPub::FetchRemoteActorService
ActivityPub::FetchRemoteAccountService is kept as a wrapper for when the actor is
specifically required to be an Account
* Refactor SignatureVerification to allow non-Account actors
* fixup! Move ActivityPub::FetchRemoteAccountService to ActivityPub::FetchRemoteActorService
* Refactor ActivityPub::FetchRemoteKeyService to potentially return non-Account actors
* Refactor inbound ActivityPub payload processing to accept non-Account actors
* Refactor inbound ActivityPub processing to accept activities relayed through non-Account
* Refactor how Account key URIs are built
* Refactor Request and drop unused key_id_format parameter
* Rename ActivityPub::Dereferencer `signature_account` to `signature_actor`
2 years ago
Claire
2b97fbbd88
Fix typo in SignatureVerification ( #19209 )
...
Fix regression from #15605
2 years ago
Eugen Rochko
10b90b79e7
New Crowdin updates ( #19167 )
...
* 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>
2 years ago
Eugen Rochko
f4e91041b2
Add ability to filter followed accounts' posts by language ( #19095 )
2 years ago
Claire
4be7a4764e
Fix ProcessMentionService swallowing unprocessed mentions to unconfirmed/unapproved users ( #19191 )
2 years ago
Claire
b8853ddcb9
Improve error reporting and logging when processing remote accounts ( #15605 )
...
* Add a more descriptive PrivateNetworkAddressError exception class
* Remove unnecessary exception class to rescue clause
* Remove unnecessary include to JsonLdHelper
* Give more neutral error message when too many webfinger redirects
* Remove unnecessary guard condition
* Rework how “ActivityPub::FetchRemoteAccountService” handles errors
Add “suppress_errors” keyword argument to avoid raising errors in
ActivityPub::FetchRemoteAccountService#call (default/previous behavior).
* Rework how “ActivityPub::FetchRemoteKeyService” handles errors
Add “suppress_errors” keyword argument to avoid raising errors in
ActivityPub::FetchRemoteKeyService#call (default/previous behavior).
* Fix Webfinger::RedirectError not being a subclass of Webfinger::Error
* Add suppress_errors option to ResolveAccountService
Defaults to true (to preserve previous behavior). If set to false,
errors will be raised instead of caught, allowing the caller to be
informed of what went wrong.
* Return more precise error when failing to fetch account signing AP payloads
* Add tests
* Fixes
* Refactor error handling a bit
* Fix various issues
* Add specific error when provided Digest is not 256 bits of base64-encoded data
* Please CodeClimate
* Improve webfinger error reporting
2 years ago
trwnh
e6d37ae8d3
Fix breaking change in admin account API ( #19176 )
...
* Fix breaking change in admin account API
Ensure that `ip` is a String value and not returning a raw database entry
* please rubocop
2 years ago
dependabot[bot]
46d7636dcb
Bump jest from 28.1.3 to 29.0.3 ( #19162 )
...
* 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>
2 years ago
Eugen Rochko
5c17165d05
New Crowdin updates ( #19049 )
...
* 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>
2 years ago
Claire
534077cea2
Fix REST API sometimes returning HTML on error ( #19135 )
...
Fixes #19115
2 years ago
Mélanie Chauvel
17dc4201f0
Make composers button all aligned and the same size ( #1843 )
2 years ago
Claire
dadb98634c
Fix regexp filtering in pinned community/public TLs ( #1840 )
2 years ago
Claire
0dfcf54d06
Fix position of “expand” icon in media modal on glitch-soc ( #1838 )
2 years ago
Claire
a6d6d303f7
Fix error when accessing /filters/:id/statuses on glitch-soc ( #1837 )
...
I failed to account for glitch-soc's theming system when merging
from upstream.
2 years ago
Claire
4c688d82b4
Fix local settings navigation ( #1836 )
...
The “filters” page was removed, but not from the navigation, which would offset
everything.
2 years ago
Claire
f5b0cfe050
Fix WebUI error in development mode ( #19078 )
...
Caused by using JSX features without importing React
2 years ago
Claire
1b3977b3fb
Fix WebUI error in development mode ( #1835 )
...
Caused by using JSX features without importing React
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
b7e297dc6c
Add regexp filter field to public timeline column settings ( #1834 )
...
* 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
2 years ago
Yamagishi Kazutoshi
a348bc9e84
[Glitch] Replace to `workbox-webpack-plugin` from `offline-plugin`
...
Port f922858b78
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
cefde556b6
Revert "Remove preference to aggregate reblogs in home/list feeds ( #18112 )"
...
This reverts commit dd5b90e4f2
.
2 years ago
Claire
2a7538aeed
Merge branch 'main' into glitch-soc/merge-upstream
...
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.
2 years ago
Eugen Rochko
ecddc06474
Change "Allow trends without prior review" setting to include statuses ( #17977 )
...
* Change "Allow trends without prior review" setting to include posts
* Fix i18n-tasks
2 years ago
Eugen Rochko
4207f3d8fc
Change search API to be accessible without being logged in ( #18963 )
...
But with the resolve option turned off
2 years ago
Eugen Rochko
7c8bba150b
Change following and followers API to be accessible without being logged in ( #18964 )
2 years ago
Eugen Rochko
e7cc67d505
Add admin API for managing e-mail domain blocks ( #19066 )
2 years ago
Eugen Rochko
a0bb5674d9
Add admin API for managing canonical e-mail blocks ( #19067 )
2 years ago
Eugen Rochko
71f59e78b8
Add admin API for managing IP blocks ( #19065 )
2 years ago
Jeong Arm
c3ee35282d
Fix react warning on notifications column ( #1832 )
2 years ago
Claire
8aaa9a7595
Fix incorrect and slow cache invalidation in ClearDomainMediaService ( #19062 )
...
Fixes #19060
2 years ago
Shlee
708e3b3992
Add rel="noopener" to links to remote profiles ( #19014 )
...
* Update timeline_hint.js
* Update timeline_hint.js
2 years ago
Eugen Rochko
218654bf07
Fix "select all matching items" being offered when all items are on the page ( #19054 )
2 years ago
Eugen Rochko
dd5b90e4f2
Remove preference to aggregate reblogs in home/list feeds ( #18112 )
2 years ago
Eugen Rochko
7300beadd9
Remove digest e-mails ( #17985 )
...
* Remove digest e-mails
* Remove digest-related code
2 years ago
Eugen Rochko
1206e691bd
Add ability to select all accounts matching search for batch actions ( #19053 )
2 years ago
Eugen Rochko
54eee9d981
Add meta tag for official iOS app ( #16599 )
2 years ago
Eugen Rochko
f9ebc320ed
Add audit log entries for user roles ( #19040 )
...
* Refactor audit log schema
* Add audit log entries for user roles
2 years ago
Yamagishi Kazutoshi
f922858b78
Replace to `workbox-webpack-plugin` from `offline-plugin` ( #18409 )
2 years ago
Claire
4769a7f569
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port cd8d6a286e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
76e2074e47
[Glitch] Fix “Filter this post” potentially listing deleted filters
...
Port 1d3d86fa53
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
ae8d479635
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire
cd8d6a286e
Fix quickly switching notification filters resulting in empty or incorrect 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.
2 years ago
Claire
1d3d86fa53
Fix “Filter this post” potentially listing deleted filters ( #19051 )
2 years ago
Eugen Rochko
6cf1aaeb4c
New Crowdin updates ( #18972 )
...
* 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>
2 years ago
Claire
06dd2120ce
Fix glitch-soc-specific timeline filtering logic
2 years ago
Claire
cf0ca96ca7
Remove obsolete filter local settings
2 years ago
Claire
e1d3397818
[Glitch] Add ability to filter individual posts
...
Port 522fbf9d13
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Takeshi Umeda
4116cc4e83
[Glitch] Fix case where boolean was passed to onFilter on StatusActionBar
...
Port ae20601c67
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
98594fd4e4
[Glitch] Remove dead code in WebUI filtering code
...
Port 64588263f7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
6ce8b42ff1
[Glitch] Fix reblogged statuses being erroneously shown as filtered
...
Port 106b27830b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
60649e5665
[Glitch] Revamp post filtering system
...
Port front-end changes from 90e5a9bd98
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
58261f2888
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port ef1b55caa6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
e0055fdcf7
[Glitch] Fix media modal link button
...
Port f3bad2e26f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Takeshi Umeda
134c785426
[Glitch] Fix action type for unfollowHashtag
...
Port 207208fa8e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
a0c630d5ff
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Jeong Arm
30113597e5
Support "http_hidden_proxy" ENV var for hidden service only proxy ( #18427 )
...
* Support "http_hidden_proxy" ENV var for hidden service only proxy
* Fallback to http_proxy if http_hidden_proxy is not set
2 years ago
Jeong Arm
a09033d81f
Use type="color" on badge color input field ( #18825 )
...
This informs browser to use interactive color picker
2 years ago
Takeshi Umeda
207208fa8e
Fix action type for unfollowHashtag ( #18924 )
2 years ago
Takeshi Umeda
ae20601c67
Fix case where boolean was passed to onFilter on StatusActionBar ( #18923 )
2 years ago
Claire
9d14683f86
Add option for EMAIL_DOMAIN_DENYLIST/EMAIL_DOMAIN_ALLOWLIST to apply after confirmation ( #18642 )
...
Fixes #18620
2 years ago
Claire
f3bad2e26f
Fix media modal link button ( #18877 )
...
Fixes regression from #18697
2 years ago
Claire
ef1b55caa6
Fix quickly switching notification filters resulting in empty or incorrect list ( #18960 )
2 years ago
Claire
522fbf9d13
Add ability to filter individual posts ( #18945 )
...
* Add database table for status-specific filters
* Add REST endpoints, entities and attributes
* Show status filters in /filters interface
* Perform server-side filtering for individual posts filters
* Fix filtering on context mismatch
* Refactor `toServerSideType` by moving it to its own module
* Move loupe and delete icons to their own module
* Add ability to filter individual posts from WebUI
* Replace keyword list by warnings (expired, context mismatch)
* Refactor server-side filtering code
* Add tests
2 years ago
Eugen Rochko
e642516264
Change e-mail domain blocks to match subdomains of blocked domains ( #18979 )
2 years ago
Eugen Rochko
b2e1224baa
Add ability to block sign-ups from IP ( #19037 )
2 years ago
Shlee
c70629b506
[Glitch] Update notifications.js
...
Port 7af7fa3a8e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
6574050b4b
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Jeong Arm
d9cc911a88
Fix /admin/accounts/ order parameter ( #18996 )
2 years ago
Mashiro
82bb94d132
Fix ambiguous column names in `tootctl search deploy` ( #18993 )
2 years ago
Shlee
7af7fa3a8e
Update notifications.js ( #18977 )
2 years ago
Jeong Arm
c4856c0066
Properly delete remote account's avatar/header when fetch/update ( #18973 )
2 years ago
Rens Groothuijsen
6dfb31ea0c
[Glitch] Add warning for sensitive audio posts
...
Port aced8820dd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
fd0c34e13f
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko
7aef706965
New Crowdin updates ( #18905 )
...
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations activerecord.en.yml (Bengali)
* New translations doorkeeper.en.yml (Tamil)
* New translations devise.en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations activerecord.en.yml (Marathi)
* New translations doorkeeper.en.yml (Marathi)
* New translations devise.en.yml (Thai)
* New translations en.yml (Croatian)
* New translations simple_form.en.yml (Croatian)
* New translations en.yml (Spanish, Argentina)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Vietnamese)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations devise.en.yml (Galician)
* New translations doorkeeper.en.yml (Galician)
* New translations devise.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Tamil)
* New translations simple_form.en.yml (Indonesian)
* New translations devise.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations simple_form.en.yml (Persian)
* New translations activerecord.en.yml (Persian)
* New translations devise.en.yml (Persian)
* New translations doorkeeper.en.yml (Persian)
* New translations en.yml (Tamil)
* New translations simple_form.en.yml (Tamil)
* New translations activerecord.en.yml (Croatian)
* New translations devise.en.yml (Croatian)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Telugu)
* New translations doorkeeper.en.yml (Hindi)
* New translations devise.en.yml (English, United Kingdom)
* 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 simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations en.yml (Malay)
* New translations devise.en.yml (Hindi)
* New translations doorkeeper.en.yml (Croatian)
* New translations en.yml (Estonian)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations simple_form.en.yml (Kazakh)
* New translations activerecord.en.yml (Kazakh)
* New translations devise.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations devise.en.yml (Latvian)
* New translations doorkeeper.en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations devise.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations en.yml (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 (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations simple_form.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Breton)
* New translations en.yml (Uyghur)
* New translations simple_form.en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Breton)
* New translations devise.en.yml (Tatar)
* New translations doorkeeper.en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations simple_form.en.yml (Malayalam)
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations devise.en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations simple_form.en.yml (Kabyle)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations devise.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Kabyle)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Taigi)
* New translations simple_form.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Corsican)
* New translations en.yml (Occitan)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations devise.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Corsican)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Vietnamese)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Ido)
* New translations en.yml (German)
* New translations en.yml (German)
* New translations en.json (Hebrew)
* New translations en.json (Hebrew)
* New translations en.yml (Hebrew)
* New translations activerecord.en.yml (German)
* New translations en.yml (Hebrew)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Spanish)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations activerecord.en.yml (German)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Slovak)
* New translations en.json (Finnish)
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations activerecord.en.yml (Finnish)
* New translations doorkeeper.en.yml (Finnish)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Albanian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Esperanto)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Rens Groothuijsen
aced8820dd
Add warning for sensitive audio posts ( #17885 )
2 years ago
Claire
2b414f4d73
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
prplecake
cf4bed0ac0
[Glitch] Add ability to follow hashtags in web UI
2 years ago
prplecake
b682c11a6e
Merge remote-tracking branch 'mastodon/main' into cit/wip/follow-hashtags
2 years ago
Eugen Rochko
7ae2d64364
New Crowdin updates ( #18855 )
...
* New translations en.json (Hebrew)
* New translations en.json (Indonesian)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Indonesian)
* New translations en.yml (Hebrew)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Hebrew)
* New translations activerecord.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations devise.en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.json (Galician)
* New translations en.json (Punjabi)
* New translations en.json (Irish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Norwegian)
* New translations en.json (Polish)
* New translations en.json (Basque)
* New translations en.json (Russian)
* 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 Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Icelandic)
* New translations en.json (Finnish)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Albanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Japanese)
* New translations en.json (Dutch)
* New translations en.json (Portuguese)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Romanian)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Sinhala)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Indonesian)
* New translations en.json (Esperanto)
* New translations en.json (Thai)
* New translations en.json (Welsh)
* New translations en.json (Persian)
* New translations en.json (Sorani (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 (Corsican)
* New translations en.json (Malayalam)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Breton)
* New translations en.json (Tatar)
* New translations en.json (Tamil)
* 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 (Uyghur)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (Greek)
* New translations en.json (Hungarian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations en.json (Polish)
* New translations en.json (Latvian)
* New translations en.json (Albanian)
* New translations simple_form.en.yml (Turkish)
* New translations activerecord.en.yml (Turkish)
* New translations en.json (Russian)
* New translations en.json (Turkish)
* New translations en.json (Portuguese)
* New translations en.json (Spanish)
* New translations en.json (Danish)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese)
* New translations en.json (Italian)
* New translations en.json (Polish)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Kabyle)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Ido)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations activerecord.en.yml (Polish)
* New translations en.json (Korean)
* New translations en.json (Spanish)
* New translations en.json (Hindi)
* New translations en.json (Vietnamese)
* New translations activerecord.en.yml (Vietnamese)
* New translations en.json (Hindi)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Esperanto)
* New translations activerecord.en.yml (French)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.json (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Mélanie Chauvel
c2208ef466
Use slightly more margin between post buttons (under compose box) ( #1816 )
2 years ago
Claire
5e628e4fd3
Add option to share CW toggle state across instances of a post
2 years ago
Claire
a8b3d6f47e
Regroup CW unfolding settings in their own section
2 years ago
Claire
711301519a
Improve interaction between out-of-CW attachments and collapsed toots
2 years ago
Claire
42d06afe03
Add explanation for some options in the local settings dialog
2 years ago
Claire
406b7d972b
Add local setting toggle to move media attachments outside CWs
...
Fixes #1812
2 years ago
Eugen Rochko
acd3f34a31
[Glitch] Change hashtag numbers to have clearer labels in web UI
...
Port 436e52927a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
f6696f7d33
[Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
...
Port a3eda85ff9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
9bbcd2e8a0
Add ability to follow hashtags in web UI ( #18862 )
2 years ago
Claire
081005232f
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko
abb4dca69b
Fix unicode regression in #18809 ( #18863 )
2 years ago
Eugen Rochko
436e52927a
Change hashtag numbers to have clearer labels in web UI ( #18864 )
2 years ago
Claire
4536638050
Fix /api/v1/tags/:id route constraints ( #18854 )
...
The constraint was applied prior to decoding, and rejected anything containing
the '%' character, which would be used for anything with non-ASCII unicode
characters.
2 years ago
Eugen Rochko
dba05a6d36
New Crowdin updates ( #18810 )
...
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations en.json (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Icelandic)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Romanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Polish)
* New translations en.yml (Esperanto)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Chinese Simplified)
* Run `bundle exec i18n-tasks normalize`
* Fix syntax
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Yamagishi Kazutoshi
a3eda85ff9
Bump react-redux-loading-bar from 4.0.8 to 5.0.4 ( #18562 )
2 years ago
Jeong Arm
89a416c061
[Glitch] Fix badge color not affected
...
Port 9a42ccca53
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
ba5d3974eb
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Jeong Arm
9a42ccca53
Fix badge color not affected ( #18826 )
...
* Fix badge color not affected
* Generate user role css
2 years ago
Jeremy Kescher
6de2ae7d1e
Fix missing scope for current_user in _sidebar.html.haml ( #18822 )
...
Fixes https://github.com/mastodon/mastodon/issues/18821
Fix suggested by https://miaow.gay/@meganeko/108665430982072358
2 years ago
Jeong Arm
05cf49b583
Fix custom.css html escaped ( #18824 )
2 years ago
Claire
b50ab06371
Merge branch 'main' into glitch-soc/merge-upstream
...
- `.env.production.sample`:
Our sample config file is very different from upstream since it is much more
complete. Upstream added documentation for a few env variables.
Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
Upstream added a timeline type (hashtags), while glitch-soc already had an
extra one (direct messages). Not really a conflict but textually close
changes.
Ported upstream's changes.
- `app/models/custom_emoji.rb`:
Upstream upped the custom emoji size limit, while glitch-soc had configurable
limits.
Upped the default limits accordingly.
- `streaming/index.js`:
Upstream reworked how hastags were normalized. Minor conflict due to
glitch-soc's handling of instance-local posts.
Ported upstream's changes.
2 years ago
Eugen Rochko
265c09fef1
Add ability to follow hashtags ( #18809 )
2 years ago
Claire
0e504e67f3
Add support for editing labelling of one's own role ( #18812 )
...
Still disallow edition of rank or permissions
2 years ago
Eugen Rochko
731dfd285e
New Crowdin updates ( #18781 )
...
* 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 (Tamil)
* 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.yml (Slovenian)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Danish)
* New translations en.json (Polish)
* New translations en.json (Slovenian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Ido)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Danish)
* New translations activerecord.en.yml (Danish)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Latvian)
* New translations en.yml (Czech)
* New translations en.json (Czech)
* New translations en.json (Greek)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Korean)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Hungarian)
* New translations activerecord.en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations activerecord.en.yml (Catalan)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Georgian)
* 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 (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Italian)
* 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 (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Esperanto)
* New translations en.json (Ukrainian)
* 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 (Bulgarian)
* New translations simple_form.en.yml (Hungarian)
* 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 (German)
* 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 (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* 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 (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sinhala)
* 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 (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Latvian)
* 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 (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations activerecord.en.yml (Ukrainian)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (Polish)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Spanish)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Korean)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.json (Sinhala)
* New translations activerecord.en.yml (Sinhala)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Hungarian)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Polish)
* New translations en.yml (Thai)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations activerecord.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (French)
* New translations activerecord.en.yml (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations activerecord.en.yml (French)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations en.yml (Portuguese)
* New translations en.json (Vietnamese)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko
57cf1c5a98
Fix nil error when rendering featured hashtags on profile ( #18808 )
...
Regression from #18795
2 years ago
Eugen Rochko
38d04135bf
Change how hashtags are normalized ( #18795 )
...
* Change how hashtags are normalized
* Fix tests
2 years ago
Eugen Rochko
89ef936126
Change custom emoji file size limit from 50 KB to 256 KB ( #18788 )
2 years ago
Claire
16d11acb2b
Fix various in the user role management UI ( #18777 )
...
* Reword priority description
* Disable checkboxes for permissions you can't enable in role edition interface
* Set max priority in HTML attribute
* Explicitly link to role edition, do not link when you can't edit
* Reword priority description based on review
2 years ago
Jeremy Kescher
45fd0464de
ip_cleanup_scheduler: Make IP and session retention configurable ( #18757 )
2 years ago
Eugen Rochko
092fe73b01
New Crowdin updates ( #18716 )
...
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Croatian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Malayalam)
* New translations en.yml (Sinhala)
* New translations en.yml (Breton)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Welsh)
* New translations en.yml (Standard Moroccan Tamazight)
* 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 (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 (Ido)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Finnish)
* New translations doorkeeper.en.yml (Danish)
* New translations activerecord.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations doorkeeper.en.yml (Greek)
* New translations activerecord.en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations doorkeeper.en.yml (Basque)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Czech)
* New translations activerecord.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations doorkeeper.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations doorkeeper.en.yml (Italian)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Romanian)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations doorkeeper.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations doorkeeper.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations activerecord.en.yml (Catalan)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Swedish)
* New translations doorkeeper.en.yml (Swedish)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations doorkeeper.en.yml (Galician)
* New translations activerecord.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Albanian)
* New translations activerecord.en.yml (Georgian)
* New translations doorkeeper.en.yml (Georgian)
* New translations activerecord.en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations doorkeeper.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations activerecord.en.yml (Persian)
* New translations doorkeeper.en.yml (Persian)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Tamil)
* New translations doorkeeper.en.yml (Hindi)
* New translations activerecord.en.yml (Hindi)
* New translations doorkeeper.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations doorkeeper.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations doorkeeper.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Marathi)
* New translations doorkeeper.en.yml (Marathi)
* New translations activerecord.en.yml (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations doorkeeper.en.yml (Croatian)
* New translations doorkeeper.en.yml (Malayalam)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations doorkeeper.en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Sardinian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Occitan)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations en.yml (Galician)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Galician)
* New translations en.yml (Catalan)
* New translations en.yml (Slovenian)
* New translations en.yml (Turkish)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Greek)
* New translations simple_form.en.yml (Slovenian)
* New translations activerecord.en.yml (Slovenian)
* New translations en.yml (Turkish)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Turkish)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Turkish)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Polish)
* New translations activerecord.en.yml (Icelandic)
* New translations en.json (Esperanto)
* New translations en.yml (Danish)
* New translations en.yml (Italian)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Danish)
* New translations en.yml (Italian)
* New translations simple_form.en.yml (Italian)
* New translations activerecord.en.yml (Italian)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations activerecord.en.yml (Vietnamese)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Icelandic)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Spanish)
* New translations activerecord.en.yml (Spanish)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* 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.json (Esperanto)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Czech)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Claire
e22604d9c9
Fix incorrect param in role card link ( #18776 )
2 years ago
Claire
655bac2c3a
Fix authorization check in domain blocks controller
2 years ago
Eugen Rochko
cfb73f9fc9
[Glitch] Add customizable user roles
...
Port front-end changes from e164d6a687
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
06a878c6b5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/admin/base_controller.rb`:
Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
Minor conflict caused by glitch-soc having more granular
notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
Minor conflict caused by glitch-soc having more granular
notification settings for trends.
- `config/navigation.rb`:
Minor conflict caused by glitch-soc having additional
navigation items for the theming system while upstream
slightly changed every line.
2 years ago
Claire
f239a473ce
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko
e164d6a687
Add customizable user roles ( #18641 )
...
* Add customizable user roles
* Various fixes and improvements
* Add migration for old settings and fix tootctl role management
2 years ago
Claire
6e31d2d520
Fix crash when a remote Flag activity mentions a private post ( #18760 )
...
* Add tests
* Fix crash when a remote Flag activity mentions a private post
2 years ago
Claire
301299d036
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire
64588263f7
Remove dead code in WebUI filtering code ( #18745 )
2 years ago
Claire
106b27830b
Fix reblogged statuses being erroneously shown as filtered ( #18744 )
2 years ago
Jeong Arm
386980c196
Support audio/vnd.wave ( #18737 )
...
See: https://datatracker.ietf.org/doc/html/rfc2361
And Misskey uses this mime type for wav file.
2 years ago
Eugen Rochko
a14136558e
[Glitch] Add notifications for new reports
...
Port e6eb0a29b9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
dcbedf8587
[Glitch] [SSR only] Revamp post filtering system
...
Port CSS and JS for Server-Side Rendered pages from 90e5a9bd98
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
mayaeh
68c03ea7be
[Glitch] Fixed the setting page's logo that is not displayed on the smartphone
...
Port 2cb4c0caed
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
490417762f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Fix erroneous deletion in a previous merge.
- `Gemfile`:
Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
Minor conflict due to glitch-soc having an extra `local_only` property
2 years ago
Claire
90e5a9bd98
Revamp post filtering system ( #18058 )
...
* Add model for custom filter keywords
* Use CustomFilterKeyword internally
Does not change the API
* Fix /filters/edit and /filters/new
* Add migration tests
* Remove whole_word column from custom_filters (covered by custom_filter_keywords)
* Redesign /filters
Instead of a list, present a card that displays more information and handles
multiple keywords per filter.
* Redesign /filters/new and /filters/edit to add and remove keywords
This adds a new gem dependency: cocoon, as well as a npm dependency:
cocoon-js-vanilla. Those are used to easily populate and remove form fields
from the user interface when manipulating multiple keyword filters at once.
* Add /api/v2/filters to edit filter with multiple keywords
Entities:
- `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context`
`keywords`
- `FilterKeyword`: `id`, `keyword`, `whole_word`
API endpoits:
- `GET /api/v2/filters` to list filters (including keywords)
- `POST /api/v2/filters` to create a new filter
`keywords_attributes` can also be passed to create keywords in one request
- `GET /api/v2/filters/:id` to read a particular filter
- `PUT /api/v2/filters/:id` to update a new filter
`keywords_attributes` can also be passed to edit, delete or add keywords in
one request
- `DELETE /api/v2/filters/:id` to delete a particular filter
- `GET /api/v2/filters/:id/keywords` to list keywords for a filter
- `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a
filter
- `GET /api/v2/filter_keywords/:id` to read a particular keyword
- `PUT /api/v2/filter_keywords/:id` to edit a particular keyword
- `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword
* Change from `irreversible` boolean to `action` enum
* Remove irrelevent `irreversible_must_be_within_context` check
* Fix /filters/new and /filters/edit with update for filter_action
* Fix Rubocop/Codeclimate complaining about task names
* Refactor FeedManager#phrase_filtered?
This moves regexp building and filter caching to the `CustomFilter` class.
This does not change the functional behavior yet, but this changes how the
cache is built, doing per-custom_filter regexps so that filters can be matched
independently, while still offering caching.
* Perform server-side filtering and output result in REST API
* Fix numerous filters_changed events being sent when editing multiple keywords at once
* Add some tests
* Use the new API in the WebUI
- use client-side logic for filters we have fetched rules for.
This is so that filter changes can be retroactively applied without
reloading the UI.
- use server-side logic for filters we haven't fetched rules for yet
(e.g. network error, or initial timeline loading)
* Minor optimizations and refactoring
* Perform server-side filtering on the streaming server
* Change the wording of filter action labels
* Fix issues pointed out by linter
* Change design of “Show anyway” link in accordence to review comments
* Drop “irreversible” filtering behavior
* Move /api/v2/filter_keywords to /api/v1/filters/keywords
* Rename `filter_results` attribute to `filtered`
* Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer
* Fix systemChannelId value in streaming server
* Simplify code by removing client-side filtering code
The simplifcation comes at a cost though: filters aren't retroactively
applied anymore.
2 years ago
Eugen Rochko
e6eb0a29b9
Add notifications for new reports ( #18697 )
2 years ago
Eugen Rochko
a7ca331c3d
New Crowdin updates ( #18671 )
...
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations activerecord.en.yml (Korean)
* New translations en.yml (German)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations activerecord.en.yml (Dutch)
* New translations en.yml (Dutch)
* New translations en.yml (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations activerecord.en.yml (Indonesian)
* New translations en.yml (Turkish)
* New translations en.json (Galician)
* New translations en.yml (Slovenian)
* New translations en.yml (Galician)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Galician)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Claire
d0cc795d0f
Add /api/v1/admin/domain_allows ( #18668 )
...
- `GET /api/v1/admin/domain_allows` lists allowed domains
- `GET /api/v1/admin/domain_allows/:id` shows one by ID
- `DELETE /api/v1/admin/domain_allows/:id` deletes a given domain from the list
of allowed domains
- `POST /api/v1/admin/domain_allows` to allow a new domain:
if that domain is already allowed, the existing DomainAllow will be returned
2 years ago
Takeshi Umeda
27f235265d
Fix missing , ( #18660 )
2 years ago
Jeong Arm
5c38a4492b
Fix CDN_HOST not affected on full_asset_url ( #18662 )
...
* Fix CDN_HOST not affected to assets url
* Fix typo
2 years ago
mayaeh
2cb4c0caed
Fixed the setting page's logo that is not displayed on the smartphone ( #18710 )
2 years ago
tateisu
6d1b8097a0
use Notification::TYPES for api push subscription alerts ( #18709 )
2 years ago
Claire
d28d7d4b72
Fix suspicious sign-in mails never being sent ( #18599 )
...
* Add tests
* Fix suspicious sign-in mails never being sent
2 years ago
Eugen Rochko
0d7c0f0bf7
[Glitch] Fix contrast of some elements with new brand colors
...
Port 96ecbae0f7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
dc250cb7f3
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Changed upstream, while we modified it in glitch-soc to not get spammed
by dependabot.
Kept it removed.
- `README.md`:
Changed upstream, which has a very different version.
Discarded upstream changes.
2 years ago
Eugen Rochko
96ecbae0f7
Fix contrast of some elements with new brand colors ( #18691 )
2 years ago
Claire
a7a44a4dff
Fix checkmark on interaction buttons with larger fonts ( #1799 )
...
Fixes #1796
2 years ago
Eugen Rochko
d1374cc03a
New Crowdin updates ( #18605 )
...
* New translations doorkeeper.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations activerecord.en.yml (Persian)
* New translations doorkeeper.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations doorkeeper.en.yml (Tamil)
* New translations activerecord.en.yml (Marathi)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Asturian)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations doorkeeper.en.yml (Sinhala)
* New translations simple_form.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Sinhala)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations activerecord.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations doorkeeper.en.yml (Tatar)
* New translations simple_form.en.yml (Malayalam)
* New translations activerecord.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Malayalam)
* New translations simple_form.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations doorkeeper.en.yml (Breton)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations doorkeeper.en.yml (Kabyle)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Kabyle)
* New translations simple_form.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Sardinian)
* New translations activerecord.en.yml (Sardinian)
* New translations simple_form.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* 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 (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 (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 (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Kabyle)
* New translations en.yml (Ido)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Russian)
* New translations activerecord.en.yml (Russian)
* New translations simple_form.en.yml (Slovenian)
* New translations activerecord.en.yml (Slovenian)
* New translations simple_form.en.yml (Ukrainian)
* New translations activerecord.en.yml (Ukrainian)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Welsh)
* 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 (Esperanto)
* New translations en.yml (Asturian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Malayalam)
* New translations activerecord.en.yml (Asturian)
* New translations en.yml (Catalan)
* New translations activerecord.en.yml (Catalan)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Danish)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Danish)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations activerecord.en.yml (Galician)
* New translations en.yml (Greek)
* New translations en.yml (Catalan)
* New translations en.yml (Afrikaans)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations simple_form.en.yml (Polish)
* New translations activerecord.en.yml (Polish)
* New translations en.yml (Portuguese)
* New translations en.json (German)
* New translations simple_form.en.yml (Portuguese)
* New translations activerecord.en.yml (Portuguese)
* New translations en.yml (Italian)
* New translations en.yml (Russian)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations activerecord.en.yml (Turkish)
* New translations en.yml (Russian)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations activerecord.en.yml (Hungarian)
* New translations en.yml (French)
* New translations en.yml (Galician)
* New translations en.yml (French)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (French)
* New translations activerecord.en.yml (French)
* New translations en.yml (Italian)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Latvian)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations activerecord.en.yml (Vietnamese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations en.yml (Czech)
* New translations en.yml (French)
* New translations en.yml (Czech)
* New translations en.json (Arabic)
* New translations en.yml (Slovak)
* New translations en.json (Slovak)
* New translations en.yml (Indonesian)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations activerecord.en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Albanian)
* New translations en.json (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations activerecord.en.yml (German)
* New translations en.json (German)
* New translations en.yml (Spanish)
* New translations en.yml (Spanish)
* New translations simple_form.en.yml (Spanish)
* New translations activerecord.en.yml (Spanish)
* New translations en.json (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Occitan)
* New translations en.json (Occitan)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.yml (Albanian)
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko
9f8a97a5be
Remove item titles from RSS feeds ( #18640 )
2 years ago
Eugen Rochko
c3f7041715
Fix wrong aspect ratio of logo in icons ( #18639 )
2 years ago
Claire
bfe05eb101
[Glitch] Fix logo gradient not working on some Safari and Blink-based browsers
...
Port 28dc3750f6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
c3c77fc5d9
[Glitch] Change brand color and logotypes
...
Port SCSS changes from 03d2cb5146
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
03846ad6c2
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
2 years ago
Claire
28dc3750f6
Fix logo gradient not working on some Safari and Blink-based browsers ( #18634 )
...
Works around https://bugs.chromium.org/p/chromium/issues/detail?id=258029
2 years ago
Eugen Rochko
18fbdcd5f4
[Glitch] Add administrative webhooks
...
Port SCSS changes from 0eb2db6b52
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
3b4abfe132
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko
03d2cb5146
Change brand color and logotypes ( #18592 )
...
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
2 years ago
Eugen Rochko
0eb2db6b52
Add administrative webhooks ( #18510 )
...
* Add administrative webhooks
* Fix error when webhook is deleted before delivery worker runs
2 years ago
Claire
5618c69b2a
Fix language indicator text color ( #1795 )
...
Fixes #1794
2 years ago
Eugen Rochko
157bf44409
New Crowdin updates ( #18561 )
...
* New translations en.yml (Portuguese)
* New translations en.yml (Lithuanian)
* 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 (Macedonian)
* New translations en.yml (Korean)
* New translations en.yml (Georgian)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* 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 (Armenian)
* New translations en.yml (Vietnamese)
* 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 (Hungarian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Irish)
* New translations en.json (Arabic)
* New translations en.json (Irish)
* New translations en.json (German)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Turkish)
* New translations en.yml (Kabyle)
* 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 (Japanese)
* New translations en.json (Korean)
* New translations en.json (Vietnamese)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Sardinian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Asturian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Welsh)
* New translations en.json (Galician)
* New translations en.json (Slovak)
* New translations en.json (Icelandic)
* New translations en.yml (Sanskrit)
* New translations en.yml (Corsican)
* New translations en.yml (Bengali)
* New translations en.yml (Esperanto)
* 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 (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Uyghur)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Asturian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Greek)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Hebrew)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Marathi)
* New translations en.json (Bengali)
* New translations en.json (English, United Kingdom)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Tamil)
* New translations en.json (Croatian)
* New translations en.json (Persian)
* New translations en.json (Thai)
* New translations en.json (Malay)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Telugu)
* New translations en.json (Esperanto)
* New translations en.json (Indonesian)
* New translations en.json (Slovenian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Ukrainian)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (English, United Kingdom)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Corsican)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Tatar)
* New translations en.json (Serbian (Latin))
* New translations en.json (Occitan)
* New translations en.json (Kannada)
* New translations en.json (Cornish)
* New translations en.json (Sinhala)
* New translations en.json (Breton)
* New translations en.json (Malayalam)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Galician)
* New translations en.json (Chinese Traditional)
* New translations en.json (Greek)
* New translations en.json (Swedish)
* New translations en.json (Russian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Catalan)
* New translations en.json (Polish)
* New translations en.json (Latvian)
* New translations en.yml (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Czech)
* New translations en.json (Slovenian)
* New translations en.json (Icelandic)
* New translations en.json (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Vietnamese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Danish)
* New translations en.json (Dutch)
* New translations en.json (Portuguese)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations simple_form.en.yml (Frisian)
* New translations activerecord.en.yml (Frisian)
* New translations devise.en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Breton)
* New translations en.json (Breton)
* New translations en.yml (Polish)
* New translations en.yml (Russian)
* New translations en.yml (Catalan)
* New translations en.yml (Korean)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.yml (Greek)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Ukrainian)
* New translations en.yml (Czech)
* New translations en.json (Ukrainian)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese)
* New translations en.yml (Latvian)
* New translations en.yml (Hungarian)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Galician)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Frisian)
* New translations en.json (Frisian)
* New translations devise.en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations en.yml (Slovenian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations simple_form.en.yml (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Indonesian)
* New translations en.json (Indonesian)
* New translations en.json (Spanish)
* New translations en.yml (Spanish)
* New translations en.yml (Italian)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (French)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* Fix default message
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko
2184897fba
[Glitch] Change label of publish button to be "Publish" again
...
Port 8ec66981da
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
c3842a700f
[Glitch] Change language to be carried over on reply
...
Port c5eabffe34
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
705ebf794b
[Glitch] Remove unnused otherAccounts property
...
Port 8ce9a12526
to glitch-soc + other related cleanup
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeong Arm
4c43ac85d6
[Glitch] Add lang html attr to each posts
...
Port 9adb7dde33
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
a864904fad
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/models/account.rb`:
Textual conflict only caused by glitch-soc using a different value
for character limits in a nearby line.
Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
Attribute added to a tag modified by glitch-soc.
Added upstream's attributes.
- `yarn.lock`:
Upstream added/updated dependencies close to glitch-soc-only ones.
Updated/added upstream dependencies.
2 years ago
Claire
a0556ea3f1
Remove dependency on running Redis server for db:setup ( #18560 )
2 years ago
Claire
45a777f9d8
Fix CAS_DISPLAY_NAME, SAML_DISPLAY_NAME and OIDC_DISPLAY_NAME being ignored ( #18568 )
2 years ago
Yamagishi Kazutoshi
848648e058
Replace from Code Climate to Super-Linter ( #18587 )
2 years ago
Claire
9f3bf956ad
Add /api/v1/admin/domain_blocks ( #18247 )
...
* Add /api/v1/admin/domain_blocks
Fixes #18140
- `GET /api/v1/admin/domain_blocks` lists domain blocks
- `GET /api/v1/admin/domain_blocks/:id` shows one by ID
- `DELETE /api/v1/admin/domain_blocks/:id` deletes a given domain block
- `POST /api/v1/admin/domain_blocks` to create a new domain block:
if it conflicts with an existing one, returns an error with
an attribute `existing_domain_block` with the rendered domain block
* Simplify conflict handling as suggested in review
2 years ago
Meisam
a0e108fd53
Add “services” and “metadata” to NodeInfo ( #18563 )
...
* add services to NodeInfo response
* add metadata to NodeInfo response
* learning ruby syntax!
* patch the patch
* rm trailing whitespace
* use [] instead of empty array constructor
2 years ago
Eugen Rochko
8ec66981da
Change label of publish button to be "Publish" again ( #18583 )
2 years ago
Claire
49de4bf341
Fix TagManager#local_url? erroring out on invalid URL ( #18580 )
2 years ago
Claire
c953e4c83d
Make “Flavour and skin” admin setting label translatable ( #1791 )
2 years ago