Claire
e566c9ff02
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
Claire
8fe691e177
[Glitch] Fix WebUI crash when listing server blocks and rationale is not available
...
Port 532fc2e361
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
06c5841fbd
[Glitch] Add the ability to edit media attachment metadata for any unattached media
...
Port d55054b166
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Cutls
f5aacdcc74
[Glitch] Do not show drag&drop dialog when not logined
...
Port f22910ef4a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
905aa6616d
[Glitch] Remove “No description added” media warning in edit mode
...
Port 28ae058593
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
fd6d4392c2
[Glitch] Fix domain blocks on about page not working well on small screens in web UI
...
Port 609cb69251
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Connor Shea
843a4824f2
[Glitch] Only remove padding when listing applications
...
Port 8824c6c4a2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
5d4ad82142
[Glitch] Delay workbox import
...
Port 95e3572a6c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
b5481c4ba2
[Glitch] Fix unnecessary service worker registration and preloading when logged out
...
Port 9b878a14eb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
d4f1b79bcf
[Glitch] Remove preview cards from fav and boost notifications
...
Port 0161fa9745
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
a4e1a2fef2
[Glitch] Fix color of the “No description added“ media upload warning on light theme
...
Port a0d7039011
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
81d24609e5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Conflict because we (glitch-soc) have disabled trending of posts without
review.
Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
Just an extra setting in glitch-soc.
Kept that extra setting.
2 years ago
Claire
fe49f097ca
Add back missing glitch-soc admin settings ( #1919 )
...
Fixes #1890
2 years ago
Jared Allard
b23f93be52
ci: write permissions to packages ( #1906 )
2 years ago
Claire
d80141d0e5
Merge pull request #1918 from ClearlyClaire/glitch-soc/features/glitch-label
...
Add “Glitch-only” label to some settings
2 years ago
Claire
2b3a57d5c0
Add extended description for glitch-soc only “hide followers count" setting
2 years ago
Claire
0b2da756d8
Add “Glitch-only” label to glitch-specific settings
2 years ago
Claire
efa93f0b5a
Merge pull request #1917 from ClearlyClaire/glitch-soc/fixes/not-recommended-label
...
Fix “not recommended” label being shown as “recommended”
2 years ago
Claire
285e4f762a
Make trendable_by_default not apply to posts
2 years ago
Claire
33596cc371
Change "Allow trends without prior review' setting to include statuses
...
Port SCSS changes from ecddc06474
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
bf3b0db357
Fix missing "not recommended" label on "Allow trends without review" ( #20480 )
2 years ago
Claire
e2179547a6
Revert "Revert "Change "Allow trends without prior review" setting to include statuses ( #17977 )""
...
This reverts commit 4e066c5e1e
.
2 years ago
Claire
bef72dcabb
Fix styling of advanced options dropdown ( #1916 )
...
Fixes #1914
2 years ago
Eugen Rochko
9d3d3d7ab1
New Crowdin updates ( #20258 )
...
* New translations en.json (Asturian)
* New translations en.yml (Telugu)
* New translations en.yml (Tamil)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* 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 (Kazakh)
* New translations en.yml (Estonian)
* New translations en.json (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Asturian)
* New translations en.json (Occitan)
* New translations simple_form.en.yml (Basque)
* 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 (Finnish)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Irish)
* 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 (French)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Sinhala)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Sanskrit)
* 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 simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.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 (Estonian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Galician)
* 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 (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Croatian)
* New translations activerecord.en.yml (Icelandic)
* 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 (Corsican)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Romanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Irish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Corsican)
* New translations en.yml (Burmese)
* New translations en.yml (Igbo)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.json (Hungarian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Slovenian)
* New translations en.json (Swedish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Korean)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Romanian)
* New translations en.json (Catalan)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Norwegian)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Arabic)
* New translations en.json (Catalan)
* New translations en.yml (Korean)
* New translations en.json (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Thai)
* New translations en.json (Bulgarian)
* New translations en.yml (Ukrainian)
* New translations en.json (Indonesian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (German)
* New translations en.json (Portuguese)
* New translations en.json (Spanish)
* New translations en.json (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Tamil)
* New translations en.json (Chinese Traditional)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.json (Norwegian)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Korean)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Basque)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Occitan)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.json (French)
* New translations en.yml (Hebrew)
* New translations en.json (Norwegian)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations en.json (Romanian)
* New translations en.json (Russian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Chinese Traditional)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Alex Nordlund
beb7935324
Uppercase chart readme.md to help tools discover it ( #20438 )
2 years ago
Bearice Ren
192fe87f51
fixes ArgumentError when proxy is used ( #20420 )
...
* fixes ArgumentError when proxy is used
* Update app/lib/request.rb
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeong Arm
f9e6d2bb38
Fix trendable status without review ( #20214 )
2 years ago
Claire
532fc2e361
Fix WebUI crash when listing server blocks and rationale is not available ( #20408 )
...
Regression from #20391
Fixes #20405
2 years ago
Emily Strickland
32798102ad
Guard against error extracting `body` from URL ( #20428 )
...
If `Nokogiri::HTML(value).at_xpath('//body')` fails to find the `body` element, it will return `nil`. We can guard against that with an early return. Avoids calling `children` on `Nilclass` in those cases.
2 years ago
Claire
d55054b166
Add the ability to edit media attachment metadata for any unattached media ( #20402 )
2 years ago
Cutls
f22910ef4a
Do not show drag&drop dialog when not logined ( #20400 )
...
* Cannot upload until login
* and do not fire upload
* change username props to context
2 years ago
Claire
28ae058593
Remove “No description added” media warning in edit mode ( #20393 )
...
Editing media metadata is not currently possible in edit mode, the button would
open the modal but saving the changes would error out.
2 years ago
Eugen Rochko
361d6793e8
Fix metadata scrubbing removing color profile from images ( #20389 )
2 years ago
Eugen Rochko
791592c961
Bump version to 4.0.0rc3 ( #20378 )
2 years ago
Eugen Rochko
609cb69251
Fix domain blocks on about page not working well on small screens in web UI ( #20391 )
2 years ago
Pierre Bourdon
4db2969701
blurhash_transcoder: prevent out-of-bound reads with <8bpp images ( #20388 )
...
The Blurhash library used by Mastodon requires an input encoded as 24
bits raw RGB data. The conversion to raw RGB using Imagemagick did not
previously specify the desired bit depth. In some situations, this leads
Imagemagick to output in a pixel format using less bpp than expected.
This then manifested as segfaults of the Sidekiq process due to
out-of-bounds read, or potentially a (highly noisy) memory infoleak.
Fixes #19235 .
2 years ago
Eugen Rochko
fe4fad326d
Change e-mail in SECURITY.md ( #20384 )
2 years ago
Connor Shea
8824c6c4a2
Only remove padding when listing applications ( #20382 )
...
This prevents styling issues on the Authorization page.
2 years ago
F
aa12b82246
Note that CircleCI auth may be required to run PR pipelines ( #20371 )
...
See #20284
2 years ago
Yamagishi Kazutoshi
95e3572a6c
Delay workbox import ( #20376 )
2 years ago
Yamagishi Kazutoshi
51e199a7c0
Fix `ENV` ( #20377 )
2 years ago
F
1a8e2f5fb2
Test the native_locale_name of a non-standard locale ( #20284 )
...
`:en` is English for both `standard_locale_name` and
`native_locale_name`, and so makes for a poor test candidate for
differentiating between them.
2 years ago
Erik Sundell
8aef91d405
helm: fix consistent indentation, chomping, and use of with ( #19918 )
2 years ago
Claire
2fe47bc7db
Remove dead code and refactor status threading code ( #20357 )
...
* Remove dead code
* Remove unneeded/broken parameters and refactor descendant computation
2 years ago
F
dae2918c6a
Add Scots to the supported locales ( #20283 )
...
Fixes #20249
2 years ago
Eugen Rochko
faaa47c421
Change verification to only work for https links ( #20304 )
...
Fix #20242
2 years ago
F
24af2c05bc
Make enable_starttls configurable by envvars ( #20321 )
...
ENABLE_STARTTLS is designed to replace ENABLE_STARTTLS_AUTO by accepting
three values: 'auto' (the default), 'always', and 'never'. If
ENABLE_STARTTLS isn't provided, we fall back to ENABLE_STARTTLS_AUTO. In
this way, this change should be fully backwards compatible.
Resolves #20311
2 years ago
Claire
ee5a39a507
Change logged out /api/v1/statuses/:id/context logged out limits ( #20355 )
2 years ago
Claire
9b878a14eb
Fix unnecessary service worker registration and preloading when logged out ( #20341 )
2 years ago
Alex Nordlund
88976fb615
Update Helm README and bump version ( #20346 )
...
* Update Helm chart README and comments in values.yaml
* Bump next Helm chart to 2.2.0
2 years ago