77 Commits

Author SHA1 Message Date
Michael Shilman
5642b7df6f v3.2.0-alpha.5 2017-07-02 10:22:53 -07:00
Alexandre BODIN
929eb389be Merge branch 'master' of github.com:storybooks/storybook into add-app-vue 2017-07-01 10:39:29 +02:00
Michael Shilman
d8f22cdb85 v3.1.6 2017-06-26 16:32:38 +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
928ea5e1c1 Ensure we add the correct version of react-dom
We need to use an equal version to the `react` version the app is using.

#1284
2017-06-23 14:07:16 +10:00
Michael Shilman
b20e6f5091 Remove package-lock.json 2017-06-23 01:03:45 +10:00
Michael Shilman
a620cfed2a v3.1.5 2017-06-22 16:36:43 +10:00
Michael Shilman
f496deba0b Create @storybook/react/demo exports 2017-06-22 15:05:19 +10:00
Michael Shilman
e5041fa06a Add package-lock.json
Per discussion with @tmeasday 😉
2017-06-22 11:17:16 +10:00
Alexandre BODIN
654be24417 bumping version 2017-06-20 17:38:43 +02:00
Alexandre BODIN
8145ac3414 Merge branch 'master' into add-app-vue 2017-06-18 18:00:46 +02:00
Michael Shilman
cd297c33e1 Export demo components from @storybook/react
We do this so we can have a uniform way to do this across frameworks
(e.g. RN, vue)
2017-06-17 22:50:44 +10:00
kazuya kawaguchi
3e12ba1f39
👕 refactor: tweak style guide
NOTE:
  Vue.js standard style
2017-06-17 14:05:56 +09:00
kazuya kawaguchi
82d44e8188
Merge branch 'add-app-vue' into getstorybook-support-for-vue 2017-06-16 22:48:18 +09:00
kazuya kawaguchi
9bd55bc9a4
🆙 update(cli): stories creating for vue 2017-06-16 22:47:24 +09:00
Norbert de Langen
84dca9ab16 Merge branch 'master' into add-parser-option-getstorybook 2017-06-16 14:39:53 +02:00
Norbert de Langen
59d4cc2b15 Merge branch 'master' into add-lib-components
# Conflicts:
#	examples/cra-kitchen-sink/src/stories/Button.js
#	examples/cra-kitchen-sink/src/stories/Welcome.js
2017-06-16 08:49:59 +02:00
kazuya kawaguchi
ff5686143f
🆙 update(cli): getstorybook vue supporting 2017-06-16 03:19:56 +09:00
Augustin Le Fèvre
d3f0a9de26 Add --parser option to getstorybook 2017-06-15 15:51:09 +02:00
Michael Shilman
f64f5b7482 v3.1.4 2017-06-15 22:08:24 +10:00
kazuya kawaguchi
b41fda4088
🚧 wip: add story template for vue app project 2017-06-15 13:08:54 +09:00
Michael Shilman
07db118e0a Fix typo 2017-06-15 08:04:21 +10:00
Michael Shilman
222ca3c0e3 Fix bug in RN gestorybook
- replace APP_NAME in the correct file
- add a warning if APP_NAME cannot be found
2017-06-15 07:37:57 +10:00
Norbert de Langen
294923bac3 Use new common demo-components 2017-06-12 18:09:37 +02:00
Michael Shilman
c289d15bc7 v3.1.2 2017-06-09 23:53:03 +12:00
Michael Shilman
ea616369eb v3.1.1 2017-06-09 23:31:52 +12:00
Michael Shilman
56052112c3 v3.1.0 2017-06-09 22:52:20 +12:00
Li0liQ
51fe09f0a3 Fixed links to storybook.js.org. 2017-06-07 22:29:17 +10:00
Michael Shilman
e2cd69b233 Fix linting errors in RN get storybook template 2017-06-07 22:13:24 +12:00
Michael Shilman
2da0c31467 Merge branch 'master' into 1200-fix-RN-getstorybook 2017-06-07 21:49:16 +12: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
Tom Coleman
782a6e34ce Revert removing index.[ios|android].js.
Reverting from 3e2673b962 -- this broke RN-storybook for `getstorybook` users.

See https://github.com/storybooks/storybook/issues/1200
2017-06-06 21:35:38 +10:00
Norbert de Langen
7db3cc0832 ADD linting on some rc files, CHANGe to js rc for remark 2017-06-06 13:19:20 +02:00
Michael Shilman
5ec0dad1a3 Updated repository URL to address broken npm images 2017-06-06 01:48:54 +12:00
Michael Shilman
77e167599e v3.0.1 2017-06-06 00:58:57 +12:00
Michael Shilman
0eba277fa4 Fix typo in CLI project detection 2017-06-05 23:41:37 +12: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
99e95a1e7e FIX linting 2017-05-31 08:53:19 +02:00
Norbert de Langen
9d38bf8bd3 Mostly re-applied changes 2017-05-31 08:29:09 +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
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
Tom Coleman
104ca5143e Added an upgrade mode to getstorybook
This allows us to go from 2.x -> 3.0

A future version of storybook may include a version # that allows us to be more subtle, but we don't need it yet.
2017-05-30 10:22:16 +10: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
Norbert de Langen
67d902f237 FIX listing for markdown 2017-05-26 11:21:46 +02:00