1840 Commits

Author SHA1 Message Date
Michael Shilman
3f97c6f175 v3.2.12 2017-10-03 00:29:46 +02:00
Michael Shilman
5030ee196c v3.3.0-alpha.1 2017-10-02 20:57:35 +02:00
hypnos
41054abc7a Run prettier 2017-10-01 03:07:34 +03:00
Norbert de Langen
a270216e96 Merge branch 'master' into release/3.3
# Conflicts:
#	CONTRIBUTING.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	dependencies.yml
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/crna-kitchen-sink/package.json
#	examples/react-native-vanilla/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js
#	yarn.lock
2017-09-30 23:19:44 +02:00
Norbert de Langen
8665271963 FIX linting 2017-09-30 17:47:12 +02:00
Filipp Riabchun
f152c0dcb6 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 06:21:30 -07:00
hypnos
7e32662666 Merge branch 'master' into release/3.3
# Conflicts:
#	.circleci/config.yml
#	CONTRIBUTING.md
#	README.md
#	addons/knobs/package.json
#	addons/storyshots/package.json
#	app/vue/package.json
#	docs/yarn.lock
#	lerna.json
#	package.json
#	scripts/hoist-internals.js
#	yarn.lock
2017-09-30 16:20:37 +03:00
Filipp Riabchun
38df1ed32b Merge branch 'master' into release/3.3 2017-09-30 03:18:59 -07:00
Norbert de Langen
ebd2f8b632 Merge branch 'master' into yarn-master 2017-09-30 11:17:03 +02:00
Norbert de Langen
37898d693b Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 11:03:15 +02:00
hypnos
6c2ac98609 Add polyfills to fix addon-actions in IE11 2017-09-30 01:36:50 +03:00
Norbert de Langen
98e066388c Merge branch 'master' into ndelangen/upgrade-react 2017-09-29 23:39:29 +02:00
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
hypnos
2f53feb64a Use yarn workspaces on master 2017-09-29 23:00:47 +03:00
hypnos
8003d59142 Run eslint --fix 2017-09-29 02:50:06 +03:00
hypnos
74e34a3e88 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/info/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/src/stories/index.js
#	lerna.json
#	lib/ui/package.json
2017-09-29 02:46:39 +03:00
hypnos
1c2ca25464 Run eslint --fix on master 2017-09-29 02:13:59 +03:00
hypnos
603c1bfac7 Fix polyfills loading order 2017-09-28 03:25:25 +03:00
Michael Shilman
33977480e7 v3.2.11 2017-09-27 00:53:29 +02:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
Daniel Duan
2fd17040ec Merge branch 'master' into release/3.3 2017-09-21 14:21:18 -04:00
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