3403 Commits

Author SHA1 Message Date
Norbert de Langen
49bb8ea829 Merge branch 'master' into eslint-strict 2017-06-01 07:53:54 +02:00
Norbert de Langen
a61e0bc0d5 UPDATE cra-storybook example to latest 2017-06-01 07:16:41 +02:00
Norbert de Langen
a5e7ad5e09 Merge pull request #1173 from Haroenv/patch-1
Fix capitalisation in Algolia example
2017-05-31 21:55:55 +02:00
Haroen Viaene
2cd7ae116e fix link 2017-05-31 21:43:42 +02:00
Haroen Viaene
691589c77f Fix capitalisation in algolia example
>Hey, thanks for the mention! according to our brand guidelines, InstantSearch is with two capital letters though, so this pr fixed that

see https://github.com/storybooks/storybooks.github.io/pull/69
2017-05-31 21:35:08 +02:00
Norbert de Langen
4f79846dbc Merge pull request #1172 from storybooks/node-8
FIX build on travis for node 8
2017-05-31 21:27:43 +02:00
Norbert de Langen
6e36fae268 FIX linting 2017-05-31 21:10:05 +02:00
Norbert de Langen
de14a76f7a FIX build on travis for node 8 2017-05-31 18:33:09 +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
Michael Shilman
5f6cecdfbc Merge pull request #1168 from yangli1990/patch-1
Update README.md
2017-05-31 18:27:09 +12: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
Norbert de Langen
fceded04b9 Merge pull request #1167 from Zaccc123/master
Fix broken link for [addons] in README
2017-05-31 06:45:20 +02:00
Zac Kwan
31b42b57ca Fix broken link for [addons] in README 2017-05-31 12:06:29 +08:00
Norbert de Langen
585beccafd Merge pull request #1156 from alvaropinot/fix/babel-config
Fix incorrect babel config file reading
2017-05-31 00:42:51 +02:00
Norbert de Langen
3a8e2d36eb Merge branch 'master' into fix/babel-config 2017-05-31 00:31:16 +02:00
Michael Shilman
13a7edb973 Merge pull request #1149 from storybooks/1100-logo-refresh
Logo refresh
2017-05-31 10:31:06 +12:00
Norbert de Langen
8899be641b Merge branch 'master' into fix/babel-config 2017-05-31 00:30:51 +02:00
Michael Shilman
4deb54d68e Merge branch 'master' into 1100-logo-refresh 2017-05-31 10:30:51 +12:00
Michael Shilman
fbb6ca1f4e Merge pull request #1165 from mnicole/master
fix addon broken links in documentation
2017-05-31 09:42:50 +12:00
michele
a862a8110e fix addon broken links in documentation 2017-05-30 14:40:00 -07:00
Norbert de Langen
388ce3576d Merge pull request #1161 from ArtyomResh/fix/docs
fix(cli-options/index.md): expand commands descriptions
2017-05-30 22:37:32 +02:00
Norbert de Langen
b36a02bed0 Merge branch 'master' into fix/docs 2017-05-30 22:26:57 +02:00
Norbert de Langen
472bb081db travis CI test on node 7 2017-05-30 22:10:49 +02:00
Norbert de Langen
3954befbf1 Merge branch 'master' into fix/docs 2017-05-30 20:54:05 +02:00
Norbert de Langen
64f33befe9 Merge pull request #1164 from Gongreg/master
Fixed withKnobs definition.
2017-05-30 20:53:01 +02:00
Gytis Vinclovas
78e50155b9 Fixed withKnobs definition. 2017-05-30 20:33:12 +03:00
ArtyomResh
2f3bd5719a fix(cli-options/index.md): expand comands descriptions 2017-05-30 20:08:31 +03:00
Michael Shilman
de0e0a172e Merge pull request #1158 from chasenlehara/patch-1
Fix typo in codemod readme
2017-05-31 02:54:49 +12:00
Chasen Le Hara
25fc89b12d Fix typo in codemod readme 2017-05-30 07:43:45 -07:00
Michael Shilman
af41dd1c48 v3.0.0 v3.0.0 2017-05-31 01:39:35 +12:00
Michael Shilman
62829950a5 vundefined 2017-05-31 01:21:35 +12:00
Michael Shilman
b004bc5066 Update CHANGELOG for 3.0.0 2017-05-31 01:05:43 +12:00
Alvaro Pinot
e28bf2593b FIX babel_config plugin reading and creation. 2017-05-30 15:27:04 +04:00
Alvaro Pinot
a0f0d04ecc TEST babel_config plugins creation. 2017-05-30 15:27:00 +04:00
Michael Shilman
470c22f92a v3.0.0-rc.3 v3.0.0-rc.3 2017-05-30 20:46:11 +12:00
Michael Shilman
7ac299fac3 Merge pull request #1146 from storybooks/cli-upgrade-mode
Added an upgrade mode to getstorybook
2017-05-30 18:23:16 +12:00
Norbert de Langen
8e955b1da7 Merge pull request #1154 from joscha/patch-1
Add typings for links add-on
2017-05-30 07:40:50 +02:00
Tom Coleman
b3c47e38a8 Added instructions to migrate 2017-05-30 15:18:06 +10: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
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
Michael Shilman
3550225a2c Update storybook config to webpack2 2017-05-29 22:49:23 +12:00
Michael Shilman
0367cf29cd Update logos to v3 design 2017-05-29 22:48:58 +12:00
Norbert de Langen
fe882f94db Update index.md 2017-05-28 17:48:07 +02:00
Norbert de Langen
3da805f273 Update README.md 2017-05-28 17:44:52 +02:00
Michael Shilman
0b48659adf Merge pull request #1144 from raciat/strict-equal-action-log
Use strict equality in action logger
2017-05-28 23:37:42 +10:00
Michael Shilman
641a30dc50 Merge pull request #1140 from storybooks/1047-update-release-notes
Updated changelog with 3.0 release notes
2017-05-28 23:18:24 +10:00
Michael Shilman
997130f043 Merge branch 'master' into 1047-update-release-notes 2017-05-28 23:17:54 +10:00