Skip to content
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: v2.1.12
Choose a base ref
...
head repository: basecamp/trix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.1.13
Choose a head ref
  • 8 commits
  • 8 files changed
  • 4 contributors

Commits on Jan 13, 2025

  1. Correct a weird sentence in README.md

    @Uaitt
    Uaitt committed Jan 13, 2025
    Configuration menu
    Copy the full SHA
    cc8a76b View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2025

  1. Add test coverage for CSP-<style> integration 

    Follow-up to [#1151][]. Add unit test coverage for the
`installDefaultCSSForTagName` functions support for both `meta[content]`
and `meta[nonce]` attribute support.

[#1151]: #1151
    @seanpdoyle
    seanpdoyle committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    9ae207e View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2025

  1. Merge pull request #1199 from seanpdoyle/nonce-test-coverage 

    Add test coverage for CSP-`<style>` integration
    @jorgemanrubia
    jorgemanrubia authored Mar 5, 2025
    Configuration menu
    Copy the full SHA
    e76fe55 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1220 from Uaitt/correct-weird-sentence 

    Correct a weird sentence in README.md
    @jorgemanrubia
    jorgemanrubia authored Mar 5, 2025
    Configuration menu
    Copy the full SHA
    d8416c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2025

  1. Make Trix compatible with morphing 

    Morphing the trix editor will leave it in an unusuable state because
morphing will replace the bootstrapping elements without triggering
the connection logic.

The solution is based on adding an attribute to flag the editor as
initialized and detect when that attribute is modified.

See hotwired/turbo-rails#533 (comment)
    @jorgemanrubia
    jorgemanrubia committed Mar 7, 2025
    Configuration menu
    Copy the full SHA
    a8b0f73 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2025

  1. Remove iOS latest since it's failing on Solano 

    I have tried several things with no luck. Will fix separately.
    @jorgemanrubia
    jorgemanrubia committed Mar 10, 2025
    Configuration menu
    Copy the full SHA
    2329941 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1227 from basecamp/morphing 

    Make Trix compatible with morphing
    @jorgemanrubia
    jorgemanrubia authored Mar 10, 2025
    Configuration menu
    Copy the full SHA
    ca6de49 View commit details
    Browse the repository at this point in the history

  3. v2.1.13

    @jorgemanrubia
    jorgemanrubia committed Mar 10, 2025
    Configuration menu
    Copy the full SHA
    1e214a7 View commit details
    Browse the repository at this point in the history
Loading