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

remove extra buttons that got added in during merge conflict resolution #746

Merged
merged 10 commits into from
Dec 27, 2022
Merged

remove extra buttons that got added in during merge conflict resolution #746

merged 10 commits into from
Dec 27, 2022

Commits on Dec 27, 2022

  1. Add transitions to event items 

    pr contains demo
    @JustinStitt @jaasonw
    JustinStitt authored and jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    3463738 View commit details
    Browse the repository at this point in the history

  2. Add transitions to event items 

    pr contains demo
    @JustinStitt @jaasonw
    JustinStitt authored and jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    6617096 View commit details
    Browse the repository at this point in the history

  3. Support for non-javascript users

    @JustinStitt @jaasonw
    JustinStitt authored and jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    b254b84 View commit details
    Browse the repository at this point in the history

  4. Ran npm run all

    @EthanThatOneKid @jaasonw
    EthanThatOneKid authored and jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    d7153c2 View commit details
    Browse the repository at this point in the history

  5. fix event transitions fr

    @jaasonw
    jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    2eef12e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into event-transitions

    @jaasonw
    jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    856c8fc View commit details
    Browse the repository at this point in the history

  7. remove lockfile

    @jaasonw
    jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    55843f0 View commit details
    Browse the repository at this point in the history

  8. remove buttons that got added back in during merge conflict resolution

    @jaasonw
    jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    3921b47 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into event-transitions

    @jaasonw
    jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    cda511b View commit details
    Browse the repository at this point in the history

  10. formt

    @jaasonw
    jaasonw committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    7171cd1 View commit details
    Browse the repository at this point in the history