225 Commits

Author SHA1 Message Date
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
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
Norbert de Langen
407cc67355
Merge pull request #3560 from GeorgeWL/patch-1
Add links to stable docs
2018-06-03 23:10:45 +02:00
Norbert de Langen
c49dff9983
CLEANUP remove redundant dependencies 2018-06-02 02:14:58 +02:00
Norbert de Langen
407369ba7e
FIX addon-notes so stateful containers always renders 2018-05-31 00:45:59 +02:00
Norbert de Langen
2a49259d62
Merge branch 'master' into feature/theming 2018-05-28 00:07:30 +02:00
Michael Shilman
6a1f5e4675 v4.0.0-alpha.8 2018-05-26 18:47:25 -07:00
Hypnosphi
49d6a2efdf Fix lint 2018-05-25 23:25:05 +03:00
Filipp Riabchun
e9f2f04ac1
Merge branch 'master' into addon-notes-className 2018-05-25 22:41:18 +03:00
Norbert de Langen
af506f2e1b
Merge branch 'master' into feature/theming 2018-05-24 07:44:06 +02:00
Dependencies.io Bot
4219482897 Update marked from 0.3.19 to 0.4.0 in addons/notes 2018-05-22 21:22:13 +00:00
Norbert de Langen
ee4a416422
REFACTOR consolidate Tabs component && CHANGE registerAddon api to include a active prop 2018-05-22 22:26:39 +02:00
Jeff Baumgardt
3478d2d6c2 Add a class name to the addons-notes. This is wanted to target the notes container with styles since paragraph text has margin and notes is transforming new lines to <br /> making for a very long file with tons of white space. 2018-05-21 16:27:18 -06:00
Norbert de Langen
43279a3076
Merge branch 'master' into feature/more-components 2018-05-18 13:38:51 +02:00
Michael Shilman
008414bc47 v4.0.0-alpha.7 2018-05-17 16:02:57 -07:00
Norbert de Langen
3925f5a09f
CHANGE package.json files so they are sorted nicely 2018-05-17 01:05:18 +02:00
Norbert de Langen
3b517a7b90
REFACTOR notes to use emotion for styling 2018-05-16 09:01:00 +02:00
Norbert de Langen
359f12ce8f
Merge branch 'master' into feature/more-components
# Conflicts:
#	addons/knobs/src/components/Panel.js
#	addons/knobs/src/react/WrapStory.js
2018-05-16 08:44:55 +02:00
Norbert de Langen
5eec2c8689
FIX styling issue in storysource addon && CLEANUP && ADD emotion-theming 2018-05-15 23:52:57 +02:00
Tom Coleman
a2e57cf7d6 Added skipIfNoParametersOrOptions argument to makeDecorator 2018-05-15 14:37:38 +10:00
Tom Coleman
de1c65c482 Merge remote-tracking branch 'origin/master' into tmeasday/refactor-transitional-decorator 2018-05-15 13:26:18 +10:00
Tom Coleman
199098ccb0 Rename to makeDecorator 2018-05-15 13:18:20 +10:00
Tom Coleman
15c2ed84e7 Fix addon-notes test 2018-05-14 17:36:20 +10:00
Michael Shilman
369e7204a6 v4.0.0-alpha.6 2018-05-12 13:32:30 -07:00
Michael Shilman
ca8d96d6d5 v4.0.0-alpha.5 2018-05-12 13:26:33 -07:00
Mikhail Vasin
eb28ae6dbe
Fix typo 2018-05-09 14:11:17 +03:00
George W Langham
9b4c62df76
Update README.md
note
2018-05-08 14:38:00 +01:00
Tom Coleman
98a99b5c2f Refactor transitional decorator from addon-notes
This should make it easy to transitional other addons to a parameter-based style
2018-05-08 21:07:19 +10:00
Filipp Riabchun
06e777cd11
Merge branch 'master' into import-external-md 2018-04-30 23:06:57 +03:00
Keraito
c00f0aa0a2 Combine inline and external md example 2018-04-30 21:46:09 +02:00
Keraito
9cffb48ae6 Update commas in examples 2018-04-30 20:02:01 +02:00
Keraito
dc1d195ae4 Update the examples of handling markdown in notes addon 2018-04-30 17:53:39 +02:00
Michael Shilman
f2a30fae10 v4.0.0-alpha.4 2018-04-27 12:44:14 -07:00