122 Commits

Author SHA1 Message Date
Evgeniy Zaitsev
70f7b51f61 Fix build and lint after merge 2017-06-07 11:58:13 +03:00
Evgeniy Zaitsev
613eeb8153 Merge branch 'master' into addon-info-new-options 2017-06-07 10:32:56 +03:00
Norbert de Langen
8216f66b04 REMOVE example from code & MOVE to cra-storybook example 2017-06-07 00:51:15 +02:00
Norbert de Langen
925c4d704d Merge branch 'master' into add-events-addon 2017-06-06 22:29:30 +02:00
Norbert de Langen
432c371b65 Merge branch 'master' into eslint-strict 2017-06-06 22:04:00 +02:00
Norbert de Langen
afc56fe37e Merge branch 'master' into patch-1 2017-06-06 21:43:30 +02:00
Eli Sherer
8f1bf37957 fix bug marksy initialized with mtrcConf intead of marksyConf 2017-06-06 22:23:48 +03:00
Dmitry Naumov
d5753e2dc8 Update marksy dependecy due broken 1.1.0 version 2017-06-06 21:42:34 +03:00
Norbert de Langen
28a4b32323 CHANGE all package.jsons so they are uniformly sorted 2017-06-06 17:46:55 +02:00
Norbert de Langen
7765c4534b Merge branch 'master' into eslint-strict
# Conflicts:
#	app/react-native/src/manager/components/PreviewHelp.js
2017-06-06 17:43:50 +02:00
Norbert de Langen
921daab915 ADD eslint config for .json files && FIX linting 2017-06-06 17:40:40 +02:00
Norbert de Langen
e4e639e0c2 FIX linting 2017-06-06 16:34:36 +02:00
Norbert de Langen
d75bcb896f FIX linting 2017-06-06 15:55:44 +02:00
Norbert de Langen
dfabb185ec FIX linting 2017-06-06 10:15:25 +02:00
Michael Shilman
5ec0dad1a3 Updated repository URL to address broken npm images 2017-06-06 01:48:54 +12:00
Norbert de Langen
a1042139cf Merge branch 'master' into addon-info-new-options 2017-06-05 14:59:59 +02:00
Michael Shilman
77e167599e v3.0.1 2017-06-06 00:58:57 +12:00
Evgeniy Zaitsev
8b98172b33 Merge branch 'master' into addon-info-new-options 2017-06-05 15:55:48 +03:00
Norbert de Langen
baecbf7970 FIX after merge 2017-06-05 11:45:04 +02:00
Norbert de Langen
e40ef62aa5 Merge branch 'master' into eslint-strict 2017-06-05 11:33:01 +02:00
Tom Coleman
f000df0ca6 Added error message for addon-options
See https://github.com/storybooks/storybook/issues/1192 and https://github.com/storybooks/storybook/issues/815
2017-06-05 15:47:33 +10:00
Dustin Kane
31b8e9efca Updating package.json to use the new dependency 2017-06-04 20:33:40 -05:00
Dustin Kane
f9d1a145da Issue 1114: Replacing use of deprecated markdown-to-react-components in addon-info to use marksy 2017-06-04 19:16:43 -05:00
Norbert de Langen
8fef4bb2d8 FIX linting 2017-06-05 00:58:23 +02:00
Norbert de Langen
35f20df122 FIX actions addon register
ADD dev script
RENAME addon-namespaces
CHANGE lint:markdown to lint:md
2017-06-05 00:57:20 +02:00
Norbert de Langen
81b4cb85dc FIX unit tests snapshots && FIX linting 2017-06-03 23:03:19 +02:00
Norbert de Langen
47eaac103d FIX linting 2017-06-03 21:23:31 +02:00
Norbert de Langen
da961dc508 FIX linting 2017-06-03 21:06:48 +02:00
Evgeniy Zaitsev
711009f563 Merge branch 'master' into add-events-addon 2017-06-02 13:51:42 +03:00
Norbert de Langen
49bb8ea829 Merge branch 'master' into eslint-strict 2017-06-01 07:53:54 +02:00
Evgeniy Zaitsev
24235769d0 Merge branch 'master' into addon-info-new-options 2017-05-31 13:06:11 +03:00
Evgeniy Zaitsev
6be7f418f9 fix stories 2017-05-31 13:05:54 +03:00
Evgeniy Zaitsev
c46d701bb1 replace context with props 2017-05-31 13:05:43 +03:00
Norbert de Langen
9d38bf8bd3 Mostly re-applied changes 2017-05-31 08:29:09 +02:00
Yang Li
c5bc6d2344 Update README.md 2017-05-31 14:25:12 +08: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
Gytis Vinclovas
78e50155b9 Fixed withKnobs definition. 2017-05-30 20:33:12 +03:00
Evgeniy Zaitsev
c6ebe9a4a0 Merge branch 'master' into addon-info-new-options 2017-05-30 17:10:51 +03:00
Evgeniy Zaitsev
ab611bdc6a add new options to info addon 2017-05-30 17:10:08 +03:00
Michael Shilman
af41dd1c48 v3.0.0 2017-05-31 01:39:35 +12:00
Michael Shilman
470c22f92a v3.0.0-rc.3 2017-05-30 20:46:11 +12:00
Joscha Feth
d37adc791c Add Typescript definitions 2017-05-30 11:42:37 +10:00
Joscha Feth
034476a8bc add storybook-addon-links.d.ts 2017-05-30 11:41:22 +10:00
Norbert de Langen
3da805f273 Update README.md 2017-05-28 17:44:52 +02:00
tomracia
8b9e7302ea Use strict equality to distinguish 0 from an empty string 2017-05-28 15:16:47 +02:00
Norbert de Langen
db3cd0b6eb FIX spelling 2017-05-27 22:10:34 +02:00
Norbert de Langen
4a2bc9333a v3.0.0-rc.2 2017-05-27 13:46:50 +02:00
Evgeniy Zaitsev
24fb4502d6 FIX eslint 2017-05-26 14:43:18 +03:00
Evgeniy Zaitsev
6fbd703e93 Merge remote-tracking branch 'origin/add-events-addon' into add-events-addon 2017-05-26 14:28:53 +03:00
Evgeniy Zaitsev
28e5bbd641 update events addon 2017-05-26 14:28:18 +03:00