5972 Commits

Author SHA1 Message Date
Filipp Riabchun
04a98e679c
Merge branch 'master' into dd/fix-info-story-description 2017-10-28 02:45:17 +03:00
Filipp Riabchun
287414f861
Merge pull request #2137 from storybooks/dependencies.io-update-build-41.0.0
3 packages updated by dependencies.io
2017-10-28 02:29:11 +03:00
Daniel Duan
c753d744e3 fix optional description 2017-10-27 15:54:12 -04:00
Dependencies.io Bot
facdfdc195 Update glamorous from 4.10.0 to 4.11.0 in examples/cra-kitchen-sink 2017-10-27 16:27:24 +00:00
Dependencies.io Bot
c94d7e3bae Update glamorous from 4.10.0 to 4.11.0 in app/react 2017-10-27 16:25:55 +00:00
Dependencies.io Bot
8f7efe2575 Update glamorous from 4.10.0 to 4.11.0 in lib/components 2017-10-27 16:24:17 +00:00
Daniel Duan
99866cf2e6 Merge branch 'master' into haul-platform-option 2017-10-26 18:04:02 -04:00
Daniel Duan
e468addf0e update docs 2017-10-26 17:54:04 -04:00
Daniel Duan
22a9957ca2 fix info not importing docgen descriptions 2017-10-26 17:39:38 -04:00
Filipp Riabchun
03c3d6dae4 Merge pull request #2131 from storybooks/dependencies.io-update-build-40.0.0
2 packages updated by dependencies.io
2017-10-26 19:44:25 +03:00
Dependencies.io Bot
7d9a38ff43 Update react-split-pane from 0.1.66 to 0.1.68 in lib/ui 2017-10-26 16:23:34 +00:00
Dependencies.io Bot
9e6fc22b7b Update graphiql from 0.11.6 to 0.11.9 in addons/graphql 2017-10-26 16:22:10 +00:00
Evgeniy Zaitsev
854c8ebffb #2128 Add plutform option for haul bundler 2017-10-26 13:06:08 +03:00
Norbert de Langen
0ad2674382 Merge branch 'master' into patch-2 2017-10-25 07:34:23 +02:00
Norbert de Langen
f64b9ce3b3 Merge pull request #2126 from axelboc/ui-fix-scroll
Fix `flex-basis` of `DownPanel` content div
2017-10-25 07:32:31 +02:00
Axel Bocciarelli
ded8dbcfaf fix flex-basis of DownPanel content div 2017-10-25 15:51:43 +11:00
Norbert de Langen
36a4aadf20 re-generate yarn.lock 2017-10-24 23:33:52 +02:00
Norbert de Langen
462ea1cc4a Merge branch 'master' into release/3.3 2017-10-24 23:25:18 +02:00
Norbert de Langen
da23479536 Merge pull request #2119 from storybooks/screenshot-testing
ADD integration test
2017-10-24 23:11:38 +02:00
Filipp Riabchun
e49e4ef869 Merge branch 'master' into screenshot-testing 2017-10-24 21:48:45 +03:00
Filipp Riabchun
68ed7be1d9 Merge pull request #2124 from storybooks/dependencies.io-update-build-38.0.0
4 packages updated by dependencies.io
2017-10-24 21:48:11 +03:00
Dependencies.io Bot
eeccac014a Update chalk from 2.2.0 to 2.3.0 in app/vue 2017-10-24 16:28:47 +00:00
Dependencies.io Bot
be4f7854d0 Update chalk from 2.2.0 to 2.3.0 in app/react 2017-10-24 16:27:47 +00:00
Dependencies.io Bot
a57800b5b9 Update chalk from 2.2.0 to 2.3.0 in lib/cli 2017-10-24 16:26:47 +00:00
Dependencies.io Bot
25a640e36b Update chalk from 2.2.0 to 2.3.0 in / 2017-10-24 16:25:44 +00:00
Derek W. Stavis
d67d2c7f69 Avoid logging an object on compilation errors
In certain configurations Storybook might log the whole Webpack
build object when warnings or errors are thrown. This was caused
by a `logger.error` call inside the `index.js` catch. This fixes by logging
the error only when it's an instance of an error.
2017-10-24 11:27:59 -02:00
Norbert de Langen
a658bee2d7 Merge branch 'master' into screenshot-testing 2017-10-24 11:35:09 +02:00
Norbert de Langen
ce74a760ca FIX unit tests (should not run integration) 2017-10-24 11:34:03 +02:00
Norbert de Langen
63c5113a90 FIX unit tests task in CI 2017-10-24 10:06:54 +02:00
Norbert de Langen
6efc1ed71f switch to circleci/node 2017-10-24 09:57:09 +02:00
Norbert de Langen
c95893dd68 FIX circleci yml 2017-10-24 09:01:24 +02:00
Norbert de Langen
c1d14191cb ADD integration test: automatic screenshot of cra-kitchen-sink and vue-kitchen-sink examples 2017-10-24 01:39:59 +02:00
Filipp Riabchun
6bf8ce53f9 Merge pull request #2040 from amorriscode/issue#1227-full-screen-scrolling-ios
Handle full screen scrolling on iOS
2017-10-24 00:24:49 +03:00
Filipp Riabchun
07ee27956a Merge pull request #2079 from theshortcut/storyshots-warn-on-no-stories
adds error when storyshots finds no stories
2017-10-24 00:24:45 +03:00
Filipp Riabchun
9d43e24956 Merge branch 'master' into issue#1227-full-screen-scrolling-ios 2017-10-23 23:17:47 +03:00
Filipp Riabchun
2c5161c8fe Merge branch 'release/3.3' into storyshots-warn-on-no-stories 2017-10-23 22:59:45 +03:00
hypnos
0b949998f7 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-10-23 22:58:02 +03:00
hypnos
44937e922b Update lockfile 2017-10-23 22:56:14 +03:00
Filipp Riabchun
49d2edcc30 Merge pull request #2116 from storybooks/dependencies.io-update-build-36.0.0
2 packages updated by dependencies.io
2017-10-23 22:49:55 +03:00
Dependencies.io Bot
12e61acf23 Update @types/react from 16.0.17 to 16.0.18 in addons/knobs 2017-10-23 16:22:12 +00:00
Dependencies.io Bot
9fc41460b3 Update graphiql from 0.11.5 to 0.11.6 in addons/graphql 2017-10-23 16:21:20 +00:00
Norbert de Langen
dada6088fd Merge branch 'release/3.3' into storyshots-warn-on-no-stories 2017-10-23 18:20:27 +02:00
Norbert de Langen
557440b2b6 re-generate yarn.lock 2017-10-23 17:14:26 +02:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
Norbert de Langen
2932684e9a Merge branch 'master' into storyshots-warn-on-no-stories 2017-10-23 16:36:13 +02:00
Norbert de Langen
309b97ea27 Merge branch 'master' into issue#1227-full-screen-scrolling-ios 2017-10-23 16:23:43 +02:00
Norbert de Langen
c47e6e9927 Merge pull request #2112 from storybooks/merge-master-to-release/3.3
Merge master to release/3.3
2017-10-23 16:22:28 +02:00
Norbert de Langen
9d79015d8a Update README.md 2017-10-23 16:20:19 +02:00
Norbert de Langen
1a2c952f58 ADD README.md for lib/components 2017-10-23 16:19:43 +02:00
Norbert de Langen
65f69275ca Update README.md 2017-10-23 16:16:25 +02:00