12 Commits

Author SHA1 Message Date
Michael Shilman
f496deba0b Create @storybook/react/demo exports 2017-06-22 15:05:19 +10:00
Michael Shilman
600b9bd79c Move demo components from @storybook/components to @storybook/react 2017-06-17 23:49:04 +10:00
Norbert de Langen
294923bac3 Use new common demo-components 2017-06-12 18:09:37 +02:00
Norbert de Langen
e4e639e0c2 FIX linting 2017-06-06 16:34:36 +02:00
Norbert de Langen
8fef4bb2d8 FIX linting 2017-06-05 00:58:23 +02:00
Norbert de Langen
da961dc508 FIX linting 2017-06-03 21:06:48 +02:00
Norbert de Langen
af1b0c11d2 Merge branch 'master' into eslint-strict
# Conflicts:
#	.eslintignore
#	.travis.yml
#	addons/actions/src/containers/ActionLogger/index.js
#	addons/centered/package.json
#	addons/graphql/package.json
#	addons/info/src/components/PropTable.js
#	addons/info/src/components/Props.js
#	addons/knobs/package.json
#	addons/knobs/src/components/Panel.js
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/notes/src/register.js
#	addons/storyshots/package.json
#	addons/storyshots/src/index.js
#	app/react-native/package.json
#	app/react/package.json
#	examples/cra-storybook/package.json
#	examples/cra-storybook/src/stories/Welcome.js
#	examples/test-cra/src/stories/Button.js
#	examples/test-cra/src/stories/Welcome.js
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/cli/bin/generate.js
#	lib/cli/generators/METEOR/index.js
#	lib/cli/generators/REACT/index.js
#	lib/cli/generators/REACT/template/stories/index.js
#	lib/cli/generators/REACT_NATIVE/index.js
#	lib/cli/generators/REACT_SCRIPTS/index.js
#	lib/cli/generators/REACT_SCRIPTS/template/src/stories/Welcome.js
#	lib/cli/generators/WEBPACK_REACT/index.js
#	lib/cli/lib/helpers.js
#	lib/cli/package.json
#	package.json
2017-05-31 07:45:04 +02:00
Norbert de Langen
a593145cd0 FIX a few things 2017-05-23 20:56:54 +02:00
Norbert de Langen
24544af38d FIX linting 2017-05-19 00:21:13 +02:00
Norbert de Langen
22a92882b4 FIX linting 2017-05-18 22:40:11 +02:00
Norbert de Langen
09747c667b Merge branch 'master' into eslint-strict
# Conflicts:
#	addons/centered/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/.storybook/config.js
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/notes/src/register.js
#	addons/options/src/manager/index.js
#	addons/storyshots/src/index.js
#	addons/storyshots/stories/required_with_context/Button.stories.js
#	addons/storyshots/stories/required_with_context/Welcome.js
#	app/react-native/package.json
#	app/react-native/src/manager/index.js
#	lib/channel-postmessage/package.json
#	lib/channel-postmessage/src/index.js
#	lib/channel-websocket/package.json
#	lib/channel-websocket/src/index.js
#	lib/cli/generators/METEOR/index.js
#	lib/cli/generators/REACT/template/stories/Welcome.js
#	lib/cli/generators/REACT_SCRIPTS/index.js
#	lib/cli/generators/WEBPACK_REACT/template/stories/Welcome.js
#	packages/react-storybook/src/server/track_usage.js
#	packages/storybook-ui/src/modules/ui/components/layout/usplit.js
#	scripts/prepublish.js
2017-05-17 23:41:09 +02:00
Norbert de Langen
33197654ad MOVE & RENAME and storyshots && CHANGE “React Storybook” > “Storybook” 2017-05-17 09:04:22 +02:00