Commit Graph

4188 Commits

Author SHA1 Message Date
Ricardo Gobbo de Souza
744b45f1ee Trigger 2018-02-14 15:11:36 -02:00
Ricardo Gobbo de Souza
76f85ca990 Merge remote-tracking branch 'upstream/dev' into module-register-layout 2018-02-14 10:11:28 -02:00
Ricardo Gobbo de Souza
9687857fdc Trigger 2018-02-14 09:30:19 -02:00
jason
65b8148a3d inject ssrContext into createRouter and createStore 2018-02-14 01:45:37 +08:00
Clark Du
4a5aa48b44
test: remove extra log 2018-02-13 16:03:03 +08:00
Clark Du
ea5b7bb3ca
chore: upgrade dependencies 2018-02-13 15:31:15 +08:00
Ricardo Gobbo de Souza
f0a6bdd51a feat: add layout on module 2018-02-07 09:58:48 -02:00
Clark Du
0ec1b6203f
chore: upgrade dependencies 2018-02-07 17:43:58 +08:00
Clark Du
4137037484
Merge pull request #2784 from qm3ster/readme-circleci-badge
readme: Add circleci badge
2018-02-07 09:33:05 +08:00
Mihal Malostanidis
a35d2ce6ab
Add circleci badge 2018-02-07 03:10:55 +02:00
qm3ster
ad0649925d
Refactor cli
Extracted common logic
Improved style consistency
2018-02-07 02:44:29 +02:00
airjp73
ebd95280df Added getters to tests 2018-02-06 11:50:09 -05:00
airjp73
0308f13dab Fixed error caused by typo 2018-02-06 11:47:55 -05:00
airjp73
413bce4ce4 Test files 2018-02-06 11:47:41 -05:00
airjp73
ce342d528a Reformated/commented for clarity 2018-02-06 11:21:33 -05:00
airjp73
6dce24cc53 Fixed conflict resolution problems 2018-02-06 11:13:28 -05:00
Sébastien Chopin
8fcef54a23 test: Reduce stress test concurrency & steps 2018-02-06 16:47:18 +01:00
Sébastien Chopin
72300d350e
Merge pull request #2748 from ricardogobbosouza/config-pages-dir
feat: custom directories
2018-02-06 13:21:32 +01:00
Sébastien Chopin
c9598993c5
Update README.md 2018-02-06 13:20:38 +01:00
Sébastien Chopin
39bddf9d6c
Merge pull request #2779 from husayt/patch-2
updated readme on running storybook with nuxt
2018-02-06 13:18:48 +01:00
HG
bc4140a46e
updated readme on running storybook with nuxt
detailed description on running storybook with vue
2018-02-06 12:14:28 +00:00
Sébastien Chopin
3806160796 example: Update storybook example 2018-02-06 12:56:28 +01:00
Sébastien Chopin
fcd3f06767
Merge pull request #2773 from husayt/patch-1
initial version of storybook+nuxt demo
2018-02-06 12:29:11 +01:00
Ricardo Gobbo de Souza
a6200a2294 Trigger 2018-02-06 09:15:44 -02:00
HG
3990498dd3
Update README.md 2018-02-06 09:35:53 +00:00
Huseyn Guliyev
da2a9ac569 fix eslint issues 2018-02-06 03:06:45 +00:00
Huseyn Guliyev
cdba427776 more cleanup 2018-02-06 02:52:15 +00:00
Huseyn Guliyev
500da0804e cleanup 2018-02-06 02:44:22 +00:00
Huseyn Guliyev
b65a0e6e19 initial commit 2018-02-06 02:36:22 +00:00
HG
c40f79e3c6
Create README.md 2018-02-05 23:13:37 +00:00
Ricardo Gobbo de Souza
4d097b0b17 Trigger 2018-02-05 17:09:34 -02:00
Ricardo Gobbo de Souza
6f073d7093 fix: conflict old pr 2018-02-05 12:54:36 -02:00
Ricardo Gobbo de Souza
e9e673b8e1 Merge remote-tracking branch 'upstream/dev' into config-pages-dir 2018-02-05 08:45:14 -02:00
Sébastien Chopin
c415a679e4
Merge pull request #2766 from clarkdo/upgrade_axios
example: upgrade axios-module to 5.x
2018-02-05 10:53:12 +01:00
Clark Du
4d973a7d4e
example: upgrade axios-module to 5.x 2018-02-05 17:49:08 +08:00
Sébastien Chopin
0b1e54dc57
Merge branch 'dev' into config-pages-dir 2018-02-05 09:16:27 +01:00
Sébastien Chopin
6acd9b6516
Merge pull request #2736 from dojineko/variable-csp
Multiple policy support for Content-Security-Policy
2018-02-05 09:14:11 +01:00
Sébastien Chopin
ff411fe08c
Merge pull request #2742 from PeterPanZH/dev
fix #2741: add staging environment via NODE_ENV
2018-02-05 09:12:32 +01:00
Sébastien Chopin
0a52cd2031
Merge pull request #2755 from clarkdo/static_prefix
feature: add static.prefix
2018-02-05 08:55:28 +01:00
Clark Du
e60a8e7463 refactor: add true as default value of static.prefix 2018-02-05 09:57:10 +08:00
Clark Du
215832769e refactor: add context as third param of render:route hook 2018-02-04 17:57:51 +03:30
Clark Du
28d28cb8c1 feature: pass request to render:route hook 2018-02-04 17:57:51 +03:30
Ricardo Gobbo de Souza
7786451064 feat: custom store directory 2018-02-04 07:31:03 -02:00
Ricardo Gobbo de Souza
856c1bf83c feat: custom middleware directory 2018-02-03 21:24:45 -02:00
Ricardo Gobbo de Souza
b3f2a67793 feat: custom layouts directory 2018-02-03 16:41:43 -02:00
Clark Du
a81af22d41
feature: add static.prefix 2018-02-04 00:54:42 +08:00
Ricardo Gobbo de Souza
536aab6380 Moved options to a new dir block: 2018-02-03 14:04:15 -02:00
Ricardo Gobbo de Souza
483cd9ea29 feat: custom static directory 2018-02-03 09:54:16 -02:00
Ricardo Gobbo de Souza
ba5e608302 test: rename custom-pages to custom-dirs and include tests for assets 2018-02-03 09:10:58 -02:00
Ricardo Gobbo de Souza
fb29df43fd feat: custom assets directory 2018-02-03 09:10:06 -02:00