2378 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
patmood	02f9454b66	rename progress class to prevent conflicts	2017-08-26 18:16:30 -07:00
Pooya Parsa	192c25e3e8	fix tests	2017-08-25 17:41:13 +04:30
Pooya Parsa	f933dd1f32	improve useMiddleware	2017-08-25 17:37:45 +04:30
Pooya Parsa	a71ac0f41a	Merge branch 'dev' of github.com:nuxt/nuxt.js into dev	2017-08-25 16:31:56 +04:30
Pooya Parsa	1ca5739a2f	add router base to all middleware	2017-08-25 16:31:16 +04:30
Sebastien Chopin	378d116bf8	typo: Simplify child.children sanitization	2017-08-25 13:54:14 +02:00
Sebastien Chopin	7bc1b35b21	fix: Use file path for chunkName	2017-08-25 12:34:59 +02:00
Sebastien Chopin	cb8bc559b4	Use asyncData into children test	2017-08-25 12:24:49 +02:00
Sébastien Chopin	3bf1cb90c4	Merge pull request #1480 from whtsky/defaults-babel-presets ... Don't set `babelOptions.presets` if babelrc = true	2017-08-25 12:15:52 +02:00
Sébastien Chopin	3985c1d684	Merge pull request #1478 from LookinGit/fix-1248 ... ~ fix asyncData parent + children pages in production build (#1248)	2017-08-25 12:14:11 +02:00
Wu Haotian	e59b3dd4f7	Don't set babelOptions.presets if babelrc = true	2017-08-25 17:36:53 +08:00
LookinGit	16608fad25	~ fix asyncData parent + children pages in production build (#1248)	2017-08-25 08:56:38 +03:00
Pooya Parsa	cafc94d9f9	fix problem with route chunk names (#1461)	2017-08-25 01:36:56 +04:30
Sébastien Chopin	b48b2c5e6d	Merge branch 'dev' of github.com:Atinux/nuxt.js into dev	2017-08-24 20:39:08 +02:00
Sébastien Chopin	e32a3755dd	feature: Add inject(key, value) as 2nd argument of plugins	2017-08-24 20:38:28 +02:00
Sébastien Chopin	42f2a59fd2	Update example to use inject	2017-08-24 20:37:54 +02:00
Sébastien Chopin	1b123807ff	Add nuxt.js modules link	2017-08-24 19:59:28 +02:00
Sébastien Chopin	1a6a183e43	Merge branch 'dev' of github.com:Atinux/nuxt.js into dev	2017-08-24 19:53:26 +02:00
Sebastien Chopin	12a31b0914	fix: SSR call router.push after plugin execution	2017-08-24 18:49:26 +02:00
Sebastien Chopin	c9e77337b3	Add with-cookies example	2017-08-24 18:49:26 +02:00
Sébastien Chopin	7738d0c0af	Merge pull request #1447 from Zip753/improve-nuxt-config-interface ... Improve nuxt.config.js and Nuxt modules API	2017-08-24 15:49:10 +02:00
Sebastien Chopin	6f926e39d8	Remove examples lnik	2017-08-24 14:38:58 +02:00
Sebastien Chopin	f846fc85ab	Add liveedit	2017-08-24 14:38:27 +02:00
Sebastien Chopin	8bf50c2889	Add demo link	2017-08-24 14:36:52 +02:00
Sebastien Chopin	d3867a2b70	Add css for dropdown	2017-08-24 14:34:00 +02:00
Sebastien Chopin	7f8f62672d	Add UIkit example	2017-08-24 14:28:49 +02:00
Sebastien Chopin	8340779620	Update readme	2017-08-24 14:28:40 +02:00
Sebastien Chopin	e90a753d8d	no-ssr: Add tests	2017-08-24 12:46:30 +02:00
Sebastien Chopin	222f50e139	Add no-ssr example	2017-08-24 12:38:53 +02:00
Sebastien Chopin	fb25c982a7	feature: Add no-ssr component	2017-08-24 12:38:46 +02:00
Sebastien Chopin	cfd8673a54	Add contributors page	2017-08-24 12:16:12 +02:00
Sebastien Chopin	e96ef9948e	Fix start script	2017-08-24 11:41:42 +02:00
Sebastien Chopin	d9ea41e971	Add vue-chartjs example	2017-08-24 11:36:41 +02:00
Sebastien Chopin	04d05de906	process: Add process.mode	2017-08-23 18:21:27 +02:00
Sebastien Chopin	4ac14054f2	context: hotReload -> isHMR	2017-08-23 13:41:37 +02:00
Ivan Nikulin	37abaa0e80	Refactor extendRoutes for Tapable plugins	2017-08-23 08:49:24 +02:00
Ivan Nikulin	9c39c128f2	Add tests for chainFn	2017-08-23 00:50:46 +02:00
Ivan Nikulin	2336b3e6ea	Update extendBuild modules API	2017-08-23 00:50:46 +02:00
Ivan Nikulin	416b84ccae	Update extendRoutes modules API	2017-08-23 00:50:46 +02:00
Ivan Nikulin	8cf5a21752	Change build.extend hook to return new webpack config	2017-08-23 00:50:45 +02:00
Ivan Nikulin	635ee580e9	Change router.extendRoutes hook to return new router config	2017-08-23 00:50:45 +02:00
Pooya Parsa	459363beea	fix(renderer): resolve handler key as option for serverMiddleware ... #1274	2017-08-23 02:44:44 +04:30
Sebastien Chopin	8dca5ec81e	package: Use custom css-loader (waiting for PR merged)	2017-08-22 19:38:33 +02:00
Sebastien Chopin	af909ae8e3	Merge branch 'dev' of github.com:nuxt/nuxt.js into dev	2017-08-22 19:38:02 +02:00
Sebastien Chopin	d7a6761054	css-loader: Don't use root to allow absolute path	2017-08-22 19:37:55 +02:00
桦	32c6d39358	fixes #1438 (#1439)	2017-08-22 18:27:11 +04:30
Sebastien Chopin	88f98fb61d	Don't call extend for server if spa mode	2017-08-22 13:56:22 +02:00
Sebastien Chopin	ef4cdd4776	Add vuex-persistedstate example	2017-08-22 13:24:23 +02:00
Sebastien Chopin	8dca358216	Move store hydration after plugins execution	2017-08-22 11:08:59 +02:00
Sébastien Chopin	e8433627ea	Bump rc6	2017-08-21 23:37:04 +02:00