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

Add marko support to storybooksJS #3504

Merged
merged 36 commits into from
May 7, 2018
Merged

Add marko support to storybooksJS #3504

merged 36 commits into from
May 7, 2018

Commits on Apr 7, 2018

  1. marko branch that works...

    Neville Mehta committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    51d725a View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. a marko template actually loadsgit add -A

    Neville Mehta committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    6e6bc01 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2018

  1. add components in marko-cli

    Neville Mehta committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    8c5549e View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2018

  1. make knobs+actions work

    Neville Mehta committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    3807654 View commit details
    Browse the repository at this point in the history

  2. Resolved merge conflict

    Neville Mehta committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    bb20d63 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. fix app/marko to point to 4.0.0-alpha.4, remove stuff thats not neede… 

    …d, and some refactor
    Neville Mehta committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    d44022f View commit details
    Browse the repository at this point in the history

  2. remove unused references in files

    Neville Mehta committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    7a09fd3 View commit details
    Browse the repository at this point in the history

  3. fix lint errors for marko app

    Neville Mehta committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    26d71a0 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2018

  1. add postcss-loader options in js, some refactoring of stories

    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    d09c83f View commit details
    Browse the repository at this point in the history

  2. review comments, use new showError framework

    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    d99b440 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:storybooks/storybook into addmark… 

    …osupport
    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    7a34592 View commit details
    Browse the repository at this point in the history

  4. fix error message for marko component error

    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    621c62f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into addmarkosupport

    @nm123github
    nm123github committed May 1, 2018
    Configuration menu
    Copy the full SHA
    35b5e9b View commit details
    Browse the repository at this point in the history

  6. add info in ADDONS_SUPPORT.md

    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    727e14d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'addmarkosupport' of github.com:nm123github/storybook in… 

    …to addmarkosupport
    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    c85a9d7 View commit details
    Browse the repository at this point in the history

  8. update yarn

    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    b0dd82c View commit details
    Browse the repository at this point in the history

  9. update app/marko version.

    Neville Mehta committed May 1, 2018
    Configuration menu
    Copy the full SHA
    4e7018d View commit details
    Browse the repository at this point in the history

Commits on May 2, 2018

  1. Fix the import of external md files for marko

    Neville Mehta committed May 2, 2018
    Configuration menu
    Copy the full SHA
    de43701 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:storybooks/storybook into addmark… 

    …osupport
    Neville Mehta committed May 2, 2018
    Configuration menu
    Copy the full SHA
    04bdf98 View commit details
    Browse the repository at this point in the history

  3. update logo and gif for marko app

    Neville Mehta committed May 2, 2018
    Configuration menu
    Copy the full SHA
    2f4a45d View commit details
    Browse the repository at this point in the history

  4. Fix render order in preview for marko

    Neville Mehta committed May 2, 2018
    Configuration menu
    Copy the full SHA
    732c6d4 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2018

  1. Configure netlify

    @Hypnosphi
    Hypnosphi committed May 5, 2018
    Configuration menu
    Copy the full SHA
    d2859d2 View commit details
    Browse the repository at this point in the history

  2. Configure hierarchy separator

    @Hypnosphi
    Hypnosphi committed May 5, 2018
    Configuration menu
    Copy the full SHA
    067caf8 View commit details
    Browse the repository at this point in the history

  3. Add CLI template

    @Hypnosphi
    Hypnosphi committed May 5, 2018
    Configuration menu
    Copy the full SHA
    f00a369 View commit details
    Browse the repository at this point in the history

  4. CLI: remove unused stuff

    @Hypnosphi
    Hypnosphi committed May 5, 2018
    Configuration menu
    Copy the full SHA
    46de88c View commit details
    Browse the repository at this point in the history

  5. register options addon

    @Hypnosphi
    Hypnosphi committed May 5, 2018
    Configuration menu
    Copy the full SHA
    1acf55f View commit details
    Browse the repository at this point in the history

  6. Add slow start guide

    @Hypnosphi
    Hypnosphi committed May 5, 2018
    Configuration menu
    Copy the full SHA
    d92851f View commit details
    Browse the repository at this point in the history

  7. Add live examples

    @Hypnosphi
    Hypnosphi committed May 5, 2018
    Configuration menu
    Copy the full SHA
    cb6f795 View commit details
    Browse the repository at this point in the history

  8. remove No Preview story

    Neville Mehta committed May 5, 2018
    Configuration menu
    Copy the full SHA
    24bdcfc View commit details
    Browse the repository at this point in the history

Commits on May 6, 2018

  1. some refactoring and review comments..

    Neville Mehta committed May 6, 2018
    Configuration menu
    Copy the full SHA
    ddb7bed View commit details
    Browse the repository at this point in the history

  2. add storysource addon

    Neville Mehta committed May 6, 2018
    Configuration menu
    Copy the full SHA
    e9df6b6 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. Merge branch 'master' of github.com:storybooks/storybook into addmark… 

    …osupport
    Neville Mehta committed May 7, 2018
    Configuration menu
    Copy the full SHA
    d8e0673 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:storybooks/storybook into addmark… 

    …osupport
    Neville Mehta committed May 7, 2018
    Configuration menu
    Copy the full SHA
    554f4f1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into addmarkosupport 

    # Conflicts:
#	ADDONS_SUPPORT.md
#	yarn.lock
    @Hypnosphi
    Hypnosphi committed May 7, 2018
    Configuration menu
    Copy the full SHA
    d752981 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'addmarkosupport' of github.com:nm123github/storybook in… 

    …to addmarkosupport
    Neville Mehta committed May 7, 2018
    Configuration menu
    Copy the full SHA
    55750a1 View commit details
    Browse the repository at this point in the history

  5. Re-generate lockfile

    @Hypnosphi
    Hypnosphi committed May 7, 2018
    Configuration menu
    Copy the full SHA
    d25429a View commit details
    Browse the repository at this point in the history