456 Commits

Author SHA1 Message Date
Norbert de Langen
fef21c26a7
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/jest/src/register.js
#	addons/knobs/src/components/types/Array.js
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/storyshots/storyshots-core/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/components/src/layout/desktop.js
#	lib/ui/package.json
#	lib/ui/src/modules/api/actions/api.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.js
#	lib/ui/src/modules/ui/components/stories_panel/index.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js
#	lib/ui/src/modules/ui/containers/header.js
#	lib/ui/src/modules/ui/containers/layout.js
#	lib/ui/src/modules/ui/libs/filters.js
#	yarn.lock
2018-10-11 11:21:31 +02:00
Heather Roberts
8674a24484 Merge branch 'tech/overhaul-ui' of https://github.com/storybooks/storybook into tech/overhaul-ui 2018-10-11 18:25:35 +11:00
Heather Roberts
30bffe6740 Use SyntaxHighlighter component when encountering any code in markdown in notes addon
Instead of converting markdown to an html string, use markdown-to-jsx library to convert the markdown directly into react elements, using our SyntaxHighlighter component in place of any code elements
2018-10-11 17:47:58 +11:00
Gabriel J. Csapo
3c4a5e36c6 [addons] adds new toolbar component for backgrounds, adds accessibility titles, cleans up notes 2018-10-10 23:45:46 -07:00
Gabriel J. Csapo
9c6df49645 [addons] generalize add from addons so that we can add panels, tool, etc without reworking the provider 2018-10-10 21:48:31 -07:00
Norbert de Langen
41483e2160
UPGRADES 2018-10-10 22:23:35 +02:00
Michael Shilman
bdc8120ab9 v4.0.0-alpha.24 2018-10-04 01:24:20 -07:00
Norbert de Langen
444a06bf1b
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.js
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/tree_decorators.js
#	package.json
#	yarn.lock
2018-09-27 15:23:54 +02:00
Jan Melcher
6cc25b6d16
Fix how markdownOptions are passed to marked
Previously, the options have been passed as property "options" within the actual options object, which is ignored by marked.

Also, using the parameter of marked instead of setOptions to avoid global state.
2018-09-27 14:16:03 +02:00
Michael Shilman
2ca9c34c4c v4.0.0-alpha.23 2018-09-25 15:40:49 -07:00
Pavan Kumar Sunkara
8c34f168cf Upgrade deps dealing with license issues 2018-09-25 23:08:33 +02:00
Norbert de Langen
b8e1859b11
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	lib/channel-websocket/package.json
#	lib/core/src/server/templates/base-manager-head.html
#	lib/core/src/server/templates/base-preview-head.html
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/search_box.js
#	lib/ui/src/modules/ui/components/shortcuts_help.js
#	yarn.lock
2018-09-22 00:53:51 +02:00
Norbert de Langen
3a91ab3275
FIX popout & menu && ADD multiple colorvision deficiencies options && ADD icon to notification
&& FIX settings/about route
&& FIX panel stories
&& REMOVE the asideStripe
2018-09-22 00:39:13 +02:00
Michael Shilman
5112b52004 v4.0.0-alpha.22 2018-09-19 14:00:53 -07:00
Pavan Kumar Sunkara
84fd7939f7 Added publishConfig.access = public to all packages we are publishing 2018-09-19 18:24:32 +02:00
Norbert de Langen
49f0e0fd0d
WIP ADD mains functionality: tabs in the preview toolbar 2018-09-18 14:43:14 +02:00
Norbert de Langen
625162455d
FIX errors display && REFACTOR addons to sync naming conventions && CHANGE to use addParameters for setOptions && FIX eslint 2018-09-12 19:31:40 +02:00
Norbert de Langen
fd8fc2ba2e
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/options/README.md
#	lib/components/package.json
#	lib/core/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/api/actions/api.js
#	lib/ui/src/modules/api/actions/api.test.js
#	lib/ui/src/modules/api/index.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.test.js
#	lib/ui/src/modules/shortcuts/index.js
#	yarn.lock
2018-09-11 16:53:05 +02:00
Michael Shilman
729607334c v4.0.0-alpha.21 2018-09-07 10:17:06 -07:00
Norbert de Langen
46df3ea9f6
Merge commit 'a2a2a914275296f5776b92cd36d45811a5b377d3' into tech/overhaul-ui
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/actions/src/components/ActionLogger/index.js
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/events/src/components/Event.js
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/notes/package.json
#	addons/viewport/package.json
#	app/react/package.json
#	docs/src/pages/addons/writing-addons/index.md
#	examples/official-storybook/package.json
#	lib/components/package.json
#	lib/components/src/explorer/__tests__/tree_header.test.js
#	lib/components/src/explorer/search_box.js
#	lib/components/src/explorer/tree.js
#	lib/components/src/form/field.js
#	lib/components/src/layout/desktop.js
#	lib/components/src/layout/dimensions.js
#	lib/components/src/layout/index.js
#	lib/components/src/layout/mobile.js
#	lib/components/src/tabs/tabs.js
#	lib/core/package.json
#	lib/core/src/client/manager/preview.js
#	lib/ui/package.json
#	lib/ui/src/components/stories_panel/index.js
#	lib/ui/src/modules/ui/components/shortcuts_help.js
#	package.json
#	yarn.lock
2018-09-03 17:27:52 +02:00
Michael Shilman
620dc75db0 v4.0.0-alpha.20 2018-08-31 15:58:57 -07:00
Michael Shilman
caaf1aa090 v4.0.0-alpha.19 2018-08-31 14:46:16 -07:00
Norbert de Langen
c1c5eed80d
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/backgrounds/src/BackgroundPanel.js
#	lib/core/package.json
#	yarn.lock
2018-08-31 15:45:36 +02:00
Norbert de Langen
8583e73251
UPGRADE to latest && FIX snapshots && FIX tests 2018-08-31 14:18:59 +02:00
Norbert de Langen
7a4454c8b0
UPGRADE to emotion 10 && UPGRADE universal-dotenv 2018-08-31 12:18:01 +02:00
Norbert de Langen
00bead99ed
UPGRADE dependencies 2018-08-27 09:11:56 +02:00
Michael Shilman
324da43c22 v4.0.0-alpha.18 2018-08-25 13:57:15 -07:00
Norbert de Langen
bbb08ae67e
UPGRADE to emotion 10 2018-08-25 20:13:28 +02:00
Michael Shilman
3a470c6ea8 v4.0.0-alpha.17 2018-08-24 11:40:14 -07:00
Norbert de Langen
b7e1c10778
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	.babelrc
#	lib/components/src/layout/__snapshots__/index.stories.storyshot
#	lib/core/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/__snapshots__/index.stories.storyshot
#	lib/ui/src/modules/ui/configs/handle_routing.test.js
#	lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
#	yarn.lock
2018-08-23 22:54:45 +02:00
Norbert de Langen
a039c96426
Merge branch 'master' into babel-7
# Conflicts:
#	MIGRATION.md
#	addons/backgrounds/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/links/package.json
#	addons/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/angular/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/angular-cli/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/html-kitchen-sink/package.json
#	examples/marko-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
#	examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
#	examples/polymer-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	jest.config.js
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/codemod/package.json
#	lib/components/src/layout/__snapshots__/index.stories.storyshot
#	lib/core/package.json
#	lib/core/src/server/config/webpack.config.prod.js
#	package.json
#	yarn.lock
2018-08-15 00:01:36 +02:00
Norbert de Langen
68c1664ec9
WIP 2018-08-11 01:40:24 +02:00
Michael Shilman
52f0bc687a v4.0.0-alpha.16 2018-08-06 22:25:51 +08:00
Norbert de Langen
947e9bad62
UPGRADE all minor dependencies 2018-08-04 00:41:08 +02:00
Michael Shilman
819ff14255 v4.0.0-alpha.15 2018-08-03 17:56:23 +08:00
igor-dv
6ee44ad4d5 Remove badges from the inner READMEs 2018-07-31 19:34:05 +03:00
Norbert de Langen
ba544ef8e1
Merge branch 'master' into babel-7
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/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/angular/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/html-kitchen-sink/package.json
#	examples/marko-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/vue-kitchen-sink/package.json
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_native/package.json
#	lib/cli/test/snapshots/react_native_scripts/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/core/package.json
#	yarn.lock
2018-07-16 10:57:17 -07:00
Michael Shilman
e5e1e3aff8 v4.0.0-alpha.14 2018-07-11 17:13:57 -07:00
Michael Shilman
681869bfcd v4.0.0-alpha.13 2018-07-09 21:31:07 -07:00
Hypnosphi
b6153d1034 Merge master 2018-07-04 17:45:57 +03:00
Tom Coleman
aa8a421907 Added allowDeprecatedUsage option to makeDecorator
(and enable it for all existing addons)
2018-07-04 15:56:17 +10:00
Michael Shilman
a14a8e4a9a v4.0.0-alpha.12 2018-07-03 15:58:21 -07:00
Michael Shilman
9a872790a2 v4.0.0-alpha.11 2018-07-02 11:14:04 -07:00
Norbert de Langen
c626f54508
Merge branch 'master' into feature/theming 2018-06-21 17:28:44 +02:00
Michael Shilman
4e70f9d192 v4.0.0-alpha.10 2018-06-21 21:48:49 +08:00
Hypnosphi
73dc63bb67 Update dependencies 2018-06-20 13:50:17 +03:00
Norbert de Langen
ed9606708f
Merge branch 'master' into feature/theming
# Conflicts:
#	app/marko/package.json
#	lib/addons/package.json
#	lib/ui/package.json
#	yarn.lock
2018-06-13 19:10:56 +02:00
Michael Shilman
1a03042590 v4.0.0-alpha.9 2018-06-10 15:42:04 +08:00
Keraito
ddc4e71fc2 Remove linebreaks in notes text when it are html elements 2018-06-07 15:43:50 +02:00
Norbert de Langen
b2c3d90eba
Merge branch 'master' into feature/theming 2018-06-03 23:12:09 +02:00