be7032b9cf
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-07 19:53:30 +01:00
3114c826a7
Fix filter handling in status cache hydration ( #19963 )
2022-11-07 19:47:48 +01:00
106648b456
Micro-optimization: only split `acct` into two Strings ( #19901 )
...
* Since `acct` is split by `@` and assigned to `username` and `domain`, we only need to split `acct` into two Strings.
2022-11-07 16:17:55 +01:00
86a80acf40
New Crowdin updates ( #19771 )
...
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Japanese)
* New translations en.yml (Armenian)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (Esperanto)
* New translations en.yml (Turkish)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Romanian)
* New translations en.yml (Hungarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Irish)
* New translations en.yml (Hebrew)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Malayalam)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Burmese)
* New translations en.yml (Breton)
* New translations en.yml (Tatar)
* New translations en.yml (Indonesian)
* New translations en.yml (Kazakh)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Estonian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Igbo)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Dutch)
* New translations en.yml (Polish)
* New translations en.yml (Swedish)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Dutch)
* New translations en.yml (Ukrainian)
* New translations en.yml (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations en.json (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations en.json (Japanese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations en.json (Afrikaans)
* New translations en.json (Galician)
* New translations en.yml (Turkish)
* New translations en.json (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Afrikaans)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (French)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (French)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations en.yml (Spanish)
* New translations en.yml (Japanese)
* New translations en.json (Occitan)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (Irish)
* New translations en.json (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (German)
* New translations en.yml (Spanish)
* New translations en.json (Greek)
* New translations en.json (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Asturian)
* New translations en.json (Danish)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Korean)
* New translations en.json (French)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Asturian)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations en.json (German)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (French)
* New translations en.yml (Dutch)
* New translations en.json (Welsh)
* New translations en.json (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.json (Dutch)
* New translations en.json (French)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (German)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations activerecord.en.yml (Ukrainian)
* New translations en.json (Russian)
* New translations en.json (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Bulgarian)
* New translations en.json (Japanese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Japanese)
* New translations devise.en.yml (Finnish)
* New translations en.json (Hebrew)
* New translations en.yml (German)
* New translations en.json (Bulgarian)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Japanese)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Hebrew)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.json (Danish)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.json (Bulgarian)
* New translations en.json (Frisian)
* New translations en.json (Russian)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Russian)
* New translations devise.en.yml (Frisian)
* New translations en.yml (Czech)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Frisian)
* New translations en.json (Italian)
* New translations en.json (Polish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-08 00:06:48 +09:00
622f603ac7
Add aria-expanded to content warning toggle button ( #19975 )
...
Fixes #19920
2022-11-07 15:48:46 +01:00
1e1289b024
Fix crash when external auth provider has no display_name set ( #19962 )
...
Fixes #19913
2022-11-07 15:43:24 +01:00
e1227457f1
Fix links to the Web UI in notifications ( #19981 )
...
Most of the old routes are broken because of the /web removal.
2022-11-07 15:42:58 +01:00
8515bc7962
Add form element on focal point modal ( #19834 )
...
* Add form element on focal point modal
* Add type="button" for detection button
2022-11-07 15:41:42 +01:00
5925a31b78
Fix followers count not being updated when migrating follows ( #19998 )
...
Fixes #19900
2022-11-07 15:38:55 +01:00
c493c967d6
Fix light theme issues with the favourite modal and some background colors ( #1902 )
...
* Fix favourite modal styling in glitch-soc light theme
* Fix unnecessary difference between glitch-soc's light theme and upstream's
2022-11-07 10:34:18 +01:00
b67e0c94a6
Merge pull request #1899 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-07 08:31:36 +01:00
7ba13dddfa
[Glitch] Fix double button to clear emoji search input
...
Port 4b7f32a2a6
2022-11-07 07:55:44 +01:00
71e68dac4e
[Glitch] Fix JavaScript console error on Getting Started column
...
Port ffe735344b
2022-11-07 07:54:18 +01:00
d13a2f7901
[Glitch] Fix console log error on column settings load
...
Port 34c269310d
2022-11-07 07:53:20 +01:00
6c0a6097ff
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-07 07:50:47 +01:00
a70e2cd649
Tag the OTP field with autocomplete for password managers ( #19946 )
...
This is modeled on #19833 , and based on the attribute values documented
in https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element?language=objc
2022-11-07 03:57:16 +01:00
4b7f32a2a6
Fix double button to clear emoji search input ( #19888 )
2022-11-07 03:40:54 +01:00
02a34252ba
Add null check on application in dispute viewer ( #19851 )
2022-11-07 03:40:17 +01:00
ffe735344b
Fix JavaScript console error on Getting Started column ( #19891 )
...
* Fix JavaScript console error on Getting Started column
* Update app/javascript/mastodon/components/column_header.js
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
2022-11-07 03:40:04 +01:00
34c269310d
Fix console log error on column settings load ( #19886 )
2022-11-07 03:39:48 +01:00
4cb2323458
Fix crash in legacy filter creation controller ( #19878 )
2022-11-07 03:38:53 +01:00
54f0f1b9ef
Skip Webfinger cache during migrations as well ( #19883 )
2022-11-07 03:31:38 +01:00
8c81db5a41
allow /api/v1/streaming to be used as per documentation ( #19896 )
2022-11-07 03:16:44 +01:00
e53fc34e9a
Set autocomplete attr for email field on signup page ( #19833 )
...
The email address will be used as the "username" for sign-in purposes, so it's the value that should be stored in password managers. We can inform the password manager of this by setting `autocomplete="email"`. Without this hint, password managers may instead store the `username` field, which isn't valid for sign-in (this happens with iCloud Keychain in Safari, for instance).
2022-11-07 03:16:10 +01:00
54101563bb
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-06 18:49:46 +01:00
21d6bc1689
Fix status cache hydration discrepancy
2022-11-06 17:29:04 +01:00
0be6da42d3
Change glitch-soc composer classes to match upstream
2022-11-06 17:29:04 +01:00
c199387558
[Glitch] Fix colors in light theme
...
Port 20aa8881dc
2022-11-06 17:29:04 +01:00
cbfa5ad5dd
[Glitch] Fix wrong colors in the high-contrast theme
...
Port 1c3192df6b
2022-11-06 17:29:04 +01:00
c883799a1f
[Glitch] Change design of link footer
...
Port 2d9a85db6e
2022-11-06 17:29:04 +01:00
d29172a682
[Glitch] Fix missing interpolation of domain in disabled account banner in web UI
...
Port a442f481f8
2022-11-06 17:29:04 +01:00
b6c0ef70a2
[Glitch] Change sign-in banner to reflect disabled or moved account status
...
Port 312d616371
2022-11-06 17:29:04 +01:00
0437159056
[Glitch] Fix showing profile's featured tags on individual statuses
...
Port bfafb114a2
2022-11-06 17:29:04 +01:00
fa293f03fa
[Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
...
Port 7c8e2b9859
2022-11-06 17:29:04 +01:00
bd220c32f1
Update SECURITY.md ( #19869 )
2022-11-06 16:13:53 +01:00
01e0cb1cd5
[Glitch] Add assets from Twemoji 14.0
...
Port e02812d5b6
2022-11-06 10:50:23 +01:00
8368f4857c
[Glitch] Fix JavaScript console warning when loading notifications
...
Port 887976814a
2022-11-06 10:47:31 +01:00
93ccb4a29e
[Glitch] Fix JavaScript console error on upload editing status
...
Port c95d9aab56
2022-11-06 10:46:03 +01:00
81334e2bfb
[Glitch] Fix limited account hint referencing "your" server when logged out
...
Port 139ea4c981
2022-11-06 10:45:00 +01:00
6b498fae46
[Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled ( #19687 )
...
Port cbb440bbc2
2022-11-06 10:43:18 +01:00
e42875d195
[Glitch] Fix edits not being immediately reflected
...
Port 74d40c7d8f
2022-11-06 10:42:15 +01:00
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
5187e4e758
Bump version to 4.0.0rc2 ( #19831 )
2022-11-06 06:59:56 +01:00
3151b260e2
Fix not using GIN index for account search queries ( #19830 )
2022-11-06 06:16:34 +01:00
58fc889c6f
Update changelog for 4.0.0rc1 ( #19814 )
2022-11-05 23:24:07 +01:00
ca8d52c2a4
Change design of new list form in web UI ( #19801 )
2022-11-05 23:06:32 +01:00
18ac5f1cc8
version emoji-mart ( #19715 )
...
* version emoji-mart
* add lock file
2022-11-05 23:02:41 +01:00
b5b1a202cc
Fix missing string in admin UI ( #19809 )
2022-11-05 23:00:48 +01:00
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
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
Claire
Postmodern
Eugen Rochko
Sunny Ripert
Chris Rose
Jeremy Kescher
nightpool
Rob Petti
rcombs
Yamagishi Kazutoshi
Justin Thomas
Hayden