3945 Commits

Author SHA1 Message Date
Michael Shilman
1797bbc6ba Add notes on our release process
Based on this gist:
https://gist.github.com/shilman/7993bc0c74974ef1ace7c4f96900554c
2017-06-23 13:54:28 +10:00
Marc Fallows
d8fb794362 Use uuid for action IDs instead of Math.random (fixes #1109) 2017-06-23 13:39:00 +10:00
Joscha Feth
dcae32f9d6 Merge branch 'master' into joscha/remove-addon-knobs-types 2017-06-23 01:28:47 +02:00
Joscha Feth
f4b3df3057 remove typings for @storybook/addon-notes, references https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17409 2017-06-23 01:26:20 +02:00
Joscha Feth
64e9c1edb8 remove typings for @storybook/addon-options, references https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17408 2017-06-23 01:11:09 +02:00
Joscha Feth
e9a2ec81ea remove typings for @storybook/addon-links, references https://github.com/DefinitelyTyped/DefinitelyTyped/issues/17406 2017-06-23 00:55:51 +02:00
Michael Shilman
598999308b Merge branch 'master' into rn-storybook-websocket-url 2017-06-23 08:04:35 +10:00
Michael Shilman
bf6faea25e Merge pull request #1338 from storybooks/remove-package-lock
Remove package lock
2017-06-23 08:04:11 +10:00
Duncan Beevers
549e55e05b
Addon Info: Omit empty inline info header 2017-06-22 10:55:16 -07:00
Joscha Feth
56f96a6ccb remove typings for @storybook/addon-knobs, references https://github.com/DefinitelyTyped/DefinitelyTyped/issues/17399 2017-06-22 19:35:04 +02:00
Michael Shilman
cf4f2205c1 Merge branch 'refs/heads/remove-package-lock' into rn-storybook-websocket-url 2017-06-23 01:24:39 +10:00
Michael Shilman
7787b9bf3c Ignore package-lock.json (for now) 2017-06-23 01:04:59 +10:00
Michael Shilman
b20e6f5091 Remove package-lock.json 2017-06-23 01:03:45 +10:00
Gytis Vinclovas
562e608538 websockets (ws) had removed socket.upgradeReq property, so instead we use req now. 2017-06-22 14:30:24 +03:00
igor
6bfed5d7bd Merge remote-tracking branch 'origin/master' into left-panel-hierarchy
Conflicts:
	lib/ui/package.json
2017-06-22 13:49:21 +03:00
igor
3dbdb9e8a9 Better UI for the hierarchy view + bugs fixes 2017-06-22 13:22:59 +03:00
Oleg Proskurin
0520eabf38 Merge pull request #1333 from mcmunder/patch-1
Update docs
2017-06-22 13:35:58 +04:00
Matthias Christoph Munder
c56d3f7ee4 Update docs
I (and others https://github.com/storybooks/storybook/issues/25) had a hard time finding information about how to apply styles from CSS frameworks like Boostrap etc... Maybe this link in the section about CSS testing makes it a bit easier?
2017-06-22 10:41:31 +02:00
Michael Shilman
a620cfed2a v3.1.5 v3.1.5 2017-06-22 16:36:43 +10:00
Michael Shilman
428768092a Updated CHANGELOG 2017-06-22 16:24:24 +10:00
Michael Shilman
84f67702c4 Merge pull request #1303 from storybooks/1266-fix-components-deps
Import demo components from @storybook/react
2017-06-22 15:25:19 +10:00
Michael Shilman
c61e045b06 Merge branch 'master' into 1266-fix-components-deps 2017-06-22 15:09:27 +10:00
Michael Shilman
f496deba0b Create @storybook/react/demo exports 2017-06-22 15:05:19 +10:00
Tom Coleman
3a27e214d2 Note about common next.js error 2017-06-22 14:58:06 +10:00
Michael Shilman
d1b625a08a Merge pull request #1332 from storybooks/1331-test-cra-on-tarballs
Use a pack -> install technique to recreate local packages
2017-06-22 13:40:36 +10:00
Tom Coleman
45300c361c Revert removing @storybook/react from storyshots 2017-06-22 12:20:25 +10:00
Tom Coleman
77974e0659 Added explanation of packs dir 2017-06-22 12:18:16 +10:00
Tom Coleman
b04849bc6e Use a pack -> install technique to recreate local packages
As suggested by https://github.com/npm/npm/pull/15900. This is a workaround until we get a better resolution of https://github.com/storybooks/storybook/issues/1286
2017-06-22 12:18:16 +10:00
Michael Shilman
e5041fa06a Add package-lock.json
Per discussion with @tmeasday 😉
2017-06-22 11:17:16 +10:00
Michael Shilman
b6de6ac954 Add placeholder tests to react-kitchen-sink 2017-06-22 10:54:16 +10:00
Michael Shilman
d04f2239bb Merge branch 'master' into 1266-fix-components-deps 2017-06-22 00:59:57 +10:00
Michael Shilman
5fcd85b311 Remove @storybook/react dependencies from storyshots
This is a hack. Currently the build is broken because `test-cra`
requires `@storybook/addon-storyshots` AND `@storybook/react`, but
`@storybook/addon-storyshots` requires `@storybook/react`. Before this
change, two versions of `@storybook/react` are getting loaded, and this
leads to a test error “Your test suite must contain at least one test.”

After this “fix” the error goes away. However,
`@storybook/addon-storyshots` should have a dev- dependency on
`@storybook/react`, because it uses it for its examples. But it only
has a peer-dep for now.
2017-06-22 00:24:33 +10:00
Michael Shilman
c7f7e07128 Remove unnecessary @storybook/react dep in @storybook/react-native 2017-06-21 21:46:31 +10:00
Michael Shilman
2c54e27b4a Merge pull request #1327 from natsathorn/master
add step for import addon-action to addons.js file before start using it
2017-06-21 20:52:34 +10:00
igor
6960d91cb9 Add more tests for stories.js 2017-06-21 12:59:32 +03:00
igor
ad32ffabbb Fix a few related codebeat issues 2017-06-21 12:00:45 +03:00
igor
a7a39002f9 Add left panel hierarchy support 2017-06-21 10:15:27 +03:00
Natsathorn
62b2651456 add step for import addon-action to addons.js file before start using it 2017-06-21 13:08:31 +07:00
Blair Anderson
e4634420f2 addons/info: update readme
- include the defaults/options that are useable
2017-06-20 18:46:43 -07:00
Alexandre BODIN
7be65d4943 fix resolve in webpack 2017-06-20 18:06:30 +02:00
Alexandre BODIN
e35aeee9af Merge branch 'add-app-vue' of github.com:storybooks/storybook into add-app-vue 2017-06-20 17:38:58 +02:00
Alexandre BODIN
654be24417 bumping version 2017-06-20 17:38:43 +02:00
Alexandre BODIN
c7efe5a69f bumping version 2017-06-20 17:37:05 +02:00
Alexandre BODIN
6e8f869425 fix dependency 2017-06-20 13:29:21 +02:00
Alexandre BODIN
6c95ac9960 add tests 2017-06-20 13:28:24 +02:00
Alexandre BODIN
5daa769cd8 Merge branch 'master' into add-app-vue 2017-06-20 13:01:57 +02:00
Norbert de Langen
b975fc3e94 Update ROADMAP.md 2017-06-20 12:05:04 +02:00
Norbert de Langen
939326581c Update ROADMAP.md 2017-06-20 12:04:45 +02:00
Norbert de Langen
37141d675f Merge branch 'master' into 1266-fix-components-deps 2017-06-19 11:50:23 +02:00
Norbert de Langen
043b5f1f6f Merge branch 'master' into add-app-vue 2017-06-19 11:48:48 +02:00