95 Commits

Author	SHA1	Message	Date
Michael Shilman	3c1715daca	v3.3.0-alpha.4	2017-11-22 03:15:31 -08:00
Norbert de Langen	cdcecb6a78	Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react	2017-11-15 22:44:56 +01:00
Norbert de Langen	e8c8f33f97	Merge branch 'master' into release/3.3 ... # Conflicts: # addons/comments/package.json # addons/links/package.json # addons/storyshots/package.json # examples/cra-kitchen-sink/.storybook/addons.js # examples/cra-kitchen-sink/package.json # examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot # yarn.lock	2017-11-15 19:40:55 +01:00
Dan Green	9621521d8b	Added better documentation for using markdown	2017-11-15 09:16:14 -05:00
Dan Green	83e016f293	Added markdown example to withNotes addon ... Fixed withNotes addon example to use proper JSX (self closing element)	2017-11-14 19:06:46 -05:00
hypnos	091e1ab70e	Remove packages' devDependencies that duplicate the root ones	2017-11-14 02:36:07 +03:00
hypnos	8c8b35a2d2	Merge remote-tracking branch 'origin/master' into release/3.3 ... # Conflicts: # CHANGELOG.md # addons/actions/package.json # addons/background/package.json # addons/centered/package.json # addons/comments/package.json # addons/events/package.json # addons/graphql/package.json # addons/info/package.json # addons/knobs/package.json # addons/links/package.json # addons/notes/package.json # addons/options/package.json # addons/storyshots/package.json # app/react-native/package.json # app/react/package.json # app/vue/package.json # lerna.json # lib/addons/package.json # lib/channel-postmessage/package.json # lib/channel-websocket/package.json # lib/channels/package.json # lib/cli/package.json # lib/codemod/package.json # lib/components/package.json # lib/ui/package.json # yarn.lock	2017-11-11 03:24:39 +03:00
hypnos	0c4ef51fc5	Update React to 16.1.0	2017-11-10 19:58:38 +03:00
Michael Shilman	0be4efcec8	v3.2.15	2017-11-10 11:39:27 +09:00
Norbert de Langen	cf054ad1b3	Merge branch 'master' into release/3.3 ... # Conflicts: # addons/comments/package.json # addons/knobs/package.json # addons/knobs/src/components/types/Array.js # examples/cra-kitchen-sink/package.json # package.json # yarn.lock	2017-11-07 09:33:30 +01:00
Michael Shilman	1a6082a4ad	v3.3.0-alpha.3	2017-11-07 12:56:56 +09:00
hypnos	971ac96f9a	Update devDependencies	2017-11-05 03:07:18 +03:00
hypnos	bb97feaa33	Merge remote-tracking branch 'origin/master' into release/3.3 ... # Conflicts: # addons/comments/package.json # addons/knobs/package.json # addons/storyshots/src/index.js # yarn.lock	2017-11-03 22:33:56 +03:00
hypnos	5454dbb3cc	Remove stale git-url-parse dependency ... (cherry picked from commit 5b86a36)	2017-11-03 04:21:08 +03:00
hypnos	541bdbcb43	Revert "Remove stale git-url-parse dependency" ... This reverts commit 5b86a36	2017-11-03 04:20:30 +03:00
hypnos	5b86a369c7	Remove stale git-url-parse dependency	2017-11-03 04:18:17 +03:00
Michael Shilman	f15eaa6a68	v3.2.14	2017-11-01 16:21:34 +09:00
Norbert de Langen	effe2ee84b	Merge branch 'master' into release/3.3 ... # Conflicts: # app/react-native/readme.md # examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot # examples/cra-kitchen-sink/src/stories/index.js # examples/crna-kitchen-sink/package.json # integration/__image_snapshots__/cra-kitchen-sink-snap.png # integration/__image_snapshots__/vue-kitchen-sink-snap.png # yarn.lock	2017-10-31 23:26:48 +01:00
Daniel Duan	9527f5cba9	Merge branch 'master' into dd/changelo	2017-10-30 11:00:52 -04:00
Daniel Duan	190d960497	document deprecated API	2017-10-29 15:15:04 -04:00
Daniel Duan	a4dff5fdd9	#1557 getting rid of old change logs	2017-10-28 19:20:35 -04:00
Norbert de Langen	254e52f8f2	Merge branch 'master' into release/3.3	2017-10-23 16:42:06 +02:00
Norbert de Langen	df7bddc484	Update README.md	2017-10-23 15:59:17 +02:00
Michael Shilman	a701365e70	v3.2.13	2017-10-20 21:44:34 +02:00
Michael Shilman	b577ddd543	v3.3.0-alpha.2	2017-10-03 22:10:15 +02:00
Michael Shilman	3f97c6f175	v3.2.12	2017-10-03 00:29:46 +02:00
Michael Shilman	5030ee196c	v3.3.0-alpha.1	2017-10-02 20:57:35 +02:00
Michael Shilman	70825cb2dc	resolve conflicts merging master into release/3.3	2017-10-02 20:20:10 +02:00
hypnos	2e8240d176	Fix/suppress current eslint warnings. ... Raise `import/no-unresolved` and `import/extensions` to error level everywhere except `docs`	2017-10-02 01:40:46 +03:00
Norbert de Langen	a270216e96	Merge branch 'master' into release/3.3 ... # Conflicts: # CONTRIBUTING.md # addons/actions/package.json # addons/comments/package.json # addons/events/package.json # addons/info/package.json # addons/knobs/package.json # addons/links/package.json # addons/notes/package.json # addons/storyshots/package.json # app/react-native/package.json # app/react/package.json # app/vue/package.json # dependencies.yml # examples/cra-kitchen-sink/package.json # examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot # examples/crna-kitchen-sink/package.json # examples/react-native-vanilla/package.json # lib/ui/package.json # lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js # yarn.lock	2017-09-30 23:19:44 +02:00
Filipp Riabchun	f152c0dcb6	Merge branch 'master' into ndelangen/upgrade-react	2017-09-30 06:21:30 -07:00
Norbert de Langen	02c6198a8b	UPGRADE react & friends && UPGRADE other dependencies	2017-09-29 23:36:38 +02:00
hypnos	2f53feb64a	Use yarn workspaces on master	2017-09-29 23:00:47 +03:00
Michael Shilman	748e5959ec	v3.2.10	2017-09-22 22:42:13 +01:00
hypnos	824bbd6a6d	Replace the deprecated prepublish script with prepare	2017-09-08 03:19:39 +03:00
Michael Shilman	94723262d9	v3.3.0-alpha.0	2017-09-06 13:46:17 -07:00
Michael Shilman	c6a690e037	v3.2.7	2017-08-23 09:23:41 -07:00
hypnos	0e33495a95	Merge remote-tracking branch 'upstream/master' into stricter-lint-imports ... # Conflicts: # examples/crna-kitchen-sink/storybook/stories/Button/index.android.js # examples/crna-kitchen-sink/storybook/stories/Button/index.ios.js # examples/crna-kitchen-sink/storybook/stories/CenterView/index.js # examples/crna-kitchen-sink/storybook/stories/Welcome/index.js # examples/react-native-vanilla/storybook/stories/Button/index.android.js # examples/react-native-vanilla/storybook/stories/Button/index.ios.js # examples/react-native-vanilla/storybook/stories/CenterView/index.js # examples/react-native-vanilla/storybook/stories/Welcome/index.js # lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js # lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js # lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js # lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js	2017-08-22 23:23:25 +03:00
Michael Shilman	a3647be4a6	v3.2.6	2017-08-22 11:02:17 -07:00
Filipp Riabchun	88ef5b2171	Merge branch 'master' into stricter-lint-imports	2017-08-22 12:50:25 +03:00
Michael Shilman	c21a88b47a	v3.2.6-alpha.0	2017-08-22 00:31:44 -07:00
hypnos	cb92897063	Promote no-extraneous-dependencies to error level and make it pass	2017-08-18 04:35:25 +03:00
Michael Shilman	8e03aacb68	v3.2.0	2017-07-31 07:12:08 -07:00
Michael Shilman	fe0b43ca85	v3.2.0-alpha.13	2017-07-30 17:19:13 -07:00
Michael Shilman	1810a98153	Respond to review comments and update addon-info README	2017-07-28 09:17:39 -07:00
Michael Shilman	a50a8e874a	Refactoring of withX wrappers withNotes and withInfo ... - make signatures consistent - make string-only variant of withNotes/withInfo - simplify withInfo code	2017-07-28 01:34:14 -07:00
Michael Shilman	0188ace87f	v3.2.0-alpha.10	2017-07-27 01:06:54 -07:00
Tom Coleman	ea02ddd4e4	Revert addonNotes -> withNotes	2017-07-27 12:11:58 +10:00
Norbert de Langen	de75c5df89	Merge branch 'master' into release/3.2	2017-07-25 22:34:27 +02:00
Norbert de Langen	c11c189d7e	UPDATE everything (including eslint 4)	2017-07-25 11:20:08 +02:00