5103 Commits

Author SHA1 Message Date
hypnos
fcd4ed48f2 Merge remote-tracking branch 'origin/vue-hot-reload-api-2.2.0-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:44:43 +03:00
hypnos
ff6ae8fdc5 Merge remote-tracking branch 'origin/vue-hot-reload-api-2.2.0-23.0.0-app--vue' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	app/vue/package.json
2017-10-13 21:44:26 +03:00
hypnos
d1c71021f2 Merge remote-tracking branch 'origin/vue-2.5.1-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:44:05 +03:00
hypnos
480eb19182 Merge remote-tracking branch 'origin/vue-2.5.1-23.0.0-addons--knobs' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:43:52 +03:00
Dependencies.io Bot
d888a9b0b5 Update vue-template-compiler from 2.4.4 to 2.5.1 in examples/vue-kitchen-sink 2017-10-13 16:36:16 +00:00
Dependencies.io Bot
9ff8628dd7 Update vue-hot-reload-api from 2.1.0 to 2.2.0 in examples/vue-kitchen-sink 2017-10-13 16:34:53 +00:00
Dependencies.io Bot
17002cd051 Update vuex from 2.4.1 to 2.5.0 in examples/vue-kitchen-sink 2017-10-13 16:33:29 +00:00
Dependencies.io Bot
36c8b7559e Update vue from 2.4.4 to 2.5.1 in examples/vue-kitchen-sink 2017-10-13 16:32:07 +00:00
Dependencies.io Bot
c11b1b515d Update vue-template-compiler from 2.4.4 to 2.5.1 in app/vue 2017-10-13 16:30:40 +00:00
Dependencies.io Bot
ec813adc47 Update vue-hot-reload-api from 2.1.1 to 2.2.0 in app/vue 2017-10-13 16:29:12 +00:00
Dependencies.io Bot
66d082ace4 Update vue from 2.4.4 to 2.5.1 in app/vue 2017-10-13 16:27:45 +00:00
Dependencies.io Bot
e3b0cd57a4 Update vue from 2.4.4 to 2.5.1 in addons/knobs 2017-10-13 16:26:13 +00:00
Filipp Riabchun
1575faec63 Merge pull request #2027 from storybooks/webpack-3.7.1-22.0.0-app--react-native
Update webpack from 3.6.0 to 3.7.1 in app/react-native
2017-10-13 00:02:52 +02:00
Dependencies.io Bot
7bd276b2d2 Update webpack from 3.6.0 to 3.7.1 in app/react 2017-10-12 23:50:20 +02:00
Filipp Riabchun
7fc9421fee Merge branch 'master' into webpack-3.7.1-22.0.0-app--react-native 2017-10-12 23:49:17 +02:00
Daniel Duan
344d4eeeee Merge pull request #1977 from brekk/patch-1
Update addons channel description.
2017-10-12 14:02:30 -04:00
Daniel Duan
62af96110d Merge branch 'master' into patch-1 2017-10-12 13:45:41 -04:00
Daniel Duan
6dc44246fd Merge pull request #2026 from storybooks/moment-2.19.1-22.0.0-addons--knobs
Update moment from 2.19.0 to 2.19.1 in addons/knobs
2017-10-12 13:43:35 -04:00
Dependencies.io Bot
87f4eff357 Update webpack from 3.6.0 to 3.7.1 in app/react-native 2017-10-12 16:24:13 +00:00
Dependencies.io Bot
655bd73ecd Update moment from 2.19.0 to 2.19.1 in addons/knobs 2017-10-12 16:22:08 +00:00
Filipp Riabchun
429f387548 Merge pull request #2018 from storybooks/express-4.16.2-21.0.0-app--vue
Update express from 4.16.1 to 4.16.2 in app/vue
2017-10-12 00:37:48 +02:00
hypnos
83ad37689e update lockfile 2017-10-12 00:30:30 +02:00
hypnos
89214201ff Merge remote-tracking branch 'origin/moment-2.19.0-21.0.0-addons--comments' into express-4.16.2-21.0.0-app--vue 2017-10-12 00:29:10 +02:00
hypnos
6fc23122ce Merge remote-tracking branch 'origin/postcss-loader-2.0.7-21.0.0-app--vue' into express-4.16.2-21.0.0-app--vue 2017-10-12 00:28:51 +02:00
Filipp Riabchun
5ce8ef07b5 Merge branch 'master' into express-4.16.2-21.0.0-app--vue 2017-10-12 00:18:38 +02:00
Filipp Riabchun
e5cb0dc67b Merge pull request #2017 from storybooks/postcss-loader-2.0.7-21.0.0-app--react
Update postcss-loader from 2.0.6 to 2.0.7 in app/react
2017-10-12 00:18:16 +02:00
Filipp Riabchun
334d4a9a36 Merge branch 'master' into postcss-loader-2.0.7-21.0.0-app--react 2017-10-12 00:04:13 +02:00
Filipp Riabchun
a668cd0de8 Merge pull request #2016 from storybooks/express-4.16.2-21.0.0-app--react
Update express from 4.16.1 to 4.16.2 in app/react
2017-10-12 00:03:59 +02:00
Filipp Riabchun
d3d023b090 Merge branch 'master' into express-4.16.2-21.0.0-app--react 2017-10-11 23:53:35 +02:00
Filipp Riabchun
931614677f Merge pull request #2015 from storybooks/postcss-loader-2.0.7-21.0.0-app--react-native
Update postcss-loader from 2.0.6 to 2.0.7 in app/react-native
2017-10-11 23:53:24 +02:00
Filipp Riabchun
6834226a7e Merge branch 'master' into postcss-loader-2.0.7-21.0.0-app--react-native 2017-10-11 23:13:15 +02:00
Filipp Riabchun
10da5ea35d Merge pull request #2014 from storybooks/express-4.16.2-21.0.0-app--react-native
Update express from 4.16.1 to 4.16.2 in app/react-native
2017-10-11 23:12:55 +02:00
Filipp Riabchun
959aab1b7f Merge branch 'master' into express-4.16.2-21.0.0-app--react-native 2017-10-11 23:03:22 +02:00
Filipp Riabchun
4e2b4f82f2 Merge pull request #2013 from storybooks/moment-2.19.0-21.0.0-addons--knobs
Update moment from 2.18.1 to 2.19.0 in addons/knobs
2017-10-11 23:02:45 +02:00
Filipp Riabchun
c44fabbc93 Merge branch 'master' into moment-2.19.0-21.0.0-addons--knobs 2017-10-11 22:50:32 +02:00
Dependencies.io Bot
bcddd4bad4 Update moment from 2.18.1 to 2.19.0 in addons/comments 2017-10-11 16:33:46 +00:00
Dependencies.io Bot
168b96f0e9 Update postcss-loader from 2.0.6 to 2.0.7 in app/vue 2017-10-11 16:32:05 +00:00
Dependencies.io Bot
b327503556 Update express from 4.16.1 to 4.16.2 in app/vue 2017-10-11 16:30:32 +00:00
Dependencies.io Bot
d397a1617e Update postcss-loader from 2.0.6 to 2.0.7 in app/react 2017-10-11 16:28:48 +00:00
Dependencies.io Bot
d834ade12b Update express from 4.16.1 to 4.16.2 in app/react 2017-10-11 16:27:04 +00:00
Dependencies.io Bot
2c6cf4b212 Update postcss-loader from 2.0.6 to 2.0.7 in app/react-native 2017-10-11 16:25:28 +00:00
Dependencies.io Bot
b56dc97a29 Update express from 4.16.1 to 4.16.2 in app/react-native 2017-10-11 16:23:46 +00:00
Daniel Duan
67d8cd8041 Merge pull request #2012 from Sambego/patch-2
Add state addon to the addons page
2017-10-11 12:23:22 -04:00
Dependencies.io Bot
4cf41640f6 Update moment from 2.18.1 to 2.19.0 in addons/knobs 2017-10-11 16:22:03 +00:00
Daniel Duan
0de1c86b0f Update index.md 2017-10-11 12:16:33 -04:00
Daniel Duan
f8e68c7bfb Merge branch 'master' into patch-2 2017-10-11 11:56:10 -04:00
Daniel Duan
848f2e3f57 Merge pull request #2007 from Sambego/patch-1
Add community addon to add the ability to customize styles in the story preview area
2017-10-11 11:54:53 -04:00
Daniel Duan
62de300468 Merge branch 'master' into patch-1 2017-10-11 11:23:53 -04:00
Daniel Duan
6415bd968c Update index.md 2017-10-11 11:22:57 -04:00
kazuya kawaguchi
b61c3df9d1 Merge pull request #1983 from kazupon/fixes/issue-1742
Fixed lifecycle twice executing (close #1742)
2017-10-11 23:14:06 +09:00