1027 Commits

Author SHA1 Message Date
Norbert de Langen
95b8cadc3a Merge branch 'next' into tech/upgrades
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/cssresources/package.json
#	addons/events/package.json
#	addons/google-analytics/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/ondevice-backgrounds/package.json
#	addons/ondevice-knobs/package.json
#	addons/ondevice-notes/package.json
#	addons/options/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	addons/viewport/package.json
#	app/ember/package.json
#	examples/angular-cli/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/cra-ts-kitchen-sink/package.json
#	examples/ember-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/riot-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lib/core/package.json
#	yarn.lock
2019-03-05 22:48:38 +01:00
Michael Shilman
f2b625bab0 Merge master into next after 5.0.0 release 2019-03-06 02:08:02 +08:00
Norbert de Langen
d7417dec19 Merge branch 'next' into tech/upgrades
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2019-03-05 10:56:25 +01:00
Filipp Riabchun
15312c11ec
Fix eslint 2019-03-04 21:05:00 +01:00
Norbert de Langen
c2fc7ae483 Merge branch 'next' into react-native/use-core-for-server
# Conflicts:
#	addons/actions/package.json
#	addons/cssresources/package.json
#	lib/core/package.json
#	lib/ui/src/keyboard/keyCodes.ts
#	yarn.lock
2019-03-02 19:40:45 +01:00
Norbert de Langen
aa732cb609 Merge branch 'next' into tech/upgrades 2019-03-02 19:33:18 +01:00
Tom Coleman
dc401dd810 ADD a warning for #5781 2019-03-03 00:37:37 +11:00
Tom Coleman
1e0016c382 Allow local decorators via params 2019-03-01 15:40:28 +11:00
Norbert de Langen
cd3105ee0f Merge branch 'next' into tech/upgrades
# Conflicts:
#	addons/jest/package.json
#	examples/angular-cli/package.json
#	lib/components/package.json
#	yarn.lock
2019-02-28 00:39:32 +01:00
Norbert de Langen
37e3172512 UPGRADE more 2019-02-25 11:59:36 +01:00
Tom Coleman
38e22ee0e1 Revert "Revert "Added STORIES_CONFIGURED and use to drive loading state.""
This reverts commit bcf254db8437522bfe924ed6f9fee4ae4dc53041.
2019-02-25 18:26:18 +11:00
Tom Coleman
bcf254db84 Revert "Added STORIES_CONFIGURED and use to drive loading state."
This reverts commit bec1d4d910ea7fbd30dc90d7dd8e3776700eae6d.
2019-02-25 18:25:44 +11:00
Tom Coleman
bec1d4d910 Added STORIES_CONFIGURED and use to drive loading state.
For #5620
2019-02-25 18:23:55 +11:00
Benoit Dion
e6aa78db91 Fix app/react-native
- Bind fns in constructors and initialize StoryStore
- Make channel optional, we might not have one yet.
- Use getElements instead of getPanels
2019-02-23 15:10:29 -05:00
Norbert de Langen
0f1a1cf2cd Merge branch 'next' into fix/storysource-not-updating
# Conflicts:
#	lib/client-api/src/client_api.js
#	lib/client-api/src/story_store.js
#	lib/client-api/src/story_store.test.js
2019-02-20 13:55:12 +01:00
Norbert de Langen
51334ebfa2
Merge pull request #5643 from greysteil/package-directories
Add directory attribute to repositories in package.json files
2019-02-20 11:32:38 +01:00
Norbert de Langen
8e1ad0b24e REMOVE unneeded memoization 2019-02-20 01:46:54 +01:00
Norbert de Langen
54faca3793 CHANGE storysource addon to use storyId instead of kind + name && ADD toId to router package
CHANGE storysource to use toId from router package
CHANGE core tp use toId from router package
CHANGE client-api to use toId from router package
CHANGE storyshots-puppeteer to use toId from router package
2019-02-19 20:14:15 +01:00
Norbert de Langen
a62c429572 CLEANUP naming of story, storyFn in client_api & story_store
MOVE getDecorated into storyStore
ADD getOriginal as the clear method for getting the undecorated storyFn
RENAME getStory to storyFn
2019-02-19 16:03:33 +01:00
Grey Baker
70925b9895 Add directory attribute to repositories in package.json files 2019-02-18 10:26:03 +00:00
Michael Shilman
4cc5181e69 Add unit tests for splitPath function 2019-02-15 11:47:15 +08:00
Michael Shilman
247dd6a353 v5.0.0-beta.3 2019-02-13 11:22:25 +08:00
Michael Shilman
0a965e21b3 v5.0.0-beta.2 2019-02-13 11:15:55 +08:00
igor
8ccb7bccb8 Fix the client_api tests 2019-02-08 14:18:22 +02:00
igor
3be2ac095b Move ConfigApi to the client-api pkg 2019-02-08 13:56:27 +02:00
igor
3b819e4873 Fix refs in client-api and use it back in core 2019-02-08 13:19:33 +02:00
Igor
f60cf4c8ac Emergency commit 2019-02-08 12:24:42 +02:00