Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
51d725a
marko branch that works...
Apr 7, 2018
6e6bc01
a marko template actually loadsgit add -A
Apr 12, 2018
8c5549e
add components in marko-cli
Apr 16, 2018
3807654
make knobs+actions work
Apr 28, 2018
bb20d63
Resolved merge conflict
Apr 28, 2018
d44022f
fix app/marko to point to 4.0.0-alpha.4, remove stuff thats not neede…
Apr 30, 2018
7a09fd3
remove unused references in files
Apr 30, 2018
26d71a0
fix lint errors for marko app
Apr 30, 2018
d09c83f
add postcss-loader options in js, some refactoring of stories
May 1, 2018
d99b440
review comments, use new showError framework
May 1, 2018
7a34592
Merge branch 'master' of github.com:storybooks/storybook into addmark…
May 1, 2018
621c62f
fix error message for marko component error
May 1, 2018
35b5e9b
Merge branch 'master' into addmarkosupport
nm123github May 1, 2018
727e14d
add info in ADDONS_SUPPORT.md
May 1, 2018
c85a9d7
Merge branch 'addmarkosupport' of github.com:nm123github/storybook in…
May 1, 2018
b0dd82c
update yarn
May 1, 2018
4e7018d
update app/marko version.
May 1, 2018
de43701
Fix the import of external md files for marko
May 2, 2018
04bdf98
Merge branch 'master' of github.com:storybooks/storybook into addmark…
May 2, 2018
2f4a45d
update logo and gif for marko app
May 2, 2018
732c6d4
Fix render order in preview for marko
May 2, 2018
d2859d2
Configure netlify
Hypnosphi May 5, 2018
067caf8
Configure hierarchy separator
Hypnosphi May 5, 2018
f00a369
Add CLI template
Hypnosphi May 5, 2018
46de88c
CLI: remove unused stuff
Hypnosphi May 5, 2018
1acf55f
register options addon
Hypnosphi May 5, 2018
d92851f
Add slow start guide
Hypnosphi May 5, 2018
cb6f795
Add live examples
Hypnosphi May 5, 2018
24bdcfc
remove No Preview story
May 5, 2018
ddb7bed
some refactoring and review comments..
May 6, 2018
e9df6b6
add storysource addon
May 6, 2018
d8e0673
Merge branch 'master' of github.com:storybooks/storybook into addmark…
May 7, 2018
554f4f1
Merge branch 'master' of github.com:storybooks/storybook into addmark…
May 7, 2018
d752981
Merge remote-tracking branch 'origin/master' into addmarkosupport
Hypnosphi May 7, 2018
55750a1
Merge branch 'addmarkosupport' of github.com:nm123github/storybook in…
May 7, 2018
d25429a
Re-generate lockfile
Hypnosphi May 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add live examples
  • Loading branch information
Hypnosphi committed May 5, 2018
commit cb6f795252be668d72e77b9583ba425fc4d7ac1b
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqo
- [Angular](app/angular)
- [Polymer](app/polymer) <sup>release candidate</sup>
- [Mithril](app/mithril) <sup>alpha</sup>
- [Marko](app/marko) <sup>alpha</sup>

### Sub Projects

Expand Down Expand Up @@ -110,6 +111,7 @@ See [Addon / Framework Support Table](ADDONS_SUPPORT.md)
- [Angular](https://storybooks-angular.netlify.com/)
- [Polymer](https://storybooks-polymer.netlify.com/)
- [Mithril](https://storybooks-mithril.netlify.com/)
- [Marko](https://storybooks-marko.netlify.com/)

### 3.4
- [React Official](https://release-3-4--storybooks-official.netlify.com)
Expand Down
1 change: 1 addition & 0 deletions docs/src/pages/basics/live-examples/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ title: 'Live Examples'
- [Angular](https://storybooks-angular.netlify.com/)
- [Polymer](https://storybooks-polymer.netlify.com/)
- [Mithril](https://storybooks-mithril.netlify.com/)
- [Marko](https://storybooks-marko.netlify.com/)

### 3.4
- [React Official](https://release-3-4--storybooks-official.netlify.com)
Expand Down