1369 Commits

Author SHA1 Message Date
Rob Richard
7868ada098 Log correct url when using --https 2017-09-20 15:44:50 -04:00
hypnos
aae4d52c68 Merge remote-tracking branch 'upstream/master' into release/3.3
# Conflicts:
#	addons/storyshots/src/index.js
2017-09-17 00:09:12 +03:00
Vesa Laakso
b7b88066e3
Add missing babel plugins to app-vue 2017-09-16 10:58:30 +03:00
hypnos
494b0fc949 Exit with code 1 if start-storybook --smoke-test fails 2017-09-15 22:56:46 +03:00
Filipp Riabchun
65d1dda4e6 Merge branch 'master' into release/3.3 2017-09-09 22:48:27 +03:00
Maksim Orlov
01c65a3c21 Fix broken links in the deprecation warning for RN and Vue apps 2017-09-09 12:40:03 +07:00
hypnos
824bbd6a6d Replace the deprecated prepublish script with prepare 2017-09-08 03:19:39 +03:00
hypnos
2308e98269 Use yarn scripts where possible, omitting extra -- because now we can 2017-09-07 01:58:49 +03:00
hypnos
dc0bd90930 Merge remote-tracking branch 'upstream/release/3.3' into yarn-workspaces
# Conflicts:
#	yarn.lock
2017-09-07 01:07:27 +03:00
hypnos
4d10a55997 Introduce yarn workspaces 2017-09-07 00:55:44 +03:00
Michael Shilman
94723262d9 v3.3.0-alpha.0 2017-09-06 13:46:17 -07:00
Norbert de Langen
8dd71b2bb1 Merge branch 'release/3.3' into thomasbertet/fix-ordering-chunk-load
# Conflicts:
#	app/react/src/server/index.html.js
#	app/vue/src/server/index.html.js
2017-09-06 08:18:33 +02:00
Norbert de Langen
7610652d39 Merge branch 'master' into release/3.3 2017-09-06 07:24:35 +02:00
hypnos
3f51b0b891 Merge remote-tracking branch 'upstream/master' into release/3.3
# Conflicts:
#	.circleci/config.yml
2017-09-06 03:08:34 +03:00
Filipp Riabchun
ab8340afd9 Merge branch 'master' into ndelangen/update-root-dependencies 2017-09-06 03:04:01 +03:00
Norbert de Langen
db96f28d0f UPGRADE root dependencies and SYNC with packages 2017-09-06 01:54:21 +02:00
Filipp Riabchun
e1cb69ba5f Merge branch 'master' into smoke-test-master 2017-09-06 02:47:07 +03:00
hypnos
8c5a813e9f Add smoke-test option to start-storybook commands
(cherry picked from commit dc2159d)
2017-09-06 02:42:24 +03:00
Norbert de Langen
f1ff7b1e1f Merge branch 'master' into release/3.3
# Conflicts:
#	app/react/src/server/babel_config.test.js
#	examples/cra-kitchen-sink/src/stories/index.js
#	examples/crna-kitchen-sink/storybook/stories/index.js
#	examples/react-native-vanilla/package.json
#	examples/react-native-vanilla/storybook/stories/index.js
#	lib/ui/src/modules/ui/components/layout/index.js
2017-09-06 01:33:18 +02:00
Norbert de Langen
665116009c Merge branch 'master' into ndelangen/fix-prettier-linting 2017-09-06 00:59:28 +02:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Norbert de Langen
341cccad75 REMOVE mock-fs and replace it with jest.mock() 2017-09-06 00:39:33 +02:00
Thomas Bertet
e3020ce291 use HtmlWebpackPlugin for vue 2017-09-04 09:06:10 +02:00
hypnos
ba2f0d9052 Fix preview scrolling after resizing panes 2017-09-01 02:40:57 +03:00
Norbert de Langen
91e01055c2 Merge branch 'release/3.3' into 887-generate-snapshot-per-story-file
# Conflicts:
#	app/react/src/client/preview/client_api.test.js
#	app/vue/src/client/preview/client_api.test.js
#	lib/ui/src/modules/ui/components/menu_item.test.js
#	lib/ui/src/modules/ui/components/search_box.test.js
2017-08-27 00:35:19 +02:00
Dan Green
eefa1ecf21 Fixed Jest warnings
All Jest warnings fixed except one in `addons/info/src/index.test.js`
2017-08-26 14:57:53 -04:00
Norbert de Langen
fd3d5e581d CLEANUP reduce noise in unit tests 2017-08-25 22:58:22 +02:00
Norbert de Langen
571373d278 Merge branch 'release/3.3' into 887-generate-snapshot-per-story-file 2017-08-24 10:09:51 +02:00
Michael Shilman
0159955ba7 v3.2.8 2017-08-23 13:55:09 -07:00
André Cruz
227dc9df1e Fix storyshots with new babel config 2017-08-23 20:55:38 +01:00
Michael Shilman
c6a690e037 v3.2.7 2017-08-23 09:23:41 -07:00
Norbert de Langen
d0b51769e3 Linting 2017-08-23 07:50:16 +02:00
Norbert de Langen
b195b2c26b Merge branch 'master' into fix/1709-cacheDirectory 2017-08-23 07:16:50 +02:00
hypnos
a81b53fd13 Fix rest of lint errors 2017-08-23 03:44:20 +03:00
Norbert de Langen
2890dd35f3 FIX #1709 2017-08-23 00:52:49 +02:00
Norbert de Langen
96a389bda1 Merge branch 'master' into 887-generate-snapshot-per-story-file 2017-08-22 23:00:14 +02:00
Michael Shilman
a3647be4a6 v3.2.6 2017-08-22 11:02:17 -07:00
Michael Shilman
c21a88b47a v3.2.6-alpha.0 2017-08-22 00:31:44 -07:00
Tom Coleman
9b815a0fad Merge branch 'master' into 887-generate-snapshot-per-story-file 2017-08-21 09:21:41 +10:00
Norbert de Langen
a190fc5a18 Merge branch 'master' into react-fix-url-for-assets-loading 2017-08-18 14:05:05 +02:00
Igor
70c2ebe61c Merge branch 'master' into 887-generate-snapshot-per-story-file 2017-08-18 13:40:27 +03:00
Norbert de Langen
c8b2e6f9ac Merge branch 'master' into improve/decorator-for-vue 2017-08-18 11:46:48 +02:00
Norbert de Langen
1f8e843e2d Merge branch 'master' into switchto-babel-preset-env 2017-08-17 18:19:45 +02:00
Norbert de Langen
39140d8742 REVERT mangle setting 2017-08-17 18:04:20 +02:00
Michael Shilman
2392767ffb v3.2.5 2017-08-16 21:50:44 -07:00
Norbert de Langen
a9b55dc714 ADD minify 2017-08-17 00:31:45 +02:00
Norbert de Langen
58b5d6d22f WIP 2017-08-16 21:58:17 +02:00
Dima Sobolev
9aeb13b19e Upgrade react-modal to v2.2.4 2017-08-16 19:11:07 +03:00
Igor
54cb5d1e41 Merge branch 'master' into 887-generate-snapshot-per-story-file 2017-08-15 10:43:46 +03:00
Blair Anderson
976a0c7301 add base tag to VUE iframe 2017-08-14 14:56:07 -07:00