13 Commits

Author SHA1 Message Date
Michael Shilman
1c59065b39 Merge branch 'master' into release/3.2
# Conflicts:
#	addons/actions/package.json
#	addons/knobs/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	examples/cra-kitchen-sink/package.json
#	lerna.json
#	lib/ui/src/modules/ui/components/layout/index.js
2017-07-14 10:40:54 -07:00
Martin Rädlinger
6896df3408 refine docs about loading stories dynamically for react-native 2017-07-06 11:29:34 +02:00
Alexandre BODIN
929eb389be Merge branch 'master' of github.com:storybooks/storybook into add-app-vue 2017-07-01 10:39:29 +02:00
Tom Coleman
59507770fa Add a FAQ entry for shared config with next 2017-06-30 13:12:11 +10:00
Michael Shilman
cc4abb1b98 Linting fixes 2017-06-26 16:06:30 +10:00
Norbert de Langen
96031cd552 Merge branch 'master' into add-app-vue
# Conflicts:
#	.gitignore
#	addons/knobs/package.json
#	addons/notes/package.json
#	lib/cli/package.json
2017-06-23 13:38:36 +02:00
Tom Coleman
3a27e214d2 Note about common next.js error 2017-06-22 14:58:06 +10:00
kazuya kawaguchi
2e3170d8aa
📝 docs: update vue guide 2017-06-18 02:57:53 +09:00
Norbert de Langen
19dcfd961d Change docs to contains Vue info 2017-06-16 17:17:54 +02:00
Norbert de Langen
6c83d97388 ADD eslint config for examples inside markdown
FIX linting
2017-06-06 08:20:11 +02:00
Norbert de Langen
a55a776445 FIX codemod && ADD migration.md && ADD story shots to addon gallery 2017-05-27 13:08:42 +02:00
Norbert de Langen
d0ea916638 IMPROVE docs 2017-05-26 19:18:41 +02:00
Norbert de Langen
4a5ed501c7 MOVE too deeply nested documentation 2017-05-26 17:43:36 +02:00