614 Commits

Author SHA1 Message Date
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
Hypnosphi
532df1e7ce Fix useChannel tests 2019-06-29 20:50:08 +03:00
Michael Shilman
298866f737 v5.2.0-alpha.32 2019-06-29 11:26:23 +08:00
Michael Shilman
ea238476af Merge branch 'next' into fix-react-native-server 2019-06-29 10:23:12 +08:00
Michael Shilman
d6843e3e5e v5.2.0-alpha.31 2019-06-27 12:29:29 +08:00
Michael Shilman
ef14ecf3b5 Merge branch 'next' into pr/6472 2019-06-27 10:56:35 +08:00
Norbert de Langen
3b015d54bd CHANGE linting config to also lint react-native && FIX all linting issues 2019-06-25 16:05:11 +02:00
Norbert de Langen
9232a152e1 Merge branch 'next' into fix-react-native-server 2019-06-25 14:32:47 +02:00
Michael Shilman
e5e0aab372 v5.2.0-alpha.30 2019-06-25 20:18:51 +08:00
Gytis Vinclovas
4b864ffce5
Added comments in the story store 2019-06-25 13:44:12 +03:00
Gytis Vinclovas
5f11fbccaa Updated to new story api. Properly listens to server. 2019-06-25 10:30:27 +03:00
Jessica Koch
5d2f9b9256 broken...need to rebuild, sorry 2019-06-22 18:41:04 -07:00
Jessica Koch
6db0abb6df fix merge conflicts 2019-06-22 18:40:41 -07:00
Norbert de Langen
39f723e282 ADD useChannel & useParameter 2019-06-19 22:15:11 +02:00
Norbert de Langen
3d138f2021 Merge branch 'next' into preview-hooks
# Conflicts:
#	addons/actions/package.json
#	addons/events/package.json
#	examples/dev-kits/package.json
#	examples/html-kitchen-sink/package.json
2019-06-19 14:32:50 +02:00
Norbert de Langen
497300502c Merge branch 'next' into fix/hmr
# Conflicts:
#	lib/client-api/src/story_store.js
#	lib/core/src/client/preview/start.js
2019-06-19 10:54:07 +02:00
Jessica Koch
ccbc81cb9f merge 2019-06-19 01:34:49 -07:00
Jessica Koch
f3fbfe0793 correct some linting errors 2019-06-19 01:32:39 -07:00
Norbert de Langen
e71dd4c816 Merge branch 'next' into fix/hmr
# Conflicts:
#	lib/client-api/src/story_store.js
#	lib/core/src/client/preview/start.js
2019-06-18 15:26:06 +02:00
Norbert de Langen
fcbff29ffd CHANGE versions again, sorry, CLI tests use published version, we should really fix that! 2019-06-17 21:18:42 -07:00
Norbert de Langen
51486a6460 Merge branch 'next' into fix/hmr 2019-06-17 14:32:03 +02:00
Michael Shilman
1e81ea4fb4 Clean up comments 2019-06-17 18:07:42 +08:00
Michael Shilman
326a1d2e3e Addon-docs viewMode skeleton 2019-06-17 18:06:38 +08:00
Michael Shilman
fc0c2d1b09 Update from next 2019-06-17 15:54:31 +08:00
Norbert de Langen
fbee3cdd5f CHANGE versions again, sorry, CLI tests use published version, we should really fix that! 2019-06-13 00:50:44 +02:00
Norbert de Langen
3e8bf519f7 CHANGE version to 5.2.0-unreleased, to stop the update PR spam 2019-06-12 13:26:44 +02:00
Norbert de Langen
88c2a98ce5 Merge branch 'next' into preview-hooks
# Conflicts:
#	addons/actions/package.json
#	addons/events/package.json
#	examples/html-kitchen-sink/package.json
2019-06-07 14:12:45 +02:00
Norbert de Langen
2edef6b335 Merge branch 'next' into fix/hmr 2019-06-06 09:30:47 +02:00
MIchael Shilman
c2dfa5bf3d Merge remote-tracking branch 'origin/master' into next 2019-06-05 16:46:17 -07:00
Norbert de Langen
4f7e3dd8d2 IMPROVE HMR error reporting, no refreshes needed for error recovery 2019-06-04 21:48:22 +02:00
Michael Shilman
70d6fcdcbe v5.1.0-rc.5 2019-06-04 10:56:14 -07:00
Michael Shilman
bb3e7f71cd Github org rename to storybookjs 2019-06-03 11:06:42 -07:00
Michael Shilman
1317bb14fa v5.1.0-rc.4 2019-06-02 23:36:17 -07:00
Michael Shilman
ca7bfe860d
feat: merge global parameters (#6900)
feat: merge global parameters
2019-06-02 22:37:09 -07:00