188 Commits

Author SHA1 Message Date
hypnos
5362da6137 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	app/react/src/server/index.js
#	app/vue/src/server/index.js
2017-11-01 05:10:22 +03:00
Filipp Riabchun
7d07c40688
Merge branch 'master' into derekstavis-patch-2 2017-11-01 05:02:12 +03:00
hypnos
73a8026801 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	examples/cra-kitchen-sink/package.json
#	yarn.lock
2017-11-01 05:00:41 +03:00
Dependencies.io Bot
86e386eb39 Update babel-preset-react-app from 3.0.3 to 3.1.0 in app/vue 2017-10-31 23:40:43 +00:00
Filipp Riabchun
e98afd942c
Merge branch 'master' into derekstavis-patch-2 2017-11-01 02:32:25 +03:00
hypnos
7028a8a41c Copypaste the change to vue app 2017-11-01 02:26:42 +03:00
Filipp Riabchun
61a8ed026b
Merge branch 'master' into release/3.3 2017-11-01 01:37:42 +03:00
Norbert de Langen
7fa3945dd5
Update README.md 2017-10-31 23:29:09 +01:00
Norbert de Langen
462ea1cc4a Merge branch 'master' into release/3.3 2017-10-24 23:25:18 +02:00
Dependencies.io Bot
eeccac014a Update chalk from 2.2.0 to 2.3.0 in app/vue 2017-10-24 16:28:47 +00: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
Dependencies.io Bot
837fa8806f Update autoprefixer from 7.1.5 to 7.1.6 in app/vue 2017-10-22 16:28:20 +00:00
Michael Shilman
a701365e70 v3.2.13 2017-10-20 21:44:34 +02:00
Norbert de Langen
18d5528eef Merge branch 'master' into patch-1 2017-10-20 14:54:39 +02:00
Dependencies.io Bot
521b738e60 Update chalk from 2.1.0 to 2.2.0 in app/vue 2017-10-18 16:37:41 +00:00
Rahul Kadyan
d7ab8eb067 Merge branch 'master' into patch-1 2017-10-17 11:39:32 +00:00
hypnos
26bbc69282 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-10-17 03:27:19 +03:00
hypnos
0d684f89dc Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	docs/pages/basics/faq/index.md
#	examples/vue-kitchen-sink/package.json
#	lib/cli/generators/SFC_VUE/index.js
#	lib/cli/generators/VUE/index.js
#	lib/cli/lib/helpers.js
#	lib/cli/package.json
#	lib/ui/package.json
#	package.json
#	yarn.lock
2017-10-17 03:24:46 +03:00
Dependencies.io Bot
dbf9fde605 Update webpack-hot-middleware from 2.19.1 to 2.20.0 in app/vue 2017-10-16 16:30:25 +00:00
Filipp Riabchun
ee8b829141 Merge branch 'master' into patch-1 2017-10-16 01:24:32 +03:00
Filipp Riabchun
ff23b76d91 Merge branch 'master' into vue-2.5.1-23.0.0-app--vue 2017-10-15 01:55:29 +03:00
hypnos
931c8090c6 Merge remote-tracking branch 'origin/vue-template-compiler-2.5.2-24.0.0-app--vue' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	app/vue/package.json
2017-10-15 01:52:07 +03:00
hypnos
6e2f12c3be Merge remote-tracking branch 'origin/vue-2.5.2-24.0.0-app--vue' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	app/vue/package.json
#	yarn.lock
2017-10-15 01:29:28 +03:00
Dependencies.io Bot
80f8848a14 Update vue-template-compiler from 2.4.4 to 2.5.2 in app/vue 2017-10-14 16:38:27 +00:00
Dependencies.io Bot
dc6ea6b247 Update vue from 2.4.4 to 2.5.2 in app/vue 2017-10-14 16:37:12 +00:00
Dependencies.io Bot
e1a4a46ea8 Update postcss-loader from 2.0.7 to 2.0.8 in app/vue 2017-10-14 16:35:58 +00:00
Rahul Kadyan
3bbcf9c335 bump vue version
Depend loosely on vue & vue-loader by moving them to peer dependencies.
2017-10-14 21:04:03 +05:30
hypnos
3d1535a1d6 Merge remote-tracking branch 'origin/vue-template-compiler-2.5.1-23.0.0-app--vue' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:45:04 +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
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
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
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
Norbert de Langen
baddc70b36 Merge branch 'master' into fixes/issue-1742 2017-10-11 15:09:42 +02:00
Dependencies.io Bot
f34c2d9f16 Update autoprefixer from 7.1.4 to 7.1.5 in app/vue 2017-10-09 22:30:46 +00:00
Dependencies.io Bot
00bfe1820f Update react-modal from 2.3.3 to 2.4.1 in app/vue 2017-10-06 16:25:55 +00:00
kazuya kawaguchi
f4508092a0
🐛 bug(vue): fixed lifecycle twice executing
closes #1742
2017-10-06 16:03:30 +09:00
hypnos
f07cb15973 Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-05 02:42:23 +03:00
Filipp Riabchun
ba66d2fd8d Merge branch 'master' into vue-hot-reload-api-2.1.1-9.0.0-app--vue 2017-10-04 16:33:12 -07:00
Filipp Riabchun
0bb815ab70 Merge branch 'master' into url-loader-0.6.2-9.0.0-app--vue 2017-10-04 16:05:15 -07:00
Dependencies.io Bot
4b2e6eee82 Update vue-hot-reload-api from 2.1.0 to 2.1.1 in app/vue 2017-10-04 21:58:53 +00:00
Dependencies.io Bot
8204481246 Update url-loader from 0.5.9 to 0.6.2 in app/vue 2017-10-04 21:57:16 +00:00
Dependencies.io Bot
fcf3a3cf65 Update react-modal from 2.3.2 to 2.3.3 in app/vue 2017-10-04 21:55:38 +00: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