Claire
9862a6e572
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Our config file is pretty different from upstream.
Upstream changed CSP directive `script-src` to include
`wasm-unsafe-eval` instead of `unsafe-eval`, which we
did not include.
Added `wasm-unsafe-eval` to `script-src` to fix
execution of the OCR web worker.
- `package.json`:
Upstream updated a dependency (`array-includes`) textually
adjacent to a glitch-soc-only dependency (`atrament`).
Updated `array-includes` as upstream did.
2 years ago
Daniel Axtens
e61dc520ae
Add 'private' to Cache-Control, match Rails expectations ( #20608 )
...
Several controlers set quite intricate Cache-Control headers in order to
hopefully not be cached by any intermediate proxies or local caches. Unfortunately,
these headers are processed by ActionDispatch::HTTP::Cache in a way that squashes
and discards any values set alongside no-store other than private:
8015c2c2cf/actionpack/lib/action_dispatch/http/cache.rb (L207-L209)
We want to preserve no-store on these responses, but we might as well remove
parts that are going to be dropped anyway. As many of the endpoints in these
controllers are private to a particular user, we should also add "private",
which will be preserved alongside no-store.
2 years ago
Eugen Rochko
a021e53791
New Crowdin updates ( #20580 )
...
* New translations en.json (Catalan)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Ukrainian)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Hungarian)
* New translations en.json (Slovak)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Irish)
* New translations en.yml (Norwegian)
* New translations en.yml (German)
* New translations en.json (Romanian)
* New translations en.yml (Danish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.yml (Danish)
* New translations en.json (Catalan)
* New translations en.yml (Norwegian)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian)
* New translations en.json (Catalan)
* New translations en.json (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Latvian)
* New translations en.json (Irish)
* New translations en.json (Swedish)
* New translations en.yml (Galician)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.json (Kabyle)
* New translations en.yml (Welsh)
* New translations en.json (Breton)
* New translations en.json (Kabyle)
* New translations en.yml (Kabyle)
* New translations simple_form.en.yml (Kabyle)
* New translations en.json (Malay)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Malay)
* New translations activerecord.en.yml (Malay)
* New translations devise.en.yml (Malay)
* New translations doorkeeper.en.yml (Malay)
* New translations en.json (Malay)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Malay)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Malay)
* New translations en.yml (Dutch)
* New translations en.json (Malay)
* New translations en.yml (Malay)
* New translations en.json (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Malay)
* New translations devise.en.yml (Welsh)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations devise.en.yml (Malay)
* New translations en.json (Vietnamese)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Malay)
* New translations devise.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Norwegian)
* New translations devise.en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Norwegian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Esperanto)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Norwegian)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Norwegian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations en.json (Asturian)
* New translations en.json (Asturian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko
496fb46016
Fix wrong color on mentions hidden behind content warning in web UI ( #20724 )
2 years ago
Claire
51864b0b0d
Fix infinite loop when system emoji font is enabled ( #1931 )
...
Fixes #1930
2 years ago
Claire
7fbfa23d71
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji
...
Port 97ac51901d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
665c7b9240
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire
97ac51901d
Fix nodes order being sometimes mangled when rewriting emoji ( #20677 )
...
* Fix front-end emoji tests
* Fix nodes order being sometimes mangled when rewriting emoji
2 years ago
Claire
9f0a4acfb1
[Glitch] Fix emoji substitution not applying only to text nodes in Web UI
...
Port bd267f6353
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
699db5f2af
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
Upstream removed blank lines.
2 years ago
Claire
c9b53436d7
Fix emoji substitution not applying only to text nodes in backend code ( #20641 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
bd267f6353
Fix emoji substitution not applying only to text nodes in Web UI ( #20640 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
56234c7110
[Glitch] Fix media metadata being only editable once
...
Port 088c365559
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
6e299f53bd
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire
088c365559
Fix media metadata being only editable once ( #20665 )
2 years ago
trwnh
aacc2970f4
[Glitch] Move V2 Filter methods under /api/v2 prefix
...
Port 72d3607229
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
6353e83d6c
[Glitch] Fix dropdown menu on profiles not being accessible on narrow screens in web UI
...
Port ca6df7a68c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Samuel Kaiser
c538d5d3f6
[Glitch] Stick batch table toolbar to the top
...
Port cb99d425b3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
997553a99e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
2 years ago
trwnh
72d3607229
Move V2 Filter methods under /api/v2 prefix ( #20622 )
...
* Move V2 Filter methods under /api/v2 prefix
* move over the tests too
2 years ago
Eugen Rochko
2b3b063852
Fix error when invalid domain name is submitted ( #19474 )
...
Fix #19175
2 years ago
Eugen Rochko
0cfead6483
Fix style of username in navigation bar above compose form in web UI ( #20628 )
...
Regression from #20540
2 years ago
Eugen Rochko
8b98bebc17
Fix error when passing unknown filter param in REST API ( #20626 )
...
Fix #19156
2 years ago
Eugen Rochko
2018fe879c
Fix image type not being set after conversion for convertible image types ( #20624 )
2 years ago
Eugen Rochko
3cc5ed3bae
Fix `role_ids` not accepting arrays in admin API ( #20625 )
...
Fix #19157
2 years ago
Eugen Rochko
12b819c78c
Fix rules with same priority being sorted non-deterministically ( #20623 )
2 years ago
Eugen Rochko
ca6df7a68c
Fix dropdown menu on profiles not being accessible on narrow screens in web UI ( #20620 )
2 years ago
Hampton Lintorn-Catlin
277e2590e2
Support UTF-8 Characters in Domains During CSV Import ( #20592 )
...
* Support UTF-8 Characters in Domains During Import
* Update Changelong
2 years ago
Eugen Rochko
72de8402bd
Fix wrong cut-off point for "Read more" in web UI ( #20599 )
2 years ago
Eugen Rochko
c7924acf16
Fix icons having an image role ( #20600 )
2 years ago
trwnh
1b9ad6fb4b
Change in-app links to keep you in-app ( #20540 )
...
* Change in-app links to keep you in-app
* refactor Permalink into Link
* rewrite link hrefs in status content
* please linter
* please linter again
2 years ago
Samuel Kaiser
cb99d425b3
Stick batch table toolbar to the top ( #20442 )
...
Fixes #20441
2 years ago
Claire
4dab1ab637
Fix announcement dates not being validated client-side ( #20577 )
2 years ago
Eugen Rochko
eaf5acca01
New Crowdin updates ( #20476 )
...
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations en.json (Japanese)
* New translations en.yml (Czech)
* New translations en.json (Esperanto)
* New translations en.yml (Norwegian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Latvian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Norwegian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Malayalam)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Thai)
* New translations devise.en.yml (Welsh)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.yml (Irish)
* New translations en.json (Norwegian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Norwegian)
* New translations en.json (Finnish)
* New translations en.json (Norwegian)
* New translations simple_form.en.yml (Norwegian)
* New translations en.yml (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Arabic)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.yml (Greek)
* New translations en.yml (German)
* New translations en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Finnish)
* New translations en.yml (Basque)
* New translations en.yml (Frisian)
* New translations en.yml (Danish)
* New translations en.yml (Catalan)
* New translations en.yml (Bulgarian)
* New translations en.yml (Arabic)
* New translations en.yml (Afrikaans)
* New translations en.yml (French)
* New translations en.yml (Romanian)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations en.yml (Armenian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Swedish)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Slovak)
* New translations en.yml (Japanese)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations en.yml (Punjabi)
* New translations en.yml (Norwegian)
* New translations en.yml (Dutch)
* New translations en.yml (Macedonian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Korean)
* New translations en.yml (Georgian)
* New translations en.yml (Italian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Turkish)
* New translations en.yml (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* 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 (Sinhala)
* 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 en.yml (Burmese)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Bengali)
* New translations en.yml (Hindi)
* New translations en.yml (Marathi)
* 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 (Malay)
* New translations en.yml (Malayalam)
* 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 (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Igbo)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Afrikaans)
* New translations en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Catalan)
* New translations en.yml (Greek)
* New translations en.yml (Italian)
* New translations en.yml (Slovenian)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Basque)
* New translations en.yml (Norwegian)
* New translations en.yml (Portuguese)
* New translations en.yml (Icelandic)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (French)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Esperanto)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Hebrew)
* New translations en.yml (Norwegian)
* New translations en.yml (German)
* New translations en.json (Spanish)
* New translations en.yml (Finnish)
* New translations en.json (Norwegian)
* New translations en.yml (Latvian)
* New translations en.yml (Esperanto)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Esperanto)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Claire
29cddeffaf
Fix saving server registration settings redirecting to branding settings ( #20505 )
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
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