252 Commits

Author SHA1 Message Date
Dan Green
dafe0313f5 Merge branch 'add-support-for-importing-markdown-in-storybook-react' of https://github.com/storybooks/storybook into add-support-for-importing-markdown-in-storybook-react 2017-11-15 18:55:51 -05:00
Dan Green
79b05fed29 Fixed a type 2017-11-15 18:55:40 -05:00
Norbert de Langen
369b8e6fd3
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react 2017-11-15 22:48:12 +01: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
Filipp Riabchun
ee23db022f
Merge branch 'master' into release/3.3 2017-11-15 23:02:54 +03: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
Dependencies.io Bot
33be29e5c3 Update gatsby-remark-images from 1.5.31 to 1.5.32 2017-11-15 16:28:45 +00:00
Dependencies.io Bot
a481215405 Update gatsby-plugin-sharp from 1.6.20 to 1.6.21 2017-11-15 16:26:20 +00:00
Dependencies.io Bot
44807e47f8 Update gatsby-link from 1.6.27 to 1.6.28 2017-11-15 16:23:59 +00:00
Dan Green
9621521d8b Added better documentation for using markdown 2017-11-15 09:16:14 -05:00
Dependencies.io Bot
0d7524a296 Update gatsby-transformer-remark from 1.7.20 to 1.7.21 2017-11-14 16:28:45 +00:00
Dependencies.io Bot
e5c2afc964 Update gatsby-remark-copy-linked-files from 1.5.20 to 1.5.21 2017-11-14 16:26:47 +00:00
Dependencies.io Bot
d5e90eb8ca Update gatsby-link from 1.6.26 to 1.6.27 2017-11-14 16:24:46 +00:00
Dependencies.io Bot
4cd574353b Update gatsby from 1.9.108 to 1.9.112 2017-11-14 16:23:12 +00:00
Dependencies.io Bot
91a698600f Update gatsby-transformer-remark from 1.7.19 to 1.7.20 2017-11-12 09:35:19 +00:00
Dependencies.io Bot
fa06c045dc Update gatsby-source-filesystem from 1.5.7 to 1.5.8 2017-11-12 09:33:52 +00:00
Dependencies.io Bot
3f3e17d359 Update gatsby-remark-images from 1.5.30 to 1.5.31 2017-11-12 09:32:13 +00:00
Dependencies.io Bot
0962c12f26 Update gatsby-remark-copy-linked-files from 1.5.16 to 1.5.20 2017-11-12 09:30:31 +00:00
Dependencies.io Bot
187f521951 Update gatsby-remark-autolink-headers from 1.4.7 to 1.4.8 2017-11-12 09:28:51 +00:00
Dependencies.io Bot
ae0675ef56 Update gatsby-plugin-sharp from 1.6.19 to 1.6.20 2017-11-12 09:27:07 +00:00
Dependencies.io Bot
0dac0a89bc Update gatsby-link from 1.6.24 to 1.6.26 2017-11-12 09:25:18 +00:00
Dependencies.io Bot
a8b14fb825 Update gatsby from 1.9.100 to 1.9.108 2017-11-12 09:24:04 +00: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
5aeaeda049 Merge remote-tracking branch 'origin/master' into update-docs-deps
# Conflicts:
#	docs/package.json
#	docs/yarn.lock
2017-11-10 22:14:52 +03:00
Dependencies.io Bot
53f066a6ae Update @storybook/react from 3.2.13 to 3.2.15 2017-11-10 16:25:41 +00:00
Dependencies.io Bot
ead895cfdf Update @storybook/addons from 3.2.13 to 3.2.15 2017-11-10 16:24:31 +00:00
Dependencies.io Bot
0b77be9a3d Update @storybook/addon-links from 3.2.13 to 3.2.15 2017-11-10 16:23:11 +00:00
Dependencies.io Bot
5bdfb7b34a Update @storybook/addon-actions from 3.2.13 to 3.2.15 2017-11-10 16:21:52 +00:00
Michael Shilman
50dc2f1c13 Minor formatting fixes to FAQ 2017-11-10 11:58:43 +09:00
hypnos
e64a224717 Move to react-router@4 & fix storybook 2017-11-05 01:59:04 +03:00
hypnos
6b6dad7cff Remove unused packages 2017-11-04 21:29:19 +03:00
hypnos
88c0820bf4 Remove unused packages 2017-11-04 17:07:40 +03:00
hypnos
6f1305aadf Finalize move to gatsby@1 2017-11-04 06:03:35 +03:00
hypnos
443a14bbb5 Initial move to gatsby@1 2017-11-04 02:56:31 +03:00
Norbert de Langen
f20d8603b1
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/src/manager/components/CommentItem/index.js
#	addons/comments/src/manager/containers/CommentsPanel/dataStore.js
#	addons/comments/src/manager/containers/CommentsPanel/index.js
#	addons/info/src/components/PropTable.js
#	lib/cli/bin/generate.js
#	lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
#	lib/ui/src/modules/ui/components/addon_panel/index.test.js
#	scripts/test.js
2017-11-03 00:43:42 +01:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03:00
Filipp Riabchun
40776bfb82
Merge branch 'master' into release/3.3 2017-11-01 07:20:12 +03:00
mccullochk
7843994031 Change README to match package.json scripts 2017-10-31 20:53:34 -07: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
c8c7e343f2
Update index.md 2017-10-31 12:03:36 -04:00
Daniel Duan
0a8e9d706c
#916 mention -g is for running cli tool 2017-10-31 11:55:59 -04:00
Michael Shilman
37a437fe61 Feature Wix example in docs 2017-10-31 22:20:14 +09:00
Chad Fawcett
6398811413 Change 'is' to 'these' 2017-10-30 16:49:28 -07:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
gkrafsig
171da12dd4 Updating to new favicon 2017-10-22 20:42:55 -04:00
hypnos
059835eb2d Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-22 22:51:34 +03:00
hypnos
8ebb179007 Merge remote-tracking branch 'remotes/origin/@storybook/react-3.2.13-33.1.0' into dependencies.io-update-build-33.0.0 2017-10-21 16:09:16 +03:00
hypnos
7107941197 Merge 2017-10-21 16:05:48 +03:00
hypnos
dcdc445699 Merge 2017-10-21 16:01:25 +03:00
Dependencies.io Bot
efb5d88c98 Update @storybook/react from 3.2.12 to 3.2.13 2017-10-21 12:44:45 +00:00