Merge upstream - CVE-2024-23832 #39

Co-authored-by: GitHub Actions <[email protected]>

…e-upstream Merge upstream changes up to 2954279

…ogged post author (mastodon#18482) Co-authored-by: Claire <[email protected]>

…oc/merge-upstream Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.

Port b6e3535 to glitch-soc Signed-off-by: Claire <[email protected]>

…egenerated Port 383be17 to glitch-soc Signed-off-by: Claire <[email protected]>

This reverts commit d9a078e.

Port 1e4ccc6 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 2cbdff9 to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>

…e-upstream Merge upstream changes up to cd37048

…s/badge-design Port upstream's role badge design

Port 134de73 to glitch-soc Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>

Port f08ca3f to glitch-soc Signed-off-by: Claire <[email protected]>

Port a4e6fe3 to glitch-soc Signed-off-by: Claire <[email protected]>

Port fa7e64d to glitch-soc Signed-off-by: Claire <[email protected]>

Port e4e752c to glitch-soc Signed-off-by: Claire <[email protected]>

Port 7e3c10d to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>

Port 7b1d390 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 1cba91d to glitch-soc Signed-off-by: Claire <[email protected]>

…s/dreaded-icon-change-please-save-me Port upstream's icon changes

…`forceUpdate` usage Port 5374428 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 13d310e to glitch-soc Signed-off-by: Claire <[email protected]>

…s/column-changes Port upstream's column refactor of column and column header code

Port d67bd44 to glitch-soc Signed-off-by: Claire <[email protected]>

…n web UI Port 0e98014 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 01f0a6c to glitch-soc Signed-off-by: Claire <[email protected]>

Port 59478a1 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 6308dca to glitch-soc Signed-off-by: Claire <[email protected]>

Port cfd50f3 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 728eb6a to glitch-soc Signed-off-by: Claire <[email protected]>

…s/onboarding-profile-setup Add profile setup to onboarding in web UI

…peScript Port 1142f4c to glitch-soc Signed-off-by: Claire <[email protected]>

Port 3a7f10c to glitch-soc Co-authored-by: Claire <[email protected]> Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>

…ests (mastodon#28718)

…de (mastodon#28631)

…mastodon#28733)

Co-authored-by: GitHub Actions <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…astodon#28732)

…8727) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Port 277e696 to glitch-soc Signed-off-by: Claire <[email protected]> Co-authored-by: Renaud Chaput <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…s/convert-utils-hashtags-typescript Convert utils and hashtags to Typescript

…uiring approval (mastodon#28608)

mastodon#28735)

Co-authored-by: Matt Jankowski <[email protected]>

…oc/merge-upstream

…oc/merge-upstream Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack.

…oc/merge-upstream

Port 608f66f to glitch-soc Signed-off-by: Claire <[email protected]>

…oc/merge-upstream

…ight 400 icons Port 6bbcd93 to glitch-soc Signed-off-by: Claire <[email protected]>

…oc/merge-upstream

…oc/merge-upstream Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.

…oc/merge-upstream

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

… possible (mastodon#28753)

…oc/merge-upstream

… it where possible Port 01b6c83 to glitch-soc Signed-off-by: Claire <[email protected]>

…e-upstream Merge upstream changes up to 01b6c83

* Fix getting started misc column on dev --------- Co-authored-by: Claire <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…on#28760)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…28768)

…sh` specs (mastodon#28764)

Co-authored-by: GitHub Actions <[email protected]>

Co-authored-by: Claire <[email protected]>

…astodon#28778)

…oc/merge-upstream

Port 4e277f8 to glitch-soc Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>

…oc/merge-upstream Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.

Port baab58c to glitch-soc Signed-off-by: Claire <[email protected]>

Port e817fe4 to glitch-soc Signed-off-by: Claire <[email protected]>

Port 30b193b to glitch-soc Signed-off-by: Claire <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…#28789)

…don#28787)

…stodon#28781)

…r query to Instance scope (mastodon#28796)

…Block (mastodon#28803)

…n#28804)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…e-upstream Merge upstream changes up to 127503e

…oc/merge-upstream

…stodon#28812)

Co-authored-by: Claire <[email protected]>

…n#28808)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]>

Co-authored-by: GitHub Actions <[email protected]>

…e-upstream Merge upstream changes up to f866413

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…astodon#28838)

Co-authored-by: GitHub Actions <[email protected]>

…rs_synchronizations controller (mastodon#28820)

…oc/merge-upstream Conflicts: - `streaming/index.js`: Upstream significantly refactored that file, while one modified function had a different signature because of support for local-only posts. Ported upstream's change and kept the local-only support. - `yarn.lock`: Upstream added new dependencies, one of which was textually close to a glitch-soc-only dependency. Updated accordingly.

…oc/merge-upstream

Port 163db81 to glitch-soc Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>

…oc/merge-upstream

… web UI Port 9f8e3cc to glitch-soc Signed-off-by: Claire <[email protected]>

Co-authored-by: GitHub Actions <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]>

Co-authored-by: GitHub Actions <[email protected]>

…mastodon#28869)

…astodon#27792) Co-authored-by: Claire <[email protected]>

…e-upstream Merge upstream changes up to e2d9635

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…27924)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…n#28858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…28415) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…oc/merge-upstream Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.

Port 01ce9df to glitch-soc Signed-off-by: Claire <[email protected]>

…#26527)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…stodon#28892)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: GitHub Actions <[email protected]>

…cy` (mastodon#28361)

… `CLI::Maintenance` task (mastodon#28281)

Co-authored-by: Claire <[email protected]>

…cope (mastodon#28767)

…e-upstream Merge upstream changes up to 01ce9df

…oc/merge-upstream

…e-upstream Merge upstream changes up to 7a1f087

* New Crowdin translations * Fix bogus translation files --------- Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Claire <[email protected]>

…oc/merge-upstream

…malink Port SCSS changes from b19ae52 to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>

Port 5a838ce to glitch-soc Signed-off-by: Claire <[email protected]>

…e-upstream Merge upstream changes up to 3205a65

…oc/merge-upstream Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.

…e-upstream Merge upstream changes up to bf153b3

Port 3205a65 to glitch-soc Signed-off-by: Claire <[email protected]> Co-authored-by: Eugen Rochko <[email protected]>

…ch-soc#2595)

…n#29041)

…d-action Add github action workflow for manual security builds

…s/failures Configure selenium to use Chrome version 120 (mastodon#29038)

…s/security-builds-latest Fix security builds not being tagged latest

* Fix insufficient origin validation * Bump version to 4.3.0-alpha.1

testing if we need anything beyond the tex-chtml.js from the main es5 distribution,

Get nonce at render, rather than using JS Sorry the diff is unreadable, ctrl+f for "window.MathJax.config.chtml.nonce" and that's the change

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream - CVE-2024-23832 #39

Merge upstream - CVE-2024-23832 #39

Commits on Jan 12, 2024

Commits on Jan 13, 2024

Commits on Jan 14, 2024

Commits on Jan 15, 2024

Commits on Jan 16, 2024

Commits on Jan 17, 2024

Commits on Jan 18, 2024

Commits on Jan 19, 2024

Commits on Jan 21, 2024

Commits on Jan 22, 2024

Commits on Jan 23, 2024

Commits on Jan 24, 2024

Commits on Jan 25, 2024

Commits on Jan 26, 2024

Commits on Jan 27, 2024

Commits on Jan 28, 2024

Commits on Jan 29, 2024

Commits on Jan 30, 2024

Commits on Feb 1, 2024

Commits on Feb 2, 2024