Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: Join adjacent inlineText tokens #1926

Merged
merged 9 commits into from
Feb 7, 2021
Merged

fix: Join adjacent inlineText tokens #1926

merged 9 commits into from
Feb 7, 2021

Commits on Feb 4, 2021

  1. Join adjacent innerText tokens

    @calculuschild
    calculuschild committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    65b7a35 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2021

  1. Update marked.esm.js

    @calculuschild
    calculuschild committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    0ade5ac View commit details
    Browse the repository at this point in the history

  2. fix lexer unit tests

    @UziTech
    UziTech committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    72e7cc8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from UziTech/pr/1926 

    Join adjacent innerText tokens
    @calculuschild
    calculuschild authored Feb 5, 2021
    Configuration menu
    Copy the full SHA
    87f4704 View commit details
    Browse the repository at this point in the history

  4. Move merge logic for block code to Lexer

    @calculuschild
    calculuschild committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    d7bb213 View commit details
    Browse the repository at this point in the history

  5. Update lib/marked.esm.js 

    Co-authored-by: Tony Brix <tony@brix.ninja>
    @calculuschild @UziTech
    calculuschild and UziTech authored Feb 5, 2021
    Configuration menu
    Copy the full SHA
    1c5cf59 View commit details
    Browse the repository at this point in the history

  6. Update lib/marked.esm.js 

    Co-authored-by: Tony Brix <tony@brix.ninja>
    @calculuschild @UziTech
    calculuschild and UziTech authored Feb 5, 2021
    Configuration menu
    Copy the full SHA
    ead6e66 View commit details
    Browse the repository at this point in the history

  7. Update code & text signatures in Docs

    @calculuschild
    calculuschild committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    3b1130e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'joinInnerTextTokens' of https://github.com/calculuschil… 

    …d/marked into joinInnerTextTokens
    @calculuschild
    calculuschild committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    296e327 View commit details
    Browse the repository at this point in the history