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
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
e7aa2be828
Change how hashtags are normalized ( #18795 )
...
* Change how hashtags are normalized
* Fix tests
2022-07-13 15:03:28 +02:00
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
30e7836a19
[Glitch] Add customizable user roles
...
Port front-end changes from 44b2ee3485
2022-07-05 11:35:32 +02:00
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
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
1418574447
Merge branch 'main' into glitch-soc/merge-upstream
2022-07-03 21:36:15 +02:00
a233a9bfb5
Remove dead code in WebUI filtering code ( #18745 )
2022-06-30 10:39:29 +02:00
3c24f19afe
Fix reblogged statuses being erroneously shown as filtered ( #18744 )
2022-06-30 09:51:55 +02:00
485b43ed7e
[Glitch] Add notifications for new reports
...
Port 2936f42a14
2022-06-28 13:13:10 +02:00
f218e633b4
[Glitch] [SSR only] Revamp post filtering system
...
Port CSS and JS for Server-Side Rendered pages from 02851848e9
2022-06-28 11:35:28 +02:00
97f81577f1
[Glitch] Fixed the setting page's logo that is not displayed on the smartphone
...
Port 65ad589848
2022-06-28 11:21:58 +02:00
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
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
2936f42a14
Add notifications for new reports ( #18697 )
2022-06-27 09:30:15 +02:00
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
65ad589848
Fixed the setting page's logo that is not displayed on the smartphone ( #18710 )
2022-06-23 23:08:52 +02:00
353e2c5d84
[Glitch] Fix contrast of some elements with new brand colors
...
Port 0391b2a603
2022-06-21 09:00:43 +02:00
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
0391b2a603
Fix contrast of some elements with new brand colors ( #18691 )
2022-06-19 08:18:08 +02:00
7a75bce1b4
Fix checkmark on interaction buttons with larger fonts ( #1799 )
...
Fixes #1796
2022-06-16 15:37:59 +02:00
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
fe2d6fe105
Fix wrong aspect ratio of logo in icons ( #18639 )
2022-06-11 20:32:02 +02:00
f938afee72
[Glitch] Fix logo gradient not working on some Safari and Blink-based browsers
...
Port 37cd984acf
2022-06-11 00:09:20 +02:00
b31c32fd61
[Glitch] Change brand color and logotypes
...
Port SCSS changes from 45aa5781ce
2022-06-11 00:09:20 +02:00
15929a3d59
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`.
2022-06-11 00:08:41 +02:00
37cd984acf
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
2022-06-10 17:34:59 +02:00
d064476c4a
[Glitch] Add administrative webhooks
...
Port SCSS changes from a2871cd747
2022-06-10 17:04:02 +02:00
edaaf6a5e9
Merge branch 'main' into glitch-soc/merge-upstream
2022-06-10 11:51:43 +02:00
45aa5781ce
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
2022-06-09 22:25:23 +02:00
a2871cd747
Add administrative webhooks ( #18510 )
...
* Add administrative webhooks
* Fix error when webhook is deleted before delivery worker runs
2022-06-09 21:57:36 +02:00
3d841eba69
Fix language indicator text color ( #1795 )
...
Fixes #1794
2022-06-06 12:05:57 +02:00
17ba5e1e61
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>
2022-06-04 13:44:49 +09:00
7bf37551c8
[Glitch] Change label of publish button to be "Publish" again
...
Port 628c177ebe
2022-06-02 11:11:26 +02:00
e94c8b9e29
[Glitch] Change language to be carried over on reply
...
Port 14d7cf39f4
2022-06-02 11:09:19 +02:00
444ac6d6e9
[Glitch] Remove unnused otherAccounts property
...
Port 2f6416db53
2022-06-02 11:08:05 +02:00
1db92b510d
[Glitch] Add lang html attr to each posts
...
Port dc7e2985e6
2022-06-02 10:58:54 +02:00
25a46d9e59
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.
2022-06-02 09:49:38 +02:00
84266f87e7
Replace from Code Climate to Super-Linter ( #18587 )
2022-06-01 19:22:35 +02:00
628c177ebe
Change label of publish button to be "Publish" again ( #18583 )
2022-06-01 05:03:12 +02:00
bbda3592d8
Translate: Korean ( #1790 )
...
* Translate Korean: glitch frontend
* Translate Korean: backend
* Remove unused string
* Fix yaml
2022-05-31 11:41:30 +02:00
14d7cf39f4
Change language to be carried over on reply ( #18557 )
...
In most cases, replies to a toot are written in the same language as the
toot being replied to.
2022-05-31 05:53:43 +02:00
2f6416db53
Remove unnused otherAccounts property ( #18556 )
...
Leftover from before #11896
2022-05-30 17:10:13 +02:00
3238f570db
New Crowdin updates ( #18507 )
...
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Korean)
* New translations en.yml (Polish)
* New translations en.yml (Finnish)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Portuguese)
* New translations en.yml (Greek)
* New translations en.yml (Albanian)
* 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 (Basque)
* New translations en.yml (German)
* 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 (Danish)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.json (Catalan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Chinese Simplified)
* 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 (German)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations en.yml (Sardinian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Asturian)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Arabic)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Welsh)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.yml (Sanskrit)
* New translations en.yml (Corsican)
* New translations en.yml (Bengali)
* 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 (English, United Kingdom)
* New translations en.json (Bengali)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Marathi)
* New translations en.json (Albanian)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Slovenian)
* New translations en.yml (English, United Kingdom)
* New translations en.json (Finnish)
* New translations en.json (Norwegian)
* 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 (Greek)
* New translations en.json (Basque)
* New translations en.json (Hebrew)
* New translations en.json (Russian)
* 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 (Dutch)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* 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.yml (Dutch)
* New translations en.yml (Dutch)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Turkish)
* New translations en.json (Polish)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Dutch)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Latvian)
* New translations en.json (Latvian)
* New translations en.yml (Polish)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Catalan)
* New translations en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Icelandic)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Occitan)
* New translations en.json (Occitan)
* New translations en.json (Afrikaans)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Greek)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Czech)
* New translations en.json (Ukrainian)
* New translations en.json (Russian)
* New translations en.json (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Ido)
* New translations en.yml (Ido)
* New translations en.json (Polish)
* New translations en.yml (Spanish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Galician)
* New translations en.yml (Galician)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Italian)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.json (Russian)
* New translations en.json (Spanish)
* New translations en.yml (Spanish)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Vietnamese)
* New translations en.json (Thai)
* New translations en.json (French)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Chinese Simplified)
* New translations en.json (Korean)
* New translations en.json (Ido)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-30 15:49:43 +09:00
dc7e2985e6
Add lang html attr to each posts ( #18544 )
2022-05-28 15:50:36 +02:00
379a7a7ca7
Add support for webp uploads ( #18506 )
2022-05-27 20:06:40 +02:00
d21251f8fe
Remove unused assets ( #18541 )
2022-05-27 20:05:34 +02:00
53c89ee44b
Add language indicator icon and local settings for status icons ( #1788 )
...
* Add language indicator
* Add local settings for status icons
* Switch to text icon for language
2022-05-27 16:34:29 +02:00
f13d910f3e
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-26 18:34:27 +02:00
Claire
Eugen Rochko
mayaeh
Jeong Arm
Yamagishi Kazutoshi
Alexander Ivanov