5 Commits

Author SHA1 Message Date
Li0liQ
51fe09f0a3 Fixed links to storybook.js.org. 2017-06-07 22:29:17 +10: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
db3cd0b6eb FIX spelling 2017-05-27 22:10:34 +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
69b91f6e53 CHANGE folder structure && CHANGE package-names 2017-05-15 00:08:46 +02:00