f23f784f18
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-28 18:16:42 +02:00
3917353645
Fix single Redis connection being used across all threads ( #18135 )
...
* Fix single Redis connection being used across all Sidekiq threads
* Fix tests
2022-04-28 17:47:34 +02:00
9bf04db23a
Fix incorrect link in "new trending tags" email ( #18156 )
...
Closes #18129
2022-04-28 17:15:29 +02:00
d55154819e
New Crowdin updates ( #18074 )
...
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations devise.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.yml (Irish)
[ci skip]
* New translations en.yml (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations activerecord.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations activerecord.en.yml (Scottish Gaelic)
[ci skip]
* New translations devise.en.yml (Scottish Gaelic)
[ci skip]
* New translations doorkeeper.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-04-28 14:34:28 +09:00
6a9d154948
Update win95 style from cybre.space
...
https://cybre.tech/cybrespace/mastodon/raw/branch/cybrespace-3.3/app/javascript/styles/win95.scss
2022-04-27 23:05:24 +02:00
fc1dd81ea5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not a real conflict, upstream dependency updated textually too close to a
glitch-soc-only dependency.
Updated the upstream dependency.
2022-04-27 08:48:21 +02:00
b93e2ae0a4
Fix n+1 query on feed merge and populate operations ( #18111 )
2022-04-26 22:06:31 +02:00
b9197486e5
Fix UnmergeWorker being exceptionally slow in some conditions ( #18110 )
2022-04-26 21:48:36 +02:00
0360135d4d
Fix PeerTube videos appearing with an erroneous “Edited at” marker ( #18100 )
...
* Fix PeerTube videos appearing with an erroneous “Edited at” marker
PeerTube videos have an `updated` field equal to `published`.
When processing an incoming activity that has the same value for `updated` and
`published`, assume this doesn't represent an actual edit.
* Please CodeClimate
2022-04-26 21:25:26 +02:00
33cd80d69c
Fix instance actor being incorrectly created when running migrations ( #18109 )
...
* Add migration test about instance actor key
* Fix old migration
* Work around incorrect database state
2022-04-26 21:22:09 +02:00
002d2729fb
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-25 17:09:32 +02:00
f47a9ddc9f
New Crowdin updates ( #18062 )
...
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Sinhala)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Marathi)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Catalan)
* New translations en.yml (Japanese)
* New translations en.json (Catalan)
* New translations en.yml (Greek)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Turkish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Latvian)
* New translations en.yml (Czech)
* New translations en.yml (Russian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Korean)
* New translations en.yml (Vietnamese)
* New translations en.yml (Catalan)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Italian)
* New translations en.yml (Hungarian)
* New translations en.yml (Thai)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (Irish)
* New translations activerecord.en.yml (Irish)
* New translations devise.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Thai)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Turkish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-04-24 06:33:26 +09:00
8ffa96b059
Fix web push notifications containing HTML entities ( #18071 )
2022-04-23 21:47:43 +02:00
ea38327816
Let votes statuses are also searchable ( #18070 )
2022-04-23 21:47:27 +02:00
ea0633e131
New Crowdin updates ( #18032 )
...
* New translations en.json (Vietnamese)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Japanese)
* New translations en.yml (French)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Turkish)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Vietnamese)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.yml (Turkish)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations devise.en.yml (Turkish)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.yml (German)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.yml (French)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.yml (French)
* New translations en.yml (Catalan)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Catalan)
* New translations en.json (Vietnamese)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (Spanish)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Bengali)
* New translations en.yml (Malay)
* New translations en.yml (Marathi)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Breton)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Sinhala)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Standard Moroccan Tamazight)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-04-22 03:21:08 +09:00
bb12af7250
Swap position of media attachments and polls
2022-04-20 22:07:13 +02:00
5c808ee0de
Revert support from loading Home timeline from database
...
Unfortunately, the database query could turn out very inefficient and I did not
manage to find a way to improve that. Furthermore, there were still behavior
inconsistencies between fetching the timeline from Redis and fetching it from
Postgres.
2022-04-19 15:06:38 +02:00
ec4a8d81b1
Revert DM support in HomeFeed#from_database
...
Fixes #1746
Queries could get prohibitively expensive.
2022-04-16 21:28:46 +02:00
5db3a14388
Fix loading Home TL from database not respecting `min_id` and not including DMs ( #1744 )
...
* Rework tests
* Add tests
* Fix HomeFeed#get with min_id fetching from database
* Minor code cleanup and optimizations
* Add tests
* Take DMs into account when fetching home TL from database
* Fix not listing own DMs in Home timeline
* Add tests
* Please CodeClimate
2022-04-14 17:44:21 +02:00
e06b0234df
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-14 14:21:14 +02:00
07994cf4f6
New Crowdin updates ( #17995 )
...
* New translations en.json (Catalan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Sanskrit)
* New translations en.yml (Asturian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Kabyle)
* New translations en.yml (Cornish)
* New translations en.yml (Ido)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Czech)
* New translations en.json (Hungarian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Bengali)
* New translations en.yml (Hindi)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Malay)
* New translations en.yml (Breton)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.json (Icelandic)
* New translations en.json (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Icelandic)
* New translations en.json (Korean)
* New translations en.json (Polish)
* New translations en.yml (Albanian)
* New translations en.json (Albanian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.json (Vietnamese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Latvian)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Latvian)
* New translations en.yml (Spanish)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Swedish)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Turkish)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Czech)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Greek)
* New translations en.json (Greek)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Czech)
* New translations en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (French)
* New translations en.yml (Indonesian)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Catalan)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-04-14 02:52:53 +09:00
1de748bf5e
Fix FetchFeaturedCollectionService ( #18030 )
2022-04-13 13:25:42 +02:00
d353bb5ee3
Implement infinity home timeline ( #1610 )
...
* Implement infinity home timeline
* Fix test for infinite home timeline
* Fix infinity home timeline with min_id
* Fix infinite home timeline duplicated statuses
* Codeclimate for infinite home timeline
* Refactor code as reviewed
* Fix redis sufficient check
* Fix typo on variable name
2022-04-12 17:52:14 +02:00
4c9949560d
FeedManager: skip account when target_account's last status is too old ( #18009 )
...
Co-authored-by: dogelover911 <dogelover911@localhost>
2022-04-11 21:17:03 +02:00
f9fbff8539
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-11 16:16:33 +02:00
dc50347247
Fix crash in alias settings page ( #18004 )
2022-04-09 20:11:06 +02:00
eff62528de
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-08 23:00:03 +02:00
012537452a
Fix error resposes for `from` search prefix ( #17963 )
...
* Fix error responses in `from` search prefix (addresses mastodon/mastodon#17941 )
Using unsupported prefixes now reports a 422; searching for posts from an
account the instance is not aware of reports a 404. TODO: The UI for this
on the front end is abysmal.
Searching `from:username@domain` now succeeds when `domain` is the local
domain; searching `from:@username(@domain)?` now works as expected.
* Remove unused methods on new Error classes as they are not being used
Currently when `raise`d there are error messages being supplied, but
this is not actually being used. The associated `raise`s have been
edited accordingly.
* Remove needless comments
* Satisfy rubocop
* Try fixing tests being unable to find AccountFindingConcern methods
* Satisfy rubocop
* Simplify `from` prefix logic
This incorporates @ClearlyClaire's suggestion (see
https://github.com/mastodon/mastodon/pull/17963#pullrequestreview-933986737 ).
Accepctable account strings in `from:` clauses are more lenient than
before this commit; for example, `from:@user@example.org@asnteo +cat`
will not error, and return posts by @user@example.org containing the
word "cat". This is more consistent with how Mastodon matches mentions
in statuses. In addition, `from` clauses will not be checked for
syntatically invalid usernames or domain names, simply 404ing when
`Account.find_remote!` raises ActiveRecord::NotFound.
New code for this PR that is no longer used has been removed.
2022-04-08 21:21:49 +02:00
a8d89aabb2
[Glitch] Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream
...
Port a39bf04fe6
2022-04-08 20:05:33 +02:00
43aff90d0e
[Glitch] Fix potentially missing statuses when reconnecting to websocket
...
Port ebe01ea194
2022-04-08 20:02:49 +02:00
ff73d43b35
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
Upstream added settings where we had extra glitch-soc-specific settings.
Added upstream's new settings.
- `app/models/user.rb`:
Upstream added settings where we had extra glitch-soc-specific settings.
Added upstream's new settings.
- `config/i18n-tasks.yml`:
Not a real conflict, just a new upstream line too textually close to
a glitch-soc-only line.
Ported upstream's change.
2022-04-08 19:53:32 +02:00
68273a7c6d
Fix dangling language-specific trends ( #17997 )
...
- Change score half-life for trending statuses from 2 to 6 hours
- Change score threshold for trimming old items from 1 to 0.3
2022-04-08 19:35:31 +02:00
a39bf04fe6
Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream ( #17987 )
2022-04-08 19:17:54 +02:00
3906dd67ed
Fix extremely rare race condition when deleting a toot or account ( #17994 )
2022-04-08 19:17:37 +02:00
8e20e16cf0
Change e-mail notifications to only be sent when recipient is offline ( #17984 )
...
* Change e-mail notifications to only be sent when recipient is offline
Change the default for follow and mention notifications back on
* Add preference to always send e-mail notifications
* Change wording
2022-04-08 18:03:31 +02:00
fd9a9b07c2
Fix trends returning less results per page when filtered in REST API ( #17996 )
...
- Change filtering and pagination to occur in SQL instead of Redis
- Change rank/score displayed on trends in admin UI to be locale-specific
2022-04-08 17:10:53 +02:00
f06a3b56a3
New Crowdin updates ( #17897 )
...
* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Basque)
* New translations en.yml (Finnish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Catalan)
* New translations en.yml (Spanish)
* New translations en.yml (French)
* New translations en.yml (Arabic)
* New translations en.yml (Armenian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Polish)
* New translations en.yml (Punjabi)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Portuguese)
* New translations en.yml (Albanian)
* New translations en.yml (Dutch)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Norwegian)
* New translations en.yml (Korean)
* New translations en.yml (Macedonian)
* New translations en.yml (Slovenian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Vietnamese)
* New translations en.yml (Lithuanian)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Galician)
* New translations en.yml (Georgian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Sinhala)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Marathi)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (German)
* New translations en.yml (Icelandic)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Italian)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Latvian)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Indonesian)
* New translations en.yml (Czech)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Korean)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Italian)
* New translations en.yml (Galician)
* New translations en.yml (French)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Breton)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Latvian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Catalan)
* New translations en.yml (Latvian)
* New translations en.yml (Catalan)
* New translations en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Swedish)
* New translations en.yml (Russian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Turkish)
* New translations en.yml (Polish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Italian)
* New translations en.yml (Spanish)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Breton)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Vietnamese)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalzie`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-04-08 19:52:22 +09:00
465ee7792f
Fix pagination header on empty trends responses in REST API ( #17986 )
2022-04-07 18:06:15 +02:00
ebe01ea194
Fix potentially missing statuses when reconnecting to websocket ( #17981 )
...
* Fix potentially missing statuses when reconnecting to websocket
* Add gap on reconnect rather than maintaining it constantly
2022-04-07 16:08:17 +02:00
ed8a0bfbb8
[Glitch] Fix older items possibly disappearing on timeline updates
...
Port 1b91359a45
2022-04-07 15:05:06 +02:00
489f250877
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-07 15:03:54 +02:00
ce9dcbea32
Fix failure when sending warning emails with custom text ( #17983 )
...
* Add tests
* Fix failure when sending warning emails with custom text
2022-04-07 14:47:30 +02:00
1b91359a45
Fix older items possibly disappearing on timeline updates ( #17980 )
...
In some rare cases, when receiving statuses out of order from the streaming
API then polling from the REST API, it was possible for the
`expandNormalizedTimeline` function to remove older items from the timeline.
This commit ensures that any item from the replaced slice that is older
than the oldest item retrieved from the API gets added back to the replaced
slice.
2022-04-07 11:27:35 +02:00
f382192862
Add pagination for trending statuses in web UI ( #17976 )
2022-04-06 22:53:29 +02:00
e2f4bafc13
[Glitch] Fix possible duplicate statuses in timelines in some edge cases
...
Port dd4c156f33
2022-04-06 21:16:07 +02:00
b368c75029
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
Upstream removed this file, while glitch-soc had changes to deal with
its theming system.
Removed the file like upstream did.
2022-04-06 21:10:23 +02:00
dd4c156f33
Fix possible duplicate statuses in timelines in some edge cases ( #17971 )
...
In some rare cases, when receiving statuses out of order from the streaming
API then polling from the REST API, it was possible for the
`expandNormalizedTimeline` function to insert duplicates in the timeline,
which would then result in several bugs.
This commits ensures that there are no duplicates inserted in the
timeline.
2022-04-06 21:01:41 +02:00
8f91e304a5
Fix spurious edits and require incoming edits to be explicitly marked as such ( #17918 )
...
* Change post text edit to not be considered significant if it's identical after reformatting
* We don't need to clear previous change information anymore
* Require status edits to be explicit, except for poll tallies
* Fix tests
* Add some tests
* Add poll-related tests
* Add HTML-formatting related tests
2022-04-06 21:01:02 +02:00
454ef42aab
Fix error when encountering invalid pinned posts ( #17964 )
2022-04-06 20:58:23 +02:00
6221b36b27
Remove sign-in token authentication, instead send e-mail about new sign-in ( #17970 )
2022-04-06 20:58:12 +02:00
Claire