-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Goat/upstream #11
Goat/upstream #11
Commits on Nov 13, 2022
-
Configuration menu - View commit details
-
Copy full SHA for e9e4938 - Browse repository at this point
Copy the full SHA e9e4938View commit details -
Configuration menu - View commit details
-
Copy full SHA for cf77d93 - Browse repository at this point
Copy the full SHA cf77d93View commit details -
Allow unsetting x-amz-acl S3 Permission headers (mastodon#20510)
Some "S3 Compatible" storage providers (Cloudflare R2 is one such example) don't support setting ACLs on individual uploads with the `x-amz-acl` header, and instead just have a visibility for the whole bucket. To support uploads to such providers without getting unsupported errors back, lets use a black `S3_PERMISSION` env var to indicate that these headers shouldn't be sent. This is tested as working with Cloudflare R2.
Configuration menu - View commit details
-
Copy full SHA for 290d78c - Browse repository at this point
Copy the full SHA 290d78cView commit details -
New Crowdin updates (mastodon#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>
Configuration menu - View commit details
-
Copy full SHA for cf36ee9 - Browse repository at this point
Copy the full SHA cf36ee9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1af4826 - Browse repository at this point
Copy the full SHA 1af4826View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3d3bd34 - Browse repository at this point
Copy the full SHA 3d3bd34View commit details -
Fix public/local timeline posts not being properly filtered (mastodon…
…#20567) * Fix streaming server using wrong property name for matching filters Late in the PR, the `filter_results` property has been renamed to `filtered`, but the change has not been reflected in the streaming server code. * Fix filter_action attribute being an integer instead of a string
Configuration menu - View commit details
-
Copy full SHA for cd5e98d - Browse repository at this point
Copy the full SHA cd5e98dView commit details -
Configuration menu - View commit details
-
Copy full SHA for a6186da - Browse repository at this point
Copy the full SHA a6186daView commit details -
Configuration menu - View commit details
-
Copy full SHA for bd806a3 - Browse repository at this point
Copy the full SHA bd806a3View commit details -
Test blank account field verifiability (mastodon#20458)
* Test blank account field verifiability This change tests the need for mastodon#20428, which ensures that we guard against a situation in which `at_xpath` returns `nil`. * Test verifiability of blank fields for remote account profiles This adds a counterpart test for remote account profiles' fields' verifiability when those fields are blank. I previously added the same test for local accounts.
Configuration menu - View commit details
-
Copy full SHA for c223153 - Browse repository at this point
Copy the full SHA c223153View commit details -
Configuration menu - View commit details
-
Copy full SHA for e62b514 - Browse repository at this point
Copy the full SHA e62b514View commit details -
Helm: support statsd publishing (mastodon#20455)
* Allow statsd publishing from Helm * Apply suggestions from code review Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com> Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 82c6633 - Browse repository at this point
Copy the full SHA 82c6633View commit details -
Add the option to configure external postgresql port (mastodon#20370)
While the normal assumption of port `5432` for a postgresql server is pretty reliable I found that DigitalOcean puts them on a somewhat random port. This adds the ability to specify the port in the helm chart.
Configuration menu - View commit details
-
Copy full SHA for ad66bbe - Browse repository at this point
Copy the full SHA ad66bbeView commit details -
Change in-app links to keep you in-app (mastodon#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
Configuration menu - View commit details
-
Copy full SHA for 0722908 - Browse repository at this point
Copy the full SHA 0722908View commit details -
helm: Add helm chart tests (mastodon#20394)
* helm: Fix consistent list indentation * helm: Add helm lint and helm template tests * helm: Add helm template --validate test * helm: Add helm install test
Configuration menu - View commit details
-
Copy full SHA for 87fbd08 - Browse repository at this point
Copy the full SHA 87fbd08View commit details -
Configuration menu - View commit details
-
Copy full SHA for 24b2c60 - Browse repository at this point
Copy the full SHA 24b2c60View commit details -
Configuration menu - View commit details
-
Copy full SHA for d0b7bd4 - Browse repository at this point
Copy the full SHA d0b7bd4View commit details
Commits on Nov 14, 2022
-
Add
Cache-Control
header to openstack-stored files (mastodon#20610)When storing files in S3, paperclip is configured with a Cache-Control header indicating the file is immutable, however no such header was added when using OpenStack storage. Luckily Paperclip's fog integration makes this trivial, with a simple `fog_file` `Cache-Control` default doing the trick.
Configuration menu - View commit details
-
Copy full SHA for 9d03920 - Browse repository at this point
Copy the full SHA 9d03920View commit details -
Support UTF-8 Characters in Domains During CSV Import (mastodon#20592)
* Support UTF-8 Characters in Domains During Import * Update Changelong
Configuration menu - View commit details
-
Copy full SHA for 147d8bd - Browse repository at this point
Copy the full SHA 147d8bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6da9df7 - Browse repository at this point
Copy the full SHA 6da9df7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2e2ba39 - Browse repository at this point
Copy the full SHA 2e2ba39View commit details -
Configuration menu - View commit details
-
Copy full SHA for 167d86d - Browse repository at this point
Copy the full SHA 167d86dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5c826c4 - Browse repository at this point
Copy the full SHA 5c826c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for b31afc6 - Browse repository at this point
Copy the full SHA b31afc6View commit details -
Fix style of username in navigation bar above compose form in web UI (m…
…astodon#20628) Regression from mastodon#20540
Configuration menu - View commit details
-
Copy full SHA for 523e106 - Browse repository at this point
Copy the full SHA 523e106View commit details -
Configuration menu - View commit details
-
Copy full SHA for 552d69a - Browse repository at this point
Copy the full SHA 552d69aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1e83092 - Browse repository at this point
Copy the full SHA 1e83092View commit details -
Configuration menu - View commit details
-
Copy full SHA for 457c37e - Browse repository at this point
Copy the full SHA 457c37eView commit details -
Move V2 Filter methods under /api/v2 prefix (mastodon#20622)
* Move V2 Filter methods under /api/v2 prefix * move over the tests too
Configuration menu - View commit details
-
Copy full SHA for b59ce0a - Browse repository at this point
Copy the full SHA b59ce0aView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 32c70d2 - Browse repository at this point
Copy the full SHA 32c70d2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 75299a0 - Browse repository at this point
Copy the full SHA 75299a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for cd713ca - Browse repository at this point
Copy the full SHA cd713caView commit details -
[Glitch] Stick batch table toolbar to the top
Port e62b514 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 9fd866f - Browse repository at this point
Copy the full SHA 9fd866fView commit details -
[Glitch] Fix dropdown menu on profiles not being accessible on narrow…
… screens in web UI Port 6da9df7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 9db90d2 - Browse repository at this point
Copy the full SHA 9db90d2View commit details -
[Glitch] Move V2 Filter methods under /api/v2 prefix
Port b59ce0a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for c31e756 - Browse repository at this point
Copy the full SHA c31e756View commit details -
Merge pull request mastodon#1923 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for 7233569 - Browse repository at this point
Copy the full SHA 7233569View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d54986 - Browse repository at this point
Copy the full SHA 2d54986View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9ab4e3f - Browse repository at this point
Copy the full SHA 9ab4e3fView commit details -
[Glitch] Fix media metadata being only editable once
Port 2d54986 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 96c1ef6 - Browse repository at this point
Copy the full SHA 96c1ef6View commit details -
Merge pull request mastodon#1927 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for a34aa2a - Browse repository at this point
Copy the full SHA a34aa2aView commit details -
Fix emoji substitution not applying only to text nodes in Web UI (mas…
…todon#20640) Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 625e086 - Browse repository at this point
Copy the full SHA 625e086View commit details -
Fix emoji substitution not applying only to text nodes in backend code (
mastodon#20641) Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 71c92d3 - Browse repository at this point
Copy the full SHA 71c92d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 21fd25a - Browse repository at this point
Copy the full SHA 21fd25aView commit details -
Configuration menu - View commit details
-
Copy full SHA for fb389bd - Browse repository at this point
Copy the full SHA fb389bdView commit details -
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile`: Upstream removed blank lines.
Configuration menu - View commit details
-
Copy full SHA for 767630b - Browse repository at this point
Copy the full SHA 767630bView commit details -
[Glitch] Fix emoji substitution not applying only to text nodes in We…
…b UI Port 625e086 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 71982e5 - Browse repository at this point
Copy the full SHA 71982e5View commit details -
Merge pull request mastodon#1928 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for 7a8cd0c - Browse repository at this point
Copy the full SHA 7a8cd0cView commit details -
Fix nodes order being sometimes mangled when rewriting emoji (mastodo…
…n#20677) * Fix front-end emoji tests * Fix nodes order being sometimes mangled when rewriting emoji
Configuration menu - View commit details
-
Copy full SHA for ccbca50 - Browse repository at this point
Copy the full SHA ccbca50View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4415dd6 - Browse repository at this point
Copy the full SHA 4415dd6View commit details -
Configuration menu - View commit details
-
Copy full SHA for b5698af - Browse repository at this point
Copy the full SHA b5698afView commit details -
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji
Port ccbca50 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 8aa56ae - Browse repository at this point
Copy the full SHA 8aa56aeView commit details -
Merge pull request mastodon#1929 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for e589afa - Browse repository at this point
Copy the full SHA e589afaView commit details -
Configuration menu - View commit details
-
Copy full SHA for ceafd1f - Browse repository at this point
Copy the full SHA ceafd1fView commit details
Commits on Nov 15, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 8c3c6dc - Browse repository at this point
Copy the full SHA 8c3c6dcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 66461ae - Browse repository at this point
Copy the full SHA 66461aeView commit details -
Merge pull request mastodon#1932 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for eb675af - Browse repository at this point
Copy the full SHA eb675afView commit details -
Configuration menu - View commit details
-
Copy full SHA for 17bd9a8 - Browse repository at this point
Copy the full SHA 17bd9a8View commit details -
Bump nokogiri from 1.13.8 to 1.13.9 (mastodon#20041)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.13.8...v1.13.9) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for b59683c - Browse repository at this point
Copy the full SHA b59683cView commit details -
Use "unsafe-wasm-eval" instead of "unsafe-eval" in script-src CSP (ma…
…stodon#20606) * Add "unsafe-eval" to script-src CSP * Use 'unsafe-wasm-eval' instead of 'unsafe-eval'
Configuration menu - View commit details
-
Copy full SHA for b46b7c3 - Browse repository at this point
Copy the full SHA b46b7c3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 43b0b2f - Browse repository at this point
Copy the full SHA 43b0b2fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 03b0f3a - Browse repository at this point
Copy the full SHA 03b0f3aView commit details -
New Crowdin updates (mastodon#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>
Configuration menu - View commit details
-
Copy full SHA for a1738f8 - Browse repository at this point
Copy the full SHA a1738f8View commit details -
Bump promise.prototype.finally from 3.1.3 to 3.1.4 (mastodon#20050)
Bumps [promise.prototype.finally](https://github.com/es-shims/Promise.prototype.finally) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/es-shims/Promise.prototype.finally/releases) - [Changelog](https://github.com/es-shims/Promise.prototype.finally/blob/main/CHANGELOG.md) - [Commits](es-shims/Promise.prototype.finally@v3.1.3...v3.1.4) --- updated-dependencies: - dependency-name: promise.prototype.finally dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 66a22ab - Browse repository at this point
Copy the full SHA 66a22abView commit details -
Bump reselect from 4.1.6 to 4.1.7 (mastodon#20052)
Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/reduxjs/reselect/releases) - [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md) - [Commits](reduxjs/reselect@v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: reselect dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 3b82d1e - Browse repository at this point
Copy the full SHA 3b82d1eView commit details -
Bump memory_profiler from 1.0.0 to 1.0.1 (mastodon#20054)
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/SamSaffron/memory_profiler/releases) - [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md) - [Commits](SamSaffron/memory_profiler@v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: memory_profiler dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 61264e5 - Browse repository at this point
Copy the full SHA 61264e5View commit details -
Bump tzinfo-data from 1.2022.4 to 1.2022.6 (mastodon#20056)
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2022.4 to 1.2022.6. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](tzinfo/tzinfo-data@v1.2022.4...v1.2022.6) --- updated-dependencies: - dependency-name: tzinfo-data dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for c76f29a - Browse repository at this point
Copy the full SHA c76f29aView commit details -
Bump json-ld-preloaded from 3.2.0 to 3.2.2 (mastodon#20058)
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.2.0 to 3.2.2. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](ruby-rdf/json-ld-preloaded@3.2.0...3.2.2) --- updated-dependencies: - dependency-name: json-ld-preloaded dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for fc44521 - Browse repository at this point
Copy the full SHA fc44521View commit details -
Bump loader-utils from 1.4.0 to 1.4.1 (mastodon#20085)
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 4ef4db2 - Browse repository at this point
Copy the full SHA 4ef4db2View commit details -
Bump redux-thunk from 2.4.1 to 2.4.2 (mastodon#20060)
Bumps [redux-thunk](https://github.com/reduxjs/redux-thunk) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/reduxjs/redux-thunk/releases) - [Commits](reduxjs/redux-thunk@v2.4.1...v2.4.2) --- updated-dependencies: - dependency-name: redux-thunk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 3301aad - Browse repository at this point
Copy the full SHA 3301aadView commit details -
Bump yargs from 17.6.0 to 17.6.2 (mastodon#20063)
Bumps [yargs](https://github.com/yargs/yargs) from 17.6.0 to 17.6.2. - [Release notes](https://github.com/yargs/yargs/releases) - [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md) - [Commits](yargs/yargs@v17.6.0...v17.6.2) --- updated-dependencies: - dependency-name: yargs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 9f95c41 - Browse repository at this point
Copy the full SHA 9f95c41View commit details -
Bump postcss from 8.4.18 to 8.4.19 (mastodon#20684)
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.18 to 8.4.19. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.4.18...8.4.19) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for dba1645 - Browse repository at this point
Copy the full SHA dba1645View commit details -
Bump array-includes from 3.1.5 to 3.1.6 (mastodon#20680)
Bumps [array-includes](https://github.com/es-shims/array-includes) from 3.1.5 to 3.1.6. - [Release notes](https://github.com/es-shims/array-includes/releases) - [Changelog](https://github.com/es-shims/array-includes/blob/main/CHANGELOG.md) - [Commits](es-shims/array-includes@v3.1.5...v3.1.6) --- updated-dependencies: - dependency-name: array-includes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for ca61066 - Browse repository at this point
Copy the full SHA ca61066View commit details -
Bump blurhash from 2.0.3 to 2.0.4 (mastodon#19601)
Bumps [blurhash](https://github.com/woltapp/blurhash) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/woltapp/blurhash/releases) - [Commits](https://github.com/woltapp/blurhash/commits) --- updated-dependencies: - dependency-name: blurhash dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for dd360e6 - Browse repository at this point
Copy the full SHA dd360e6View commit details -
Bump jsdom from 20.0.1 to 20.0.2 (mastodon#19603)
Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.1 to 20.0.2. - [Release notes](https://github.com/jsdom/jsdom/releases) - [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md) - [Commits](jsdom/jsdom@20.0.1...20.0.2) --- updated-dependencies: - dependency-name: jsdom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for acbf4d0 - Browse repository at this point
Copy the full SHA acbf4d0View commit details -
Bump pg from 1.4.3 to 1.4.4 (mastodon#19597)
Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](ged/ruby-pg@v1.4.3...v1.4.4) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for f32c2de - Browse repository at this point
Copy the full SHA f32c2deView commit details -
Bump object.values from 1.1.5 to 1.1.6 (mastodon#20047)
Bumps [object.values](https://github.com/es-shims/Object.values) from 1.1.5 to 1.1.6. - [Release notes](https://github.com/es-shims/Object.values/releases) - [Changelog](https://github.com/es-shims/Object.values/blob/main/CHANGELOG.md) - [Commits](es-shims/Object.values@v1.1.5...v1.1.6) --- updated-dependencies: - dependency-name: object.values dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for dde60e2 - Browse repository at this point
Copy the full SHA dde60e2View commit details -
Bump oj from 3.13.21 to 3.13.23 (mastodon#20046)
Bumps [oj](https://github.com/ohler55/oj) from 3.13.21 to 3.13.23. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](ohler55/oj@v3.13.21...v3.13.23) --- updated-dependencies: - dependency-name: oj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 575bf3f - Browse repository at this point
Copy the full SHA 575bf3fView commit details -
Bump sidekiq from 6.5.7 to 6.5.8 (mastodon#20035)
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.5.7 to 6.5.8. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](sidekiq/sidekiq@v6.5.7...v6.5.8) --- updated-dependencies: - dependency-name: sidekiq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for f7d261c - Browse repository at this point
Copy the full SHA f7d261cView commit details
Commits on Nov 16, 2022
-
Bump loader-utils from 1.4.1 to 1.4.2 (mastodon#20826)
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for ac7a29f - Browse repository at this point
Copy the full SHA ac7a29fView commit details -
Add 'private' to Cache-Control, match Rails expectations (mastodon#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: https://github.com/rails/rails/blob/8015c2c2cf5c8718449677570f372ceb01318a32/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.
Configuration menu - View commit details
-
Copy full SHA for 4d85c27 - Browse repository at this point
Copy the full SHA 4d85c27View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 1901829 - Browse repository at this point
Copy the full SHA 1901829View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7efe2cf - Browse repository at this point
Copy the full SHA 7efe2cfView commit details -
Merge pull request mastodon#1941 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for ad84fd2 - Browse repository at this point
Copy the full SHA ad84fd2View commit details -
Bump Helm app version to 4.0.2 (mastodon#20697)
* Bump Helm app version to 4.0.1 * Bump Helm app version to 4.0.1
Configuration menu - View commit details
-
Copy full SHA for f890fdc - Browse repository at this point
Copy the full SHA f890fdcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c56441 - Browse repository at this point
Copy the full SHA 8c56441View commit details -
Configuration menu - View commit details
-
Copy full SHA for 23ea0e7 - Browse repository at this point
Copy the full SHA 23ea0e7View commit details
Commits on Nov 17, 2022
-
Fix safari explore disappearing tabs (mastodon#20917)
* fix disappearing Explore tabs on Safari * fix lint Co-authored-by: nyura <nyura@hidden.com>
Configuration menu - View commit details
-
Copy full SHA for aaca78d - Browse repository at this point
Copy the full SHA aaca78dView commit details -
Configuration menu - View commit details
-
Copy full SHA for a2931d1 - Browse repository at this point
Copy the full SHA a2931d1View commit details -
Add maskable icon support for Android (mastodon#20904)
* Add maskable icon support for Android * Update manifest_serializer.rb * Fix linting issue
Configuration menu - View commit details
-
Copy full SHA for 413481f - Browse repository at this point
Copy the full SHA 413481fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0cc7726 - Browse repository at this point
Copy the full SHA 0cc7726View commit details -
Configuration menu - View commit details
-
Copy full SHA for 642870c - Browse repository at this point
Copy the full SHA 642870cView commit details -
Make the button that expands the publish form differentiable from the…
… button that publishes a post (mastodon#20864)
Configuration menu - View commit details
-
Copy full SHA for 654d348 - Browse repository at this point
Copy the full SHA 654d348View commit details -
Fix pagination of followed tags (mastodon#20861)
* Fix missing pagination headers on followed tags * Fix typo
Configuration menu - View commit details
-
Copy full SHA for e1f819f - Browse repository at this point
Copy the full SHA e1f819fView commit details -
Configuration menu - View commit details
-
Copy full SHA for eb80789 - Browse repository at this point
Copy the full SHA eb80789View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7955d4b - Browse repository at this point
Copy the full SHA 7955d4bView commit details -
Change automatic post deletion configuration to be accessible to redi…
…rected users (mastodon#20774) Fixes mastodon#20550
Configuration menu - View commit details
-
Copy full SHA for 00b2720 - Browse repository at this point
Copy the full SHA 00b2720View commit details -
Configuration menu - View commit details
-
Copy full SHA for 72618eb - Browse repository at this point
Copy the full SHA 72618ebView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7fdeed5 - Browse repository at this point
Copy the full SHA 7fdeed5View commit details -
Configuration menu - View commit details
-
Copy full SHA for cbb0153 - Browse repository at this point
Copy the full SHA cbb0153View commit details -
Handle links with no href in VerifyLinkService (mastodon#20741)
Before this change, the following error would cause VerifyAccountLinksWorker to fail: NoMethodError: undefined method `downcase' for nil:NilClass [PROJECT_ROOT]/app/services/verify_link_service.rb:31 :in `block in link_back_present?`
Configuration menu - View commit details
-
Copy full SHA for daf6f34 - Browse repository at this point
Copy the full SHA daf6f34View commit details -
Use buildx functions for faster build (mastodon#20692)
* Use buildx functions for faster build * move link * cannot use --link with --chown
Configuration menu - View commit details
-
Copy full SHA for 92734e3 - Browse repository at this point
Copy the full SHA 92734e3View commit details -
Remove last references to "silencing" in UI text (mastodon#20637)
* Remove last references to "silencing" in en and en_GB locales * Remove stray the, rephrase a bit * Revert changes to generated files I assume these will get updated via Crowdin
Configuration menu - View commit details
-
Copy full SHA for e7deea6 - Browse repository at this point
Copy the full SHA e7deea6View commit details -
Support for import/export of instance-level domain blocks/allows for …
…4.x w/ additional fixes (mastodon#20597) * Allow import/export of instance-level domain blocks/allows (mastodon#1754) * Allow import/export of instance-level domain blocks/allows. Fixes mastodon#15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit 94e9886) * Add confirmation page when importing blocked domains (mastodon#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commit b91196f) * Fix authorization check in domain blocks controller (cherry picked from commit 7527937) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit 9094c2f) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit 26ff48e) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for c373148 - Browse repository at this point
Copy the full SHA c373148View commit details -
Fix style for hashes (mastodon#20518)
* Fix style for hashes Make the style for hashes consistent. * New style More consistency
Configuration menu - View commit details
-
Copy full SHA for 4f15fd0 - Browse repository at this point
Copy the full SHA 4f15fd0View commit details -
Remove use of DOMParser in front-end emoji rewriting code (mastodon#2…
…0758) * Add jstest for node ordering in emojify * Remove use of DOMParser in front-end emoji rewriting code
Configuration menu - View commit details
-
Copy full SHA for 585cc1a - Browse repository at this point
Copy the full SHA 585cc1aView commit details -
Fix various issues with domain block import (mastodon#1944)
- stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded
Configuration menu - View commit details
-
Copy full SHA for ab7d99e - Browse repository at this point
Copy the full SHA ab7d99eView commit details -
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.
Configuration menu - View commit details
-
Copy full SHA for aec61a7 - Browse repository at this point
Copy the full SHA aec61a7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5ef92df - Browse repository at this point
Copy the full SHA 5ef92dfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1b5ed32 - Browse repository at this point
Copy the full SHA 1b5ed32View commit details -
[Glitch] Fix safari explore disappearing tabs
Port aaca78d to glitch-soc Co-authored-by: nyura <nyura@hidden.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 87929ad - Browse repository at this point
Copy the full SHA 87929adView commit details -
[Glitch] Make the button that expands the publish form differentiable…
… from the button that publishes a post Port 654d348 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for 4b449ff - Browse repository at this point
Copy the full SHA 4b449ffView commit details -
[Glitch] Remove use of DOMParser in front-end emoji rewriting code
Port 585cc1a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Configuration menu - View commit details
-
Copy full SHA for c22f3a8 - Browse repository at this point
Copy the full SHA c22f3a8View commit details -
Merge pull request mastodon#1951 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for 381137c - Browse repository at this point
Copy the full SHA 381137cView commit details -
New Crowdin updates (mastodon#20759)
* New translations en.json (German) * New translations en.json (Italian) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (German) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.json (Dutch) * New translations en.json (Esperanto) * New translations en.json (Dutch) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Faroese) * New translations en.json (Esperanto) * New translations en.json (Irish) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.json (Scots) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Scots) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Esperanto) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations en.json (Lithuanian) * New translations en.yml (Galician) * New translations en.json (Icelandic) * New translations en.yml (Galician) * New translations en.json (Icelandic) * New translations en.yml (Thai) * New translations en.yml (Slovenian) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Dutch) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Georgian) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * 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 (Korean) * New translations en.yml (Japanese) * New translations en.yml (German) * New translations en.yml (Arabic) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Ido) * New translations en.yml (Spanish) * New translations en.yml (Turkish) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Italian) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.yml (Frisian) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Hebrew) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Silesian) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Taigi) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Asturian) * New translations en.yml (Burmese) * New translations en.yml (Igbo) * New translations en.yml (French, Quebec) * New translations en.json (Faroese) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Occitan) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Bengali) * New translations en.yml (Telugu) * 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 (Hindi) * New translations en.yml (English, United Kingdom) * New translations en.yml (Kannada) * New translations en.yml (Welsh) * New translations en.yml (Uyghur) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations en.yml (Malayalam) * New translations en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Thai) * New translations en.yml (Portuguese) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.yml (Lithuanian) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Russian) * New translations en.yml (Italian) * New translations en.yml (Slovak) * New translations en.yml (Slovenian) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Japanese) * New translations en.yml (Armenian) * New translations en.json (Hebrew) * New translations en.yml (French) * New translations en.yml (German) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Spanish) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Czech) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Afrikaans) * New translations en.yml (Hungarian) * New translations en.yml (Arabic) * New translations en.yml (Bulgarian) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.yml (Greek) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.yml (Indonesian) * New translations en.yml (Ido) * New translations en.yml (Persian) * New translations simple_form.en.yml (Polish) * New translations en.yml (Breton) * New translations en.yml (Sinhala) * New translations en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Vietnamese) * 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 (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Malay) * New translations en.yml (Corsican) * New translations en.yml (Occitan) * New translations en.yml (Sardinian) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kabyle) * New translations en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Indonesian) * 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 (Ukrainian) * 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 (Estonian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Frisian) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Finnish) * 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 (Swedish) * New translations simple_form.en.yml (Portuguese) * 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 en.yml (French, Quebec) * New translations en.json (Faroese) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Hebrew) * New translations en.yml (Korean) * New translations en.yml (Dutch) * New translations en.yml (Slovenian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Kurmanji (Kurdish)) * normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Configuration menu - View commit details
-
Copy full SHA for 0a78631 - Browse repository at this point
Copy the full SHA 0a78631View commit details -
Configuration menu - View commit details
-
Copy full SHA for 231e3ec - Browse repository at this point
Copy the full SHA 231e3ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4ae97a2 - Browse repository at this point
Copy the full SHA 4ae97a2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 367db82 - Browse repository at this point
Copy the full SHA 367db82View commit details -
Merge pull request mastodon#1954 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for f233b5e - Browse repository at this point
Copy the full SHA f233b5eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 48e1366 - Browse repository at this point
Copy the full SHA 48e1366View commit details
Commits on Nov 18, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 597a783 - Browse repository at this point
Copy the full SHA 597a783View commit details -
Merge pull request mastodon#1955 from ClearlyClaire/glitch-soc/merge-…
…upstream Merge upstream changes
Configuration menu - View commit details
-
Copy full SHA for e0e7a09 - Browse repository at this point
Copy the full SHA e0e7a09View commit details
Commits on Nov 19, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 26dae3e - Browse repository at this point
Copy the full SHA 26dae3eView commit details -
Configuration menu - View commit details
-
Copy full SHA for a8b62a2 - Browse repository at this point
Copy the full SHA a8b62a2View commit details