1046 Commits

Author SHA1 Message Date
Norbert de Langen
a00419ba80
Merge branch '5.0.0' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	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/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/preact-kitchen-sink/package.json
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	yarn.lock
2019-01-03 12:26:34 +01:00
Tom Coleman
5ecc23eaf4 Fix up key warning in addons panel
cc @ndelangen -- not sure if this was what you had in mind?
2018-12-31 13:12:18 +11:00
Michael Shilman
1723c492fd v4.2.0-alpha.8 2018-12-28 11:16:15 +08:00
Norbert de Langen
ad1651956a
Merge branch '5.0.0' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/backgrounds/src/__tests__/BackgroundPanel.js
#	addons/backgrounds/src/__tests__/Swatch.js
#	addons/cssresources/package.json
#	addons/events/package.json
#	addons/google-analytics/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/knobs/src/components/__tests__/Panel.js
#	addons/links/package.json
#	addons/notes/package.json
#	addons/notes/src/index.ts
#	addons/notes/src/register.tsx
#	addons/notes/src/typings.d.ts
#	addons/storyshots/storyshots-core/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	docs/package.json
#	docs/yarn.lock
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/preact-kitchen-sink/package.json
#	lib/addons/package.json
#	lib/addons/src/index.js
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	yarn.lock
2018-12-27 15:46:11 +01:00
Michael Shilman
beba7b3957 v4.2.0-alpha.7 2018-12-25 12:29:26 -08:00
Norbert de Langen
a2a78238e2
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	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/info/src/__snapshots__/index.test.js.snap
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-core/src/frameworks/vue/renderTree.js
#	addons/viewport/package.json
#	app/angular/package.json
#	app/ember/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/riot/package.json
#	app/svelte/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/preact-kitchen-sink/package.json
#	examples/vue-kitchen-sink/src/stories/__snapshots__/addon-centered.stories.storyshot
#	examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	yarn.lock
2018-12-21 18:18:10 +01:00
Norbert de Langen
8f895f317e
CHANGE to use yarn everywhere 2018-12-21 16:03:50 +01:00
Michael Shilman
bb9b7b3d5b v4.2.0-alpha.6 2018-12-20 14:20:25 -08:00
Norbert de Langen
f1d76a81fd
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	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/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	docs/package.json
#	docs/src/pages/configurations/theming/index.md
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/preact-kitchen-sink/package.json
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	yarn.lock
2018-12-19 22:37:36 +01:00
Michael Shilman
fd600487eb v4.2.0-alpha.5 2018-12-19 08:03:30 -08:00
Michael Shilman
a5b4e89e4c v4.2.0-alpha.4 2018-12-18 23:21:12 -08:00
Michael Shilman
15d34d0f3e v4.2.0-alpha.3 2018-12-18 07:02:51 -08:00
Norbert de Langen
d7bfb78ff5
FIX some typescript issues 2018-12-17 11:35:39 +01:00
Norbert de Langen
9f0a4973d6
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	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/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/components/src/addon_panel/__snapshots__/index.stories.storyshot
#	lib/core/package.json
#	lib/ui/package.json
#	yarn.lock
2018-12-17 10:55:19 +01:00
Michael Shilman
abf2c4e125 v4.2.0-alpha.2 2018-12-16 08:36:30 -08:00
Norbert de Langen
628570210d
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	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/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/official-storybook/stories/addon-info.stories.js
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/core/package.json
#	lib/ui/package.json
2018-12-13 09:15:45 +01:00
Michael Shilman
9d23c3dc1a v4.2.0-alpha.1 2018-12-12 17:58:53 -08:00
Michael Shilman
88f0534914 v4.2.0-alpha.0 2018-12-12 17:40:30 -08:00
Michael Shilman
75d45d3d10 v4.1.0 2018-12-12 10:59:49 -08:00
Michael Shilman
de9516f278 v4.1.0-alpha.13 2018-12-12 09:44:10 -08:00
Norbert de Langen
c13b97ecbd Merge pull request #4981 from storybooks/add-core-js-to-addons
Add core-js to addons
2018-12-12 09:31:14 -08:00
Norbert de Langen
2fae294e11
Merge branch 'pr/lifeiscontent/4925' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/cssresources/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/info/src/__snapshots__/index.test.js.snap
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/notes/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/official-storybook/config.js
#	examples/official-storybook/package.json
#	lib/components/package.json
#	lib/components/src/layout/desktop.js
#	lib/components/src/layout/index.js
#	lib/core/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/search_box.js
#	lib/ui/src/modules/ui/components/shortcuts_help.js
#	lib/ui/src/modules/ui/components/stories_panel/__snapshots__/index.stories.storyshot
#	lib/ui/src/modules/ui/components/stories_panel/__snapshots__/text_filter.stories.storyshot
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/__snapshots__/index.stories.storyshot
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/tree_decorators.js
#	package.json
#	yarn.lock
2018-12-12 15:47:20 +01:00
Michael Shilman
4ed93b4baf v4.1.0-alpha.12 2018-12-11 09:27:58 -08:00
Michael Shilman
e6aa2e2cfa v4.1.0-alpha.11 2018-12-11 09:13:40 -08:00
Norbert de Langen
ec82d04797
REFACTOR a11y addon && FIX issues with decorators reloading 2018-12-10 19:27:12 +01:00
Norbert de Langen
a9ee8a5dad
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	.babelrc.js
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/cssresources/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/info/src/components/PropTable.js
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/ondevice-backgrounds/package.json
#	addons/options/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	app/angular/package.json
#	app/ember/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/riot/package.json
#	app/svelte/package.json
#	app/vue/package.json
#	examples/official-storybook/stories/addon-a11y.stories.js
#	examples/official-storybook/stories/addon-actions.stories.js
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/components/src/layout/mobile.js
#	lib/core/package.json
#	lib/core/src/server/common/babel.js
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/index.js
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/tree_decorators_utils.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.js
#	yarn.lock
2018-12-06 16:49:52 +01:00
Michael Shilman
1e9e66bd9d v4.1.0-alpha.11 2018-12-05 11:11:08 -08:00
Aaron Reisman
4ef4c2389a Upgrade emotion@10.0.2 2018-12-04 18:47:58 -08:00
Hypnosphi
6936c27fae Run prettier 2018-12-04 19:54:10 +01:00
Norbert de Langen
18a578477a
SORT packge.json 2018-12-03 12:49:26 +01:00
Michael Shilman
3cd3ae347e v4.1.0-alpha.10 2018-12-01 11:23:45 +08:00
Norbert de Langen
ff383c52dc
WIP - CHANGE dependencies on react & react-dom to regular dependencies
in the manager we ensure there's a single version
2018-11-30 18:10:09 +01:00
Norbert de Langen
aab7aa2cef
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	addons/storyshots/storyshots-core/package.json
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/core/src/client/preview/story_store.js
#	lib/core/src/server/manager/manager-webpack.config.js
#	lib/ui/package.json
#	lib/ui/src/modules/api/configs/init_api.js
#	lib/ui/src/modules/ui/components/menu_item.stories.js
#	lib/ui/src/modules/ui/components/search_box.stories.js
#	lib/ui/src/modules/ui/components/shortcuts_help.stories.js
#	lib/ui/src/modules/ui/components/stories_panel/index.stories.js
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.stories.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.stories.js
2018-11-30 14:03:58 +01:00
Michael Shilman
6b224a2cc6 v4.1.0-alpha.9 2018-11-29 17:48:05 +08:00
Norbert de Langen
efbf470d6a
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	examples/cra-kitchen-sink/.storybook/config.js
#	examples/cra-kitchen-sink/src/stories/index.stories.js
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/components/src/addon_panel/__snapshots__/index.stories.storyshot
#	lib/components/src/header/__snapshots__/header.stories.storyshot
#	lib/components/src/layout/__snapshots__/index.stories.storyshot
#	lib/components/src/theme.js
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/__snapshots__/index.stories.storyshot
#	lib/ui/src/modules/ui/components/stories_panel/__snapshots__/text_filter.stories.storyshot
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/__snapshots__/index.stories.storyshot
#	lib/ui/src/modules/ui/configs/handle_routing.js
#	yarn.lock
2018-11-28 17:01:29 +01:00
Michael Shilman
0833a4b8a9 v4.1.0-alpha.8 2018-11-25 11:00:57 +09:00
Michael Shilman
d507e2edaa v4.1.0-alpha.7 2018-11-22 12:33:15 +08:00
Michael Shilman
c8b9d0d0b4 Reduce jest image size 2018-11-22 12:30:28 +08:00
Michael Shilman
8a9c0db4fd v4.1.0-alpha.6 2018-11-22 12:05:40 +08:00
Michael Shilman
337eac8671 v4.1.0-alpha.5 2018-11-22 11:53:10 +08:00
Michael Shilman
d8dbfcdbb5 v4.1.0-alpha.4 2018-11-21 18:42:38 +08:00
Norbert de Langen
628412ad38
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	addons/storyshots/storyshots-core/package.json
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/ui/package.json
2018-11-16 15:29:29 +01:00
Michael Shilman
ddecb0b7f6 v4.1.0-alpha.3 2018-11-15 22:11:08 +08:00
Norbert de Langen
06dbef4c3c
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	.babelrc
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/core/src/server/config/babel.dev.js
#	lib/ui/package.json
2018-11-14 17:39:20 +01:00
Michael Shilman
cdb9e485eb v4.1.0-alpha.2 2018-11-13 19:33:19 +08:00
Norbert de Langen
13781c39e5 Merge branch 'next' into tech/overhaul-ui 2018-11-08 12:03:03 +01:00
Michael Shilman
253a667e68 v4.1.0-alpha.1 2018-11-06 17:15:42 +08:00
Michael Shilman
627a075c37 v4.1.0-alpha.0 2018-11-06 17:01:48 +08:00
Michael Shilman
0cc22e4b27 v4.0.4 2018-11-06 13:38:03 +08:00
Igor
4bbc479635 Merge pull request #4689 from storybooks/addon-jest/fix-tests-matching
Addons Jest - Fix test matching
2018-11-06 13:04:42 +08:00