3498 Commits

Author SHA1 Message Date
Norbert de Langen
7b5f88dfb9 Set npm needed for project to lower then 5.0.0 2017-06-03 21:36:01 +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
Michael Shilman
572d677609 Merge branch 'master' into eslint-strict 2017-06-04 00:11:14 +12:00
Norbert de Langen
7b6c00c0dc Merge pull request #1184 from rossipedia/patch-1
reset console colors explicitly
2017-06-03 01:06:45 +02:00
Bryan J. Ross
d97dbb284e reset console colors explicitly
Due to a bug in how Windows handles escape codes, the console output disappears after the version number (chalk/chalk#145 and Microsoft/BashOnWindows#2174). Resetting the output explicitly fixes storybook output on Windows.
2017-06-02 16:10:55 -06:00
Norbert de Langen
f6f6fe5193 Merge branch 'master' into add-events-addon 2017-06-02 22:45:00 +02:00
Norbert de Langen
93bd3dfc83 Merge pull request #1170 from zillding/master
Fix addon panel layout styling
2017-06-02 22:44:13 +02:00
Evgeniy Zaitsev
711009f563 Merge branch 'master' into add-events-addon 2017-06-02 13:51:42 +03:00
Evgeny Zaytsev
384ba36871 Merge branch 'master' into addon-info-new-options 2017-06-02 13:35:05 +03:00
Norbert de Langen
56e596f5c6 Merge branch 'master' into master 2017-06-02 07:56:08 +02:00
Joey Baker
57abc9d4f2 Chore(deps) install ws
It's a dependency already!
2017-06-01 13:12:59 -07:00
Michael Shilman
3868a54347 Merge pull request #1176 from storybooks/fix-https
ADD https import & remove tracking code remains
2017-06-02 03:05:30 +12:00
Norbert de Langen
bf4219e6cf ADD lint-staged 2017-06-01 08:11:38 +02:00
Norbert de Langen
49bb8ea829 Merge branch 'master' into eslint-strict 2017-06-01 07:53:54 +02:00
Norbert de Langen
16605b94e2 ADD https import & remove tracking code remains 2017-06-01 07:23:51 +02:00
Norbert de Langen
a61e0bc0d5 UPDATE cra-storybook example to latest 2017-06-01 07:16:41 +02:00
Joey Baker
21ceaa4c58 Fix(react-native) add missing new
Fixes this error on startup:

```
this.wsServer = _ws2.default.Server({ server: this.httpServer });
                                 ^

TypeError: Class constructor WebSocketServer cannot be invoked without 'new'
    at new Server (.../node_modules/@storybook/react-native/dist/server/index.js:48:34)
```
2017-05-31 14:36:35 -07:00
Norbert de Langen
27e6a8326b Merge branch 'master' into addon-info-new-options 2017-05-31 22:44:40 +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
Zill Ding
cfaf4fb468 Fix addon panel layout styling 2017-05-31 22:35:55 +08: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
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