Claire
0ad919b192
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
glitch-soc change because of having changed the default number of
available poll options.
Applied upstream's changes while keeping glitch-soc's default number of
poll options.
- `public/oops.png`:
We had a minor graphics change, probably not worth diverging from upstream.
Took upstream version.
2022-11-06 09:50:41 +01:00
kouhai dev
0ae6ca72de
update account request question prompt
2022-11-06 01:36:06 -07:00
Eugen Rochko
5187e4e758
Bump version to 4.0.0rc2 ( #19831 )
2022-11-06 06:59:56 +01:00
Eugen Rochko
3151b260e2
Fix not using GIN index for account search queries ( #19830 )
2022-11-06 06:16:34 +01:00
Eugen Rochko
58fc889c6f
Update changelog for 4.0.0rc1 ( #19814 )
2022-11-05 23:24:07 +01:00
Eugen Rochko
ca8d52c2a4
Change design of new list form in web UI ( #19801 )
2022-11-05 23:06:32 +01:00
Justin Thomas
18ac5f1cc8
version emoji-mart ( #19715 )
...
* version emoji-mart
* add lock file
2022-11-05 23:02:41 +01:00
Eugen Rochko
b5b1a202cc
Fix missing string in admin UI ( #19809 )
2022-11-05 23:00:48 +01:00
Hayden
c8bf6192e4
Heroku fix ( #19807 )
...
Currently building on Heroku fails with a package error for libidn11. Since Mastodon uses idn-ruby 0.1.2 we should upgrade to libidn12
2022-11-05 22:57:58 +01:00
Eugen Rochko
3a41fccc43
Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access ( #19803 )
...
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
2022-11-05 22:56:03 +01:00
Eugen Rochko
d0c9ac3919
Fix indexing scheduler trying to index when Elasticsearch is disabled ( #19805 )
...
Fix #19646
2022-11-05 22:31:52 +01:00
Eugen Rochko
d54e7ee61e
Fix n+1 queries when rendering initial state JSON ( #19795 )
2022-11-05 21:51:01 +01:00
Moritz Hedtke
c64be9758f
helm: Add documentation to run tootctl commands ( #19791 )
2022-11-05 21:19:25 +01:00
Eugen Rochko
d1de7fb7fa
Fix rendering empty avatar in web UI ( #19798 )
2022-11-05 21:18:57 +01:00
Eugen Rochko
a442f481f8
Fix missing interpolation of domain in disabled account banner in web UI ( #19788 )
2022-11-05 21:11:35 +01:00
Eugen Rochko
7c65f52692
Change design of moved account banner in web UI ( #19790 )
2022-11-05 21:11:24 +01:00
eai04191
30e786225e
Remove word-break:keep-all from Dismissable banner message ( #19799 )
2022-11-05 21:03:58 +01:00
Claire
312d616371
Change sign-in banner to reflect disabled or moved account status ( #19773 )
2022-11-05 18:28:13 +01:00
Alex Nordlund
0498b106c9
Add S3 existing secret to sidekiq ( #19778 )
2022-11-05 17:29:20 +01:00
Yarden Shoham
29604763d7
Remove broken link references to bug bounty program ( #19779 )
...
The link https://app.intigriti.com/programs/mastodon/mastodonio/detail no longer works
* Closes #19491
Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
2022-11-05 17:27:44 +01:00
Sunny Ripert
887976814a
Fix JavaScript console warning when loading notifications ( #19772 )
2022-11-05 13:45:06 +01:00
Sunny Ripert
c95d9aab56
Fix JavaScript console error on upload editing status ( #19769 )
2022-11-05 13:43:47 +01:00
Claire
9616f5bb22
Fix compose form submission reloading web interface ( #19762 )
...
* Fix compose form submission reloading web interface
Fix regression introduced by #19742
* Fix various compose form buttons being handled like submit buttons
* Fix coding style issue
* Fix missing onClick prop check
2022-11-05 13:43:37 +01:00
Claire
2f8fb49d13
Fix users not being able to change their hide_followers_count setting ( #1889 )
2022-11-05 11:55:25 +01:00
Eugen Rochko
1e7ea50f4c
New Crowdin updates ( #19627 )
...
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Armenian)
* New translations en.yml (Irish)
* New translations en.json (Thai)
* New translations en.json (Sinhala)
* New translations en.json (Bulgarian)
* New translations en.json (Ido)
* New translations en.json (German)
* New translations en.json (Tamil)
* New translations en.json (Esperanto)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Albanian)
* New translations en.json (Japanese)
* New translations en.json (Indonesian)
* New translations en.json (Romanian)
* New translations en.json (Irish)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Corsican)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Sardinian)
* New translations en.json (Breton)
* New translations en.json (Sanskrit)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations en.json (Burmese)
* New translations en.json (Cornish)
* New translations en.json (Malayalam)
* New translations en.json (Persian)
* New translations en.json (Estonian)
* 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 (Kazakh)
* New translations en.json (Latvian)
* New translations en.json (Tatar)
* 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 (Chinese Traditional, Hong Kong)
* New translations en.json (Japanese)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Portuguese)
* New translations en.json (Chinese Simplified)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations activerecord.en.yml (Irish)
* New translations devise.en.yml (Irish)
* New translations en.json (Greek)
* New translations en.json (Irish)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (Italian)
* New translations en.json (Vietnamese)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Esperanto)
* New translations en.json (Albanian)
* New translations en.json (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Slovenian)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (German)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Breton)
* New translations en.json (Dutch)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.json (French)
* 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 (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Afrikaans)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Basque)
* 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 (Catalan)
* 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 (Indonesian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Corsican)
* 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 (Sorani (Kurdish))
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Breton)
* 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 (Malayalam)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Persian)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Irish)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations activerecord.en.yml (Irish)
* New translations en.json (Polish)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Dutch)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations doorkeeper.en.yml (Swedish)
* New translations activerecord.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Norwegian Nynorsk)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Swedish)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Polish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Czech)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-05 19:54:26 +09:00
prplecake
34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI ( #1888 )
2022-11-05 08:12:04 +01:00
Eugen Rochko
c4b92b1aee
Fix n+1 query during status removal ( #19753 )
2022-11-05 00:09:52 +01:00
Claire
bb89f83cc0
Fix additional issues with status cache hydration ( #19747 )
...
* Spare one SQL query when hydrating polls
* Improve tests
* Fix more discrepancies
* Fix possible crash when the status has no application set
2022-11-04 20:01:33 +01:00
Claire
03b991de6c
Fix various issues with store hydration ( #19746 )
...
- Improve tests
- Fix possible crash when application of a reblogged post isn't set
- Fix discrepancies around favourited and reblogged attributes
- Fix discrepancies around pinned attribute
- Fix polls not being hydrated
2022-11-04 19:33:16 +01:00
Sunny Ripert
0165449e3a
A11y: Explicit <form> element around compose area ( #19742 )
2022-11-04 17:08:08 +01:00
Claire
c2170991c7
Fix reblogs being discarded after the reblogged status ( #19731 )
2022-11-04 16:31:44 +01:00
Eugen Rochko
e02812d5b6
Add assets from Twemoji 14.0 ( #19733 )
2022-11-04 16:08:41 +01:00
Eugen Rochko
b1a219552e
Fix featured tags not saving preferred casing ( #19732 )
2022-11-04 16:08:29 +01:00
Jeong Arm
f002878c95
Make word-break: keep-all for dismissable banner ( #19719 )
2022-11-04 16:04:25 +01:00
Eugen Rochko
5f9e47be34
Add caching for payload serialization during fan-out ( #19642 )
2022-11-04 13:21:06 +01:00
Claire
b8f6f03956
Fix /users/:username/statuses/:id leading to a soft 404 in web app ( #19724 )
2022-11-04 13:19:57 +01:00
Claire
4fb0aae636
Change mentions of blocked users to not be processed ( #19725 )
...
Fixes #19698
2022-11-04 13:19:12 +01:00
Eugen Rochko
20aa8881dc
Fix colors in light theme ( #19714 )
2022-11-04 02:32:26 +01:00
Eugen Rochko
139ea4c981
Fix limited account hint referencing "your" server when logged out ( #19711 )
2022-11-04 02:28:37 +01:00
Eugen Rochko
bfafb114a2
Fix showing profile's featured tags on individual statuses ( #19712 )
2022-11-04 02:28:25 +01:00
Eugen Rochko
1c3192df6b
Fix wrong colors in the high-contrast theme ( #19708 )
2022-11-04 02:28:14 +01:00
Eugen Rochko
5825402ed5
Fix design of verified links in web UI ( #19709 )
2022-11-04 02:28:00 +01:00
Claire
7c8e2b9859
Fix handling of duplicate and out-of-order notifications in WebUI ( #19693 )
...
* Fix handling of duplicate notifications from streaming server
* Fix handling of duplicate and out-of-order notifications when polling/expanding
Fixes #19615
2022-11-04 00:14:39 +01:00
SJang1
053dac2afa
Remove meta tag for official iOS app ( #19656 )
2022-11-04 00:13:07 +01:00
Claire
9387beb3b3
Change flaky AccountSearchService test ( #19650 )
2022-11-03 23:12:08 +01:00
Claire
1dca08b76f
Fix admin action logs page ( #19649 )
...
* Add tests
* Fix crash when trying to display orphaned action logs
* Add migration for older admin action logs
2022-11-03 16:06:42 +01:00
Claire
cbb440bbc2
Fix being unable to withdraw follow request when confirmation modal is disabled ( #19687 )
...
* Fix being unable to withdraw follow request when unfollow confirmation modal is disabled
Fixes #19569
* Fix “unfollow” being inadequately used for withdrawing follow requests from account card
2022-11-03 16:05:39 +01:00
Claire
125322718b
Fix inaccurate admin log entry for re-sending confirmation e-mails ( #19674 )
...
Fixes #19593
2022-11-02 18:50:21 +01:00
Claire
74d40c7d8f
Fix edits not being immediately reflected ( #19673 )
...
Fixes #19546
2022-11-02 18:09:39 +01:00
Claire
e0eb39d41b
Fix bookmark import stopping at the first failure ( #19669 )
...
Fixes #19389
2022-11-02 16:38:23 +01:00