258 Commits

Author SHA1 Message Date
hypnos
efb5b7d1a5 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-12-07 02:30:12 +03:00
Dependencies.io Bot
26725ca908 Update nodemon from 1.12.4 to 1.12.5 in app/vue 2017-12-06 19:37:09 +00:00
hypnos
dfd188966f 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/jest/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
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/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-12-05 03:22:47 +03:00
Dependencies.io Bot
0f8e868969 Update vue-template-compiler from 2.5.8 to 2.5.9 in app/vue 2017-12-04 23:37:30 +00:00
Dependencies.io Bot
46b5578655 Update vue from 2.5.8 to 2.5.9 in app/vue 2017-12-04 23:37:17 +00:00
Dependencies.io Bot
2fc52327cc Update nodemon from 1.12.1 to 1.12.4 in app/vue 2017-12-04 23:37:04 +00:00
Dependencies.io Bot
147e3ecbd9 Update webpack from 3.8.1 to 3.10.0 in app/vue 2017-12-04 23:36:50 +00:00
Dependencies.io Bot
62629336e7 Update commander from 2.12.1 to 2.12.2 in app/vue 2017-12-04 23:36:30 +00:00
Dependencies.io Bot
0d1beb1910 Update autoprefixer from 7.1.6 to 7.2.1 in app/vue 2017-12-04 23:36:27 +00:00
Dependencies.io Bot
c8a599b865 Update airbnb-js-shims from 1.3.0 to 1.4.0 in app/vue 2017-12-04 23:36:22 +00:00
Filipp Riabchun
00d60c6040
Merge branch 'master' into react-16.2 2017-12-05 00:55:56 +03:00
Filipp Riabchun
2645a0feb3
Merge branch 'master' into update-deps 2017-12-05 00:47:31 +03:00
Daniel Duan
f10a6639c5
Merge branch 'master' into react-16.2 2017-12-04 11:29:07 -05:00
Max Hodges
0ff007e675
fix typo
spelled vuetify wrong!
2017-12-04 17:41:27 +09:00
Max Hodges
1a5a772a9e
Merge branch 'master' into patch-2 2017-12-04 15:38:00 +09:00
Michael Shilman
2e1fe20fc6 v3.2.17 2017-12-03 11:59:11 -08:00
Max Hodges
36d869ce45
add vue storybook boilerplate
having something like this would have helped me get started much faster. So I'm sharing for others. Includes a layout and composed component with a state toggle story
2017-12-04 02:34:20 +09:00
hypnos
ac81d924f4 Major updates for devDependencies 2017-12-03 15:32:52 +03:00
hypnos
feb942266b Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-29 04:33:51 +03:00
hypnos
c30b010550 Update React to 16.2.0 2017-11-29 04:28:51 +03:00
Dependencies.io Bot
ecfaacb2fc Update webpack-hot-middleware from 2.20.0 to 2.21.0 in app/vue 2017-11-27 16:29:05 +00:00
Dependencies.io Bot
6bbd0c9e90 Update webpack-dev-middleware from 1.12.1 to 1.12.2 in app/vue 2017-11-27 16:27:59 +00:00
hypnos
78c53c4ebc Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-25 01:08:09 +03:00
Dependencies.io Bot
670ae1bc19 Update postcss-loader from 2.0.8 to 2.0.9 in app/vue 2017-11-24 19:58:22 +00:00
Dependencies.io Bot
01736f5817 Update common-tags from 1.4.0 to 1.5.1 in app/vue 2017-11-24 19:57:03 +00:00
hypnos
1dd0024cb0 Test styles directly instead of using snapshots 2017-11-24 02:54:36 +03:00
Dependencies.io Bot
96ee7df9a4 Update webpack-dev-middleware from 1.12.0 to 1.12.1 in app/vue 2017-11-23 16:37:40 +00:00
Dependencies.io Bot
45696bf34c Update commander from 2.11.0 to 2.12.1 in app/vue 2017-11-23 16:36:13 +00:00
Michael Shilman
5022705708 Merge branch 'release/3.3' of github.com:storybooks/storybook into release/3.3 2017-11-22 03:29:00 -08:00
hypnos
9c3ec0aa6d Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-22 14:17:16 +03:00
Michael Shilman
3c1715daca v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
Roberto Wesley Overdijk
2462dcc7ed
Merge branch 'master' into patch-1 2017-11-22 10:19:55 +01:00
Tom Coleman
6638f5cfb7 Save the preview frame URL as the story changes.
Sometimes when there are problems with HMR, we end up doing a
hard-reload of the preview iframe, whilst leaving the main window.

As the preview iframe didn't change its URL ever, this led to problems
where the old (usually original) story was loaded in such circumstances.

See #614 and #1328
2017-11-22 17:11:12 +11:00
hypnos
462a8d9425 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-11-21 21:32:38 +03:00
Roberto Wesley Overdijk
525b43a424
Add DotEnv dep 2017-11-21 18:52:29 +01:00
Roberto Wesley Overdijk
6fe7b4b824
add support for .env files
Add DotEnv for webpack
2017-11-21 18:49:44 +01:00
Dependencies.io Bot
bdf771eaa4 Update vue-template-compiler from 2.5.6 to 2.5.8 in app/vue 2017-11-21 16:29:24 +00:00
Dependencies.io Bot
39f01799ab Update vue from 2.5.6 to 2.5.8 in app/vue 2017-11-21 16:27:57 +00:00
Filipp Riabchun
c7a2a9be26
Merge branch 'master' into release/3.3 2017-11-20 01:01:16 +03:00
Dependencies.io Bot
0e083da64f Update vue-template-compiler from 2.5.5 to 2.5.6 in app/vue 2017-11-19 16:31:29 +00:00
Dependencies.io Bot
393ab51f25 Update vue from 2.5.5 to 2.5.6 in app/vue 2017-11-19 16:30:13 +00:00
Hypnosphi
83d76e4536 Merge remote-tracking branch 'origin/master' into release/3.3 2017-11-17 21:17:28 +03:00
Dependencies.io Bot
e111d45afb Update vue-template-compiler from 2.5.3 to 2.5.5 in app/vue 2017-11-17 17:49:44 +00:00
Dependencies.io Bot
e5499fe719 Update vue from 2.5.3 to 2.5.5 in app/vue 2017-11-17 17:48:07 +00:00
Dependencies.io Bot
2e0f72264d Update vue-hot-reload-api from 2.2.3 to 2.2.4 in app/vue 2017-11-17 17:46:35 +00:00
Michael Shilman
7a6c901d71 v3.2.16 2017-11-15 18:03:04 -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
f3d0827695 Add support for markdown to jest, vue, react native, and angular 2017-11-13 23:06:01 -05:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00