Jeremy Kescher
c58c13822a
Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc ( #1763 )
2022-05-05 19:11:56 +02:00
Claire
c85c3fb708
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated `jest`, moving its config in a separate file.
This config was modified in glitch-soc, so the corresponding changes have
been ported to `jest.config.js`
2022-05-04 19:15:50 +02:00
mayaeh
a01580f09f
Update translation strings for direct message ( #18300 )
2022-05-04 02:40:26 +02:00
Claire
e2d1d3b428
Change “Only people I mention” to “Mentioned people only” ( #18291 )
2022-05-03 12:30:40 +02:00
Claire
fa22b8ed22
Move DM conversation/timeline tab to column settings switch
2022-05-03 11:45:23 +02:00
Claire
3dd4f40a0e
Fix backend terms link not being used
2022-05-03 11:10:58 +02:00
Claire
3093ed1b7d
Refactor visibility icon using VisibilityIcon
2022-05-03 11:04:09 +02:00
Claire
e4bec702ac
[Glitch] Rename toots to posts in various places, add or reword DM warnings
...
Port part of be0bc9acbf7e244879fe
2022-05-03 10:59:23 +02:00
Claire
3869daef09
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
Eugen Rochko
7e244879fe
Change "Conversations" back to "Direct messages" and add warning in web UI ( #18289 )
...
Partially reverts #18146
2022-05-03 09:09:09 +02:00
Claire
0597e5db68
Fix ArgumentError when processing pinned posts from Friendica ( #18260 )
...
Follow-up to #18254
2022-05-02 19:34:39 +02:00
Claire
71d02ffcf3
Fix compatibility with Friendica regarding pinned posts ( #18254 )
...
* Fix multiple database queries when fetching pinned posts for remote account
* Fix compatibility with Friendica regarding pinned posts
Fixes #18066
* Add tests
2022-05-02 17:41:01 +02:00
Eugen Rochko
6b7765a73b
New Crowdin updates ( #18213 )
...
* New translations activerecord.en.yml (Ido)
* New translations en.json (Ido)
* New translations activerecord.en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Russian)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Armenian)
* New translations en.json (Japanese)
* New translations en.json (Armenian)
* New translations en.yml (Armenian)
* New translations en.json (Japanese)
* New translations doorkeeper.en.yml (Armenian)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations en.json (Spanish)
* New translations en.json (Portuguese)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Portuguese)
* New translations devise.en.yml (Chinese Simplified)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Galician)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.json (Czech)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Ido)
* New translations en.json (Icelandic)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.yml (Hungarian)
* 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 (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 (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 (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 (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* 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 (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Cornish)
* New translations en.yml (Irish)
* New translations en.yml (Standard Moroccan Tamazight)
* 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 (Sinhala)
* New translations en.yml (Marathi)
* New translations en.yml (Malay)
* 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 (Telugu)
* New translations en.yml (Breton)
* 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.yml (English, United Kingdom)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (Chinese Simplified)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Japanese)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Vietnamese)
* New translations en.yml (Greek)
* New translations en.yml (Catalan)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Persian)
* New translations en.yml (Czech)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Russian)
* New translations en.yml (Hungarian)
* New translations en.yml (Swedish)
* New translations en.yml (Indonesian)
* New translations en.yml (Swedish)
* New translations en.yml (Welsh)
* New translations en.json (Swedish)
* New translations en.yml (Danish)
* New translations en.yml (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-02 23:19:23 +09:00
Claire
9a3be0ad68
Fix error when looking handle with surrounding spaces ( #18225 )
2022-05-02 01:00:08 +02:00
Claire
cb9a919ff2
Remove “I don't like it” option from report modal
2022-05-01 21:58:20 +02:00
Claire
26a51291c7
Fix error due to glitch-soc's theming system
2022-05-01 17:07:11 +02:00
Eugen Rochko
277c3fa816
[Glitch] Fix being able to scroll away from the loading bar in web UI
...
Port a8e27ac4d1
2022-05-01 16:57:35 +02:00
Claire
392ca0472a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.js`:
Conflicts due to glitch-soc's theming system.
Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
Minor conflict due to glitch-soc's option to allow CWed toots in trends.
Ported upstream changes.
2022-05-01 16:52:27 +02:00
Eugen Rochko
33f3818d66
Fix double render error when authorizing interaction ( #18203 )
2022-05-01 00:56:34 +02:00
Claire
6e4d932da5
Fix possible crash when a post references an invalid media attachment ( #18211 )
2022-05-01 00:55:26 +02:00
Eugen Rochko
5a48bf1085
Fix error when trying to revoke OAuth token without supplying a token ( #18205 )
2022-05-01 00:51:32 +02:00
Eugen Rochko
6da648227e
Fix error caused by missing subject in Webfinger response ( #18204 )
2022-05-01 00:37:46 +02:00
Eugen Rochko
ad084ce7db
New Crowdin updates ( #18148 )
...
* 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 (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Tatar)
* New translations en.yml (Sinhala)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.json (Asturian)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* 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 (Corsican)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (Armenian)
* New translations en.json (Basque)
* New translations doorkeeper.en.yml (Basque)
* New translations en.json (Finnish)
* New translations doorkeeper.en.yml (Finnish)
* New translations en.json (Hebrew)
* New translations doorkeeper.en.yml (Hebrew)
* New translations en.json (Hungarian)
* New translations doorkeeper.en.yml (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Greek)
* New translations doorkeeper.en.yml (Italian)
* New translations en.json (Georgian)
* New translations doorkeeper.en.yml (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (German)
* New translations en.json (Galician)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Slovak)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.json (Icelandic)
* New translations en.json (Norwegian)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Spanish)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.json (Danish)
* New translations en.json (Punjabi)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Bengali)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.json (Persian)
* New translations doorkeeper.en.yml (Persian)
* New translations en.json (Tamil)
* New translations doorkeeper.en.yml (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations en.json (Marathi)
* New translations doorkeeper.en.yml (Marathi)
* New translations en.json (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations en.json (Croatian)
* New translations doorkeeper.en.yml (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations doorkeeper.en.yml (Kazakh)
* New translations en.json (Indonesian)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.json (Polish)
* New translations en.json (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Polish)
* New translations en.json (Portuguese)
* New translations doorkeeper.en.yml (Portuguese)
* New translations en.json (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.json (Slovenian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations en.json (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Galician)
* New translations en.json (Swedish)
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Kannada)
* New translations en.json (Latvian)
* New translations en.json (Cornish)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.json (Sinhala)
* New translations doorkeeper.en.yml (Breton)
* New translations en.json (Breton)
* New translations doorkeeper.en.yml (Malayalam)
* New translations en.json (Malayalam)
* New translations doorkeeper.en.yml (Tatar)
* New translations en.json (Tatar)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Hindi)
* New translations en.json (Malay)
* New translations en.json (Hindi)
* New translations en.json (Telugu)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Uyghur)
* New translations doorkeeper.en.yml (Sardinian)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations doorkeeper.en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Kabyle)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations en.json (Sardinian)
* New translations doorkeeper.en.yml (Corsican)
* New translations en.json (Corsican)
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Serbian (Latin))
* New translations doorkeeper.en.yml (Occitan)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Danish)
* New translations en.json (Danish)
* New translations en.json (Icelandic)
* New translations en.json (Korean)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.json (Chinese Traditional)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Catalan)
* New translations en.json (Catalan)
* New translations en.json (Vietnamese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Vietnamese)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Japanese)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* Restore en locales
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Greek)
* New translations en.json (Chinese Traditional)
* New translations en.json (Greek)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (Chinese Traditional)
* New translations en.json (Russian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Afrikaans)
* New translations en.json (Russian)
* New translations en.json (Afrikaans)
* New translations en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.json (Welsh)
* New translations en.json (Dutch)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Catalan)
* New translations en.json (Icelandic)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Thai)
* New translations en.json (Hungarian)
* New translations en.json (German)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (German)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Indonesian)
* New translations en.json (Tatar)
* New translations en.json (Tatar)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Czech)
* New translations en.json (Italian)
* New translations en.json (Italian)
* New translations en.json (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Japanese)
* New translations en.json (Latvian)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.json (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-04-30 20:11:52 +09:00
Eugen Rochko
f6d35ed57d
Remove IP matching from e-mail domain blocks ( #18190 )
...
Clear out e-mail domain blocks created from automatically resolved DNS records
2022-04-29 23:27:03 +02:00
Eugen Rochko
7b0fe4aef9
Fix opening and closing Redis connections instead of using a pool ( #18171 )
...
* Fix opening and closing Redis connections instead of using a pool
* Fix Redis connections not being returned to the pool in CLI commands
2022-04-29 22:43:07 +02:00
Eugen Rochko
6476f7e4da
Change trending statuses to only show one status from each account ( #18181 )
...
Calculate trends in temporary sets to avoid having to manage items
that go below the decay threshold while not having any moments
where a half-processed set is accessible to end-users
2022-04-29 22:42:42 +02:00
Claire
5c691430e5
Fix error on attempting to delete an account moderation note ( #18196 )
...
Fixes #18193
2022-04-29 20:25:31 +02:00
Eugen Rochko
6726d2933a
Change half-life of trending status scores from 6 hours to 2 hours ( #18182 )
2022-04-29 11:46:59 +02:00
Claire
e7f0c9f7da
Pre-fill domain block/allow domain from search filter ( #18172 )
2022-04-29 00:24:44 +02:00
Eugen Rochko
be0bc9acbf
Change "Direct" status visibility to "Only people I mention" in web UI ( #18146 )
...
- Change name of conversations column in web UI
- Change hotkey for opening conversations column from `g d` to `g c` in web UI
- Remove shortcuts for creating direct-visibility statuses from web UI
2022-04-29 00:24:31 +02:00
Eugen Rochko
a8e27ac4d1
Fix being able to scroll away from the loading bar in web UI ( #18170 )
2022-04-29 00:15:27 +02:00
Claire
01c2f47b7f
[Glitch] Fix empty “Server rules violation” report option
...
Port eed5a4bf9c
2022-04-28 23:43:49 +02:00
Claire
01266e4d7f
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-28 23:41:53 +02:00
Claire
66a63d79ea
Fix 500 error when a bookmark or favorite has been reported and deleted ( #18174 )
2022-04-28 23:34:58 +02:00
Claire
eed5a4bf9c
Fix empty “Server rules violation” report option ( #18165 )
2022-04-28 21:29:29 +02:00
Claire
84d991988e
Fix temporary network/remote server error prevent from interactions with remote accounts ( #18161 )
...
* Fix temporary network/remote server error prevent from interactions with remote accounts
* Fix and add tests
2022-04-28 20:19:10 +02:00
Claire
f23f784f18
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-28 18:16:42 +02:00
Eugen Rochko
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
Chris Dzombak
9bf04db23a
Fix incorrect link in "new trending tags" email ( #18156 )
...
Closes #18129
2022-04-28 17:15:29 +02:00
Eugen Rochko
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
Claire
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
Claire
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
Eugen Rochko
b93e2ae0a4
Fix n+1 query on feed merge and populate operations ( #18111 )
2022-04-26 22:06:31 +02:00
Claire
b9197486e5
Fix UnmergeWorker being exceptionally slow in some conditions ( #18110 )
2022-04-26 21:48:36 +02:00
Claire
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
Claire
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
Claire
002d2729fb
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-25 17:09:32 +02:00
Eugen Rochko
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
Claire
8ffa96b059
Fix web push notifications containing HTML entities ( #18071 )
2022-04-23 21:47:43 +02:00
Jeong Arm
ea38327816
Let votes statuses are also searchable ( #18070 )
2022-04-23 21:47:27 +02:00
