FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Comparing main...1.3.5 · basecamp/trix · GitHub

/ trix Public
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: basecamp/trix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
Could not load branches
Nothing to show
{{ refName }}
...
head repository: basecamp/trix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.3.5
Choose a head ref
Could not load branches
Nothing to show
{{ refName }}
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 17 files changed
  • 4 contributors

Commits on May 14, 2024

  1. Update dependencies and Ruby version

    afcapel committed May 14, 2024
    Configuration menu
    Copy the full SHA
    60620f9 View commit details
    Browse the repository at this point in the history

  2. Backport fix for CVE-2024-34341 to v1.3

    afcapel committed May 14, 2024
    Configuration menu
    Copy the full SHA
    80a4d4f View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge pull request #1153 from basecamp/GHSA-qjqp-xr96-cj99-1-3-backport 

    Backport CVE-2024-34341 fixes to v1.3
    Alberto Fernández-Capel authored May 15, 2024
    Configuration menu
    Copy the full SHA
    10e8753 View commit details
    Browse the repository at this point in the history

  2. Trix v1.3.2

    afcapel committed May 15, 2024
    Configuration menu
    Copy the full SHA
    fc2a4b9 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2024

  1. Backport Fix XSS vulnerability on paste 

    Backport fix from #1156
    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    d342fbf View commit details
    Browse the repository at this point in the history

  2. Backport XSS and mutation XSS fix to 1.3 

    Backport adding DomPurify to Trix 1.3.x.

The vendored DOMPurify was created by running the dompurify node modules through
Babel to covert to es5 syntax.
    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    6c263d2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1204 from basecamp/dom-purify-1-3 

    Dom purify 1 3
    djmb authored Dec 9, 2024
    Configuration menu
    Copy the full SHA
    d0a0fb1 View commit details
    Browse the repository at this point in the history

  4. Bump version to 1.3.3

    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    c7a30c3 View commit details
    Browse the repository at this point in the history

  5. Trix 1.3.3

    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    ab192a2 View commit details
    Browse the repository at this point in the history

  6. Update to DOMPurify 3.2.3 

    Includes latest security fixes
    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    c716cf7 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1206 from basecamp/dom-purify-3.2.3-for-1.3 

    Update to DOMPurify 3.2.3
    djmb authored Dec 9, 2024
    Configuration menu
    Copy the full SHA
    8b16012 View commit details
    Browse the repository at this point in the history

  8. Correct DomPurify version

    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    9dcbd93 View commit details
    Browse the repository at this point in the history

  9. Bump version to 1.3.4

    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    f6abd5d View commit details
    Browse the repository at this point in the history

  10. Trix 1.3.4

    djmb committed Dec 9, 2024
    Configuration menu
    Copy the full SHA
    f7f9405 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2024

  1. Remove dompurify 

    To avoid issues with integrating DOMPurify we'll remove it from
the 1.3 branch. Instead update the HTMLSanitizer to remove the
embed and math elements to fix the reported XSS attacks.
    djmb committed Dec 11, 2024
    Configuration menu
    Copy the full SHA
    0c6fc35 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1211 from basecamp/remove-dompurify 

    Remove dompurify
    djmb authored Dec 11, 2024
    Configuration menu
    Copy the full SHA
    48358ae View commit details
    Browse the repository at this point in the history

  3. Bump to v1.3.5

    djmb committed Dec 11, 2024
    Configuration menu
    Copy the full SHA
    b77200f View commit details
    Browse the repository at this point in the history

  4. Trix 1.3.5

    djmb committed Dec 11, 2024
    Configuration menu
    Copy the full SHA
    564884a View commit details
    Browse the repository at this point in the history
Loading
Back | FazBrowse Home | New Git URL