268 Commits

Author SHA1 Message Date
hypnos
fd33faddc3 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lerna.json
2017-11-22 19:35:57 +03:00
Dependencies.io Bot
b60b5e8eb2 Update gatsby from 1.9.118 to 1.9.119 2017-11-22 16:21:51 +00:00
Filipp Riabchun
c7a2a9be26
Merge branch 'master' into release/3.3 2017-11-20 01:01:16 +03:00
Dependencies.io Bot
7116200307 Update gatsby from 1.9.117 to 1.9.118 2017-11-19 16:21:15 +00:00
hypnos
5a008b35f6 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-19 02:23:52 +03:00
Dependencies.io Bot
fc41780ee4 Update gh-pages from 1.0.0 to 1.1.0 2017-11-18 16:22:58 +00:00
Dependencies.io Bot
cc611d83e9 Update gatsby from 1.9.114 to 1.9.117 2017-11-18 16:21:18 +00:00
Filipp Riabchun
8fa897e19d
Merge branch 'master' into release/3.3 2017-11-17 19:37:05 +03:00
Dependencies.io Bot
2a86cc27dc Update gatsby from 1.9.112 to 1.9.114 2017-11-17 16:28:45 +00:00
Filipp Riabchun
b0ba40e129
Merge branch 'master' into release/3.3 2017-11-16 23:31:47 +03:00
Jason Won
5f1552b5e6
Add import to webpack extends example 2017-11-16 11:42:03 -08:00
hypnos
fca9ed2b1c Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/a11y/package.json
#	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-16 22:21:35 +03:00
Dependencies.io Bot
8dfa9311e2 Update @storybook/react from 3.2.15 to 3.2.16 2017-11-16 16:30:46 +00:00
Dependencies.io Bot
21b78e0a07 Update @storybook/addons from 3.2.15 to 3.2.16 2017-11-16 16:28:31 +00:00
Dependencies.io Bot
5e0a15992b Update @storybook/addon-links from 3.2.15 to 3.2.16 2017-11-16 16:26:09 +00:00
Dependencies.io Bot
39d460ac71 Update @storybook/addon-actions from 3.2.15 to 3.2.16 2017-11-16 16:24:36 +00:00
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