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(TS): color merge conflict #8133

Merged
merged 18 commits into from
Aug 7, 2022
Merged

fix(TS): color merge conflict #8133

merged 18 commits into from
Aug 7, 2022

Commits on Aug 4, 2022

  1. misc export patch

    @ShaMan123
    ShaMan123 committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    78df63c View commit details
    Browse the repository at this point in the history

  2. color

    @ShaMan123
    ShaMan123 committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    ba7f214 View commit details
    Browse the repository at this point in the history

  3. imports

    @ShaMan123
    ShaMan123 committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    9e79439 View commit details
    Browse the repository at this point in the history

  4. index

    @ShaMan123
    ShaMan123 committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    1fcaacb View commit details
    Browse the repository at this point in the history

  5. es6

    @ShaMan123
    ShaMan123 committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    4bf9205 View commit details
    Browse the repository at this point in the history

  6. fix conflict

    @asturur
    asturur committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    c6b6a5f View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Revert "fix conflict" 

    This reverts commit c6b6a5f, reversing
changes made to 4bf9205.
    @ShaMan123
    ShaMan123 committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    35fc032 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2022

  1. Merge branch 'master' into ts-color

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    9f54eae View commit details
    Browse the repository at this point in the history

  2. es6

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    b79375c View commit details
    Browse the repository at this point in the history

  3. fix attribution link

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    c8fee4a View commit details
    Browse the repository at this point in the history

  4. refactor

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    8e1120c View commit details
    Browse the repository at this point in the history

  5. rename

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    0a7b0ca View commit details
    Browse the repository at this point in the history

  6. Update color.class.ts

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    7d313fe View commit details
    Browse the repository at this point in the history

  7. types

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    8edda04 View commit details
    Browse the repository at this point in the history

  8. Update color.class.ts

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    06eb252 View commit details
    Browse the repository at this point in the history

  9. Update color.class.ts

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    4587b31 View commit details
    Browse the repository at this point in the history

  10. docs

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    1f1a45e View commit details
    Browse the repository at this point in the history

  11. JSDOC

    @ShaMan123
    ShaMan123 committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    ef4859d View commit details
    Browse the repository at this point in the history