1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
Commit Graph

5235 Commits

Author SHA1 Message Date
Shlee
8a93dd3d83 [Glitch] Update notifications.js
Port d92ce31c92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-21 14:44:58 +02:00
Claire
0b37299775 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-21 14:39:25 +02:00
Shlee
d92ce31c92
Update notifications.js (#18977) 2022-08-15 20:33:05 +02:00
Rens Groothuijsen
41fa50ac86 [Glitch] Add warning for sensitive audio posts
Port e6979aa6d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-15 14:57:57 +02:00
Claire
e2a7a458d6 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-15 14:33:05 +02:00
Eugen Rochko
aa33c7f26e
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>
2022-08-15 07:39:44 +09:00
Rens Groothuijsen
e6979aa6d4
Add warning for sensitive audio posts (#17885) 2022-08-13 15:39:05 +02:00
Claire
3a9e3c1248 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-01 17:47:02 +02:00
prplecake
991349e6e2
[Glitch] Add ability to follow hashtags in web UI 2022-07-30 20:00:00 -05:00
prplecake
bcb958c264
Merge remote-tracking branch 'mastodon/main' into cit/wip/follow-hashtags 2022-07-30 18:54:55 -05:00
Eugen Rochko
4b36e47474
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>
2022-07-30 22:09:18 +09:00
Mélanie Chauvel
f174ce1048
Use slightly more margin between post buttons (under compose box) (#1816) 2022-07-27 19:17:15 +02:00
Claire
18346f4044 Add option to share CW toggle state across instances of a post 2022-07-25 11:57:09 +02:00
Claire
eacde1a130 Regroup CW unfolding settings in their own section 2022-07-24 17:28:47 +02:00
Claire
a5f81e1abd Improve interaction between out-of-CW attachments and collapsed toots 2022-07-24 13:16:03 +02:00
Claire
db5b44330d Add explanation for some options in the local settings dialog 2022-07-24 11:11:38 +02:00
Claire
3f4e27ab6f Add local setting toggle to move media attachments outside CWs
Fixes #1812
2022-07-24 11:10:49 +02:00
Eugen Rochko
1ceebf2710 [Glitch] Change hashtag numbers to have clearer labels in web UI
Port f5d8501138 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:41:39 +02:00
Yamagishi Kazutoshi
969d805e86 [Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
Port d5ca204e89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:39:57 +02:00
Eugen Rochko
9608e720a4
Add ability to follow hashtags in web UI (#18862) 2022-07-22 15:52:06 +02:00
Claire
d799fe2082 Merge branch 'main' into glitch-soc/merge-upstream 2022-07-22 09:58:35 +02:00
Eugen Rochko
f5d8501138
Change hashtag numbers to have clearer labels in web UI (#18864) 2022-07-22 03:17:41 +02:00
Eugen Rochko
f8b3e36929
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>
2022-07-20 21:21:57 +09:00
Yamagishi Kazutoshi
d5ca204e89
Bump react-redux-loading-bar from 4.0.8 to 5.0.4 (#18562) 2022-07-20 20:56:44 +09:00
Jeong Arm
7205098ccf [Glitch] Fix badge color not affected
Port f248d95be2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-19 16:11:40 +02:00
Claire
3a516acfc2 Merge branch 'main' into glitch-soc/merge-upstream 2022-07-19 16:08:59 +02:00
Jeong Arm
f248d95be2
Fix badge color not affected (#18826)
* Fix badge color not affected

* Generate user role css
2022-07-19 01:06:11 +02:00
Claire
cd87d7dcef 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.
2022-07-17 22:07:20 +02:00
Eugen Rochko
bbb5f1917d
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>
2022-07-15 10:20:58 +09:00
Eugen Rochko
e7aa2be828
Change how hashtags are normalized (#18795)
* Change how hashtags are normalized

* Fix tests
2022-07-13 15:03:28 +02:00
Eugen Rochko
c9d6571da8
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>
2022-07-07 05:58:31 +09:00
Eugen Rochko
30e7836a19 [Glitch] Add customizable user roles
Port front-end changes from 44b2ee3485 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-05 11:35:32 +02:00
Claire
92c06a1113 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.
2022-07-05 09:33:44 +02:00
Eugen Rochko
44b2ee3485
Add customizable user roles (#18641)
* Add customizable user roles

* Various fixes and improvements

* Add migration for old settings and fix tootctl role management
2022-07-05 02:41:40 +02:00
Claire
1418574447 Merge branch 'main' into glitch-soc/merge-upstream 2022-07-03 21:36:15 +02:00
Claire
a233a9bfb5
Remove dead code in WebUI filtering code (#18745) 2022-06-30 10:39:29 +02:00
Claire
3c24f19afe
Fix reblogged statuses being erroneously shown as filtered (#18744) 2022-06-30 09:51:55 +02:00
Eugen Rochko
485b43ed7e [Glitch] Add notifications for new reports
Port 2936f42a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 13:13:10 +02:00
Claire
f218e633b4 [Glitch] [SSR only] Revamp post filtering system
Port CSS and JS for Server-Side Rendered pages from 02851848e9

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 11:35:28 +02:00
mayaeh
97f81577f1 [Glitch] Fixed the setting page's logo that is not displayed on the smartphone
Port 65ad589848 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 11:21:58 +02:00
Claire
fe5f6bc7ed 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
2022-06-28 11:11:18 +02:00
Claire
02851848e9
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.
2022-06-28 09:42:13 +02:00
Eugen Rochko
2936f42a14
Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
Eugen Rochko
829b978a89
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>
2022-06-26 12:08:08 +09:00
mayaeh
65ad589848
Fixed the setting page's logo that is not displayed on the smartphone (#18710) 2022-06-23 23:08:52 +02:00
Eugen Rochko
353e2c5d84 [Glitch] Fix contrast of some elements with new brand colors
Port 0391b2a603 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-21 09:00:43 +02:00
Claire
0e74d4da59 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.
2022-06-21 08:28:59 +02:00
Eugen Rochko
0391b2a603
Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
Claire
7a75bce1b4
Fix checkmark on interaction buttons with larger fonts (#1799)
Fixes #1796
2022-06-16 15:37:59 +02:00
Eugen Rochko
3f02157a94
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>
2022-06-16 13:31:19 +09:00