197 Commits

Author SHA1 Message Date
Michael Shilman
bd77e15c32 v5.2.0-beta.4 2019-07-20 12:41:13 +08:00
Michael Shilman
e788841935 v5.2.0-beta.3 2019-07-19 20:15:36 +08:00
Michael Shilman
d597cdd048 v5.2.0-beta.2 2019-07-18 22:21:11 +08:00
Michael Shilman
cec7d5c282 v5.2.0-beta.1 2019-07-18 10:09:31 +08:00
Michael Shilman
fbf724f2a1 v5.2.0-beta.0 2019-07-15 20:49:44 +08:00
Michael Shilman
f3487c68e4 v5.2.0-alpha.44 2019-07-15 09:32:23 +08:00
Michael Shilman
424a97b7f6 Merge branch 'next' into fix/decoratestory 2019-07-15 08:58:27 +08:00
Michael Shilman
2cbb9614f1 v5.2.0-alpha.43 2019-07-13 21:50:51 +08:00
Michael Shilman
b6ae728039 v5.2.0-alpha.42 2019-07-12 11:35:45 +08:00
Michael Shilman
9b21aea75b v5.2.0-alpha.41 2019-07-11 08:01:54 +08:00
Norbert de Langen
da40913ba4 FIX remaining issues after merging in next 2019-07-10 16:33:47 +02:00
Norbert de Langen
9571fe1572 Merge branch 'next' into preview-hooks
# Conflicts:
#	addons/actions/package.json
#	addons/events/package.json
#	addons/events/src/index.ts
#	addons/ondevice-notes/package.json
#	dev-kits/addon-roundtrip/package.json
#	examples/dev-kits/package.json
#	examples/html-kitchen-sink/package.json
#	lib/client-api/package.json
#	lib/client-api/src/client_api.ts
#	lib/client-api/src/typings.d.ts
#	lib/client-api/tsconfig.json
#	lib/ui/src/index.js
#	yarn.lock
2019-07-10 16:08:11 +02:00
Norbert de Langen
fa8c49fe74 Merge branch 'next' into fix/decoratestory 2019-07-10 15:48:27 +02:00
Michael Shilman
c41dafcbfe v5.2.0-alpha.40 2019-07-10 21:13:10 +08:00
Norbert de Langen
6bcdbf209a Merge branch 'next' into setup-travis
# Conflicts:
#	yarn.lock
2019-07-10 12:24:25 +02:00
Michael Shilman
3b17da4800 v5.2.0-alpha.39 2019-07-10 10:42:50 +08:00
Norbert de Langen
741e69584e clean logs from tests 2019-07-09 09:39:22 +02:00
Norbert de Langen
e87c329e90 Do not merge p if not provided, if provided, no conditional is needed 2019-07-08 21:34:09 +02:00
Michael Shilman
30078af6de v5.2.0-alpha.38 2019-07-09 02:35:11 +08:00
Norbert de Langen
06c57aec43 FIX types of client-api & storystore
the function to merge all decorators & storyFn has been changed to no longer mutate
the storyFn called from within decorators must be called with a StoryContext
add a story for vue to test the behaviour
2019-07-08 15:07:20 +02:00
Michael Shilman
8d82c6a62b v5.2.0-alpha.37 2019-07-08 13:04:50 +08:00
Michael Shilman
1c3592a5d5
FIX docs-mode by using storyFn instead of getDecorated (#7334)
FIX docs-mode by using storyFn instead of getDecorated
2019-07-08 12:48:43 +08:00
Michael Shilman
ae178d4539 Fix breaking change in client_api due to #7147 2019-07-08 12:05:24 +08:00
Norbert de Langen
c008552ebf REMOVED unused import (type) 2019-07-07 23:59:33 +02:00
Norbert de Langen
5177510e01 FIX docs-mode by using storyFn instead of getDecorated 2019-07-07 23:44:34 +02:00
Norbert de Langen
74e48c5e09 FIX minor issues after client-api TS migration merge 2019-07-06 15:40:45 +02:00
Norbert de Langen
81848a9f12 Merge branch 'next' into ts-migration/client-api
# Conflicts:
#	addons/ondevice-backgrounds/src/BackgroundPanel.js
#	lib/client-api/package.json
#	lib/client-api/src/story_store.ts
2019-07-06 14:32:53 +02:00
Michael Shilman
cd87934497
Merge pull request #7319 from storybookjs/7169-fix-renaming-stories
Addon-docs: Fix renaming stories on module / MDX format
2019-07-06 07:31:34 +08:00
Michael Shilman
65db79f6ec v5.2.0-alpha.36 2019-07-05 18:14:20 +08:00
Michael Shilman
490fa3dfff Fix broken client API test 2019-07-05 17:19:17 +08:00
Michael Shilman
e59fab57e2 Core: Update story_store to keep _data and _legacydata in sync 2019-07-05 15:51:56 +08:00
Norbert de Langen
ff924d72f2 IMPROVE types 2019-07-05 08:56:36 +02:00
Hypnosphi
582b29ca42 Add inline docs 2019-07-05 02:21:22 +03:00
Hypnosphi
8c75a1b24f Add useStoryContext 2019-07-05 02:10:09 +03:00
Hypnosphi
c8d437b789 Merge remote-tracking branch 'origin/next' into preview-hooks
# Conflicts:
#	addons/actions/package.json
#	addons/events/package.json
#	addons/ondevice-notes/package.json
#	dev-kits/addon-roundtrip/package.json
#	examples/dev-kits/package.json
#	examples/html-kitchen-sink/package.json
2019-07-04 19:42:22 +03:00
Norbert de Langen
16f01a1225 IMPROVE cli-tests performance 2019-07-04 15:54:13 +02:00
Norbert de Langen
a718ad1e1b Merge branch 'next' into ts-migration/client-api
# Conflicts:
#	lib/client-api/package.json
2019-07-04 10:47:11 +02:00
Michael Shilman
69ae9c7d54 v5.2.0-alpha.35 2019-07-03 00:22:17 +08:00
Norbert de Langen
6e17b8d48a ADD deps array to ueChannel 2019-07-02 12:12:59 +02:00
Norbert de Langen
7955e4d5c1 FIX channel emit failing because it's missing this && ADD roundtrip to correct story && CHANGE roundtrip to useChannel 2019-07-02 11:33:28 +02:00
Norbert de Langen
aab38d2389 Merge branch 'next' into preview-hooks
# Conflicts:
#	addons/actions/package.json
#	addons/events/package.json
#	addons/ondevice-notes/package.json
#	examples/dev-kits/package.json
#	examples/html-kitchen-sink/package.json
2019-07-02 09:09:24 +02:00
Michael Shilman
367f72455f v5.2.0-alpha.34 2019-07-02 09:32:39 +08:00
Norbert de Langen
e9679bb649 Merge branch 'next' into ts-migration/client-api
# Conflicts:
#	lib/client-api/package.json
2019-07-02 02:16:35 +02:00
Norbert de Langen
bcf18cc95c FIX types 2019-07-02 02:09:43 +02:00
Michael Shilman
a0561d267a v5.2.0-alpha.33 2019-07-01 19:13:12 +08:00
Jessica-Koch
00520181ce add some dependencies 2019-07-01 00:34:16 -07:00
Jessica-Koch
239e73e48e add some dependencies 2019-07-01 00:33:09 -07:00
Jessica-Koch
ffc63188ae complete typings of items except
Committer: Jessica-Koch <jessicakoch136@icloud.com>
2019-07-01 00:31:44 -07:00
Jessica Koch
e455427c5f Merge branch 'next' of github.com:storybookjs/storybook into ts-migration/client-api 2019-06-30 14:47:44 -07:00
Hypnosphi
b07a636af9 Fix useChannel tests 2019-06-30 01:36:33 +03:00