Jeremy Kescher
03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/ui/components/link_footer.js
# lib/mastodon/version.rb
# public/avatars/original/missing.png
2 years ago
21d6bc1689
Fix status cache hydration discrepancy
2 years ago
0be6da42d3
Change glitch-soc composer classes to match upstream
2 years ago
c199387558
[Glitch] Fix colors in light theme
...
Port 20aa8881dc
2 years ago
cbfa5ad5dd
[Glitch] Fix wrong colors in the high-contrast theme
...
Port 1c3192df6b
2 years ago
c883799a1f
[Glitch] Change design of link footer
...
Port 2d9a85db6e
2 years ago
d29172a682
[Glitch] Fix missing interpolation of domain in disabled account banner in web UI
...
Port a442f481f8
2 years ago
b6c0ef70a2
[Glitch] Change sign-in banner to reflect disabled or moved account status
...
Port 312d616371
2 years ago
0437159056
[Glitch] Fix showing profile's featured tags on individual statuses
...
Port bfafb114a2
2 years ago
fa293f03fa
[Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
...
Port 7c8e2b9859
2 years ago
Jeremy Kescher
d869072fcd
change null check in dispute viewer to be unless
2 years ago
Jeremy Kescher
996267fc8b
Fix vanilla flavor being broken due to incorrect imports
2 years ago
Jeremy Kescher
c2e83b1354
Add null check on application in dispute viewer
2 years ago
01e0cb1cd5
[Glitch] Add assets from Twemoji 14.0
...
Port e02812d5b6
2 years ago
8368f4857c
[Glitch] Fix JavaScript console warning when loading notifications
...
Port 887976814a
2 years ago
93ccb4a29e
[Glitch] Fix JavaScript console error on upload editing status
...
Port c95d9aab56
2 years ago
81334e2bfb
[Glitch] Fix limited account hint referencing "your" server when logged out
...
Port 139ea4c981
2 years ago
6b498fae46
[Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled ( #19687 )
...
Port cbb440bbc2
2 years ago
e42875d195
[Glitch] Fix edits not being immediately reflected
...
Port 74d40c7d8f
2 years ago
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.
2 years ago
3151b260e2
Fix not using GIN index for account search queries ( #19830 )
2 years ago
Jeremy Kescher
e326d44f29
Add missing require_auth? in StatusController
2 years ago
Jeremy Kescher
9dafedaecd
Remove misc duplicate declarations
2 years ago
Jeremy Kescher
5ab1ac972b
Show about tab if explore tab wouldn't show any statuses
2 years ago
Jeremy Kescher
b0be4764b4
Keep showing explore tab, only statuses are hidden
2 years ago
Jeremy Kescher
7e0108bccd
Fix wrong "only" target in previous commit
2 years ago
Jeremy Kescher
da8c3bed5c
Don't show trending statuses in public web UI
2 years ago
Jeremy Kescher
41f1a81ab7
Change AUTHORIZED_FETCH to not block unauthenticated REST API access
...
Port of vanilla commit: https://github.com/mastodon/mastodon/pull/19803
2 years ago
ca8d52c2a4
Change design of new list form in web UI ( #19801 )
2 years ago
3a41fccc43
Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access ( #19803 )
...
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
2 years ago
d0c9ac3919
Fix indexing scheduler trying to index when Elasticsearch is disabled ( #19805 )
...
Fix #19646
2 years ago
d54e7ee61e
Fix n+1 queries when rendering initial state JSON ( #19795 )
2 years ago
d1de7fb7fa
Fix rendering empty avatar in web UI ( #19798 )
2 years ago
a442f481f8
Fix missing interpolation of domain in disabled account banner in web UI ( #19788 )
2 years ago
7c65f52692
Change design of moved account banner in web UI ( #19790 )
2 years ago
30e786225e
Remove word-break:keep-all from Dismissable banner message ( #19799 )
2 years ago
312d616371
Change sign-in banner to reflect disabled or moved account status ( #19773 )
2 years ago
887976814a
Fix JavaScript console warning when loading notifications ( #19772 )
2 years ago
c95d9aab56
Fix JavaScript console error on upload editing status ( #19769 )
2 years ago
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
2 years ago
Jeremy Kescher
96afc222d2
Merge remote-tracking branch 'upstream/main' into develop
2 years ago
2f8fb49d13
Fix users not being able to change their hide_followers_count setting ( #1889 )
2 years ago
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>
2 years ago
34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI ( #1888 )
2 years ago
c4b92b1aee
Fix n+1 query during status removal ( #19753 )
2 years ago
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
2 years ago
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
2 years ago
0165449e3a
A11y: Explicit <form> element around compose area ( #19742 )
2 years ago
c2170991c7
Fix reblogs being discarded after the reblogged status ( #19731 )
2 years ago
e02812d5b6
Add assets from Twemoji 14.0 ( #19733 )
2 years ago
Jeremy Kescher
Claire