785 Commits

Author SHA1 Message Date
Dependencies.io Bot
ad541cd537 Update uuid from 3.1.0 to 3.2.0 in examples/official-storybook 2018-01-16 16:54:30 +00:00
igor
760d3c7c36 Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
#	package.json
#	yarn.lock
2018-01-15 20:09:16 +02:00
Dependencies.io Bot
1277c518ec Update react-scripts from 1.0.17 to 1.1.0 in examples/cra-kitchen-sink 2018-01-15 16:56:30 +00:00
Dependencies.io Bot
41320f8391 Update jest from 22.0.6 to 22.1.1 in examples/cra-kitchen-sink 2018-01-15 16:54:58 +00:00
Dependencies.io Bot
5260de998a Update babel-jest from 22.0.6 to 22.1.0 in examples/cra-kitchen-sink 2018-01-15 16:53:25 +00:00
Igor
89af8fe76f
Merge branch 'master' into angular-storyshots 2018-01-15 13:15:52 +02:00
Filipp Riabchun
e47f3e0f84
Merge branch 'master' into dependencies.io-update-build-172.0.0 2018-01-14 20:02:46 +03:00
Dependencies.io Bot
0adee99de1 Update webpack-dev-server from 2.10.1 to 2.11.0 in examples/vue-kitchen-sink 2018-01-14 16:32:09 +00:00
Dependencies.io Bot
0e28dd22e5 Update webpack-dev-server from 2.10.1 to 2.11.0 in examples/polymer-cli 2018-01-14 16:30:35 +00:00
Filipp Riabchun
c8754b8d22
Merge branch 'master' into master 2018-01-14 18:18:30 +03:00
Oleg Lykasov
f4d0f6e264 Merge branch 'master' of github.com:SuperOl3g/storybook 2018-01-14 18:14:44 +03:00
Oleg Lykasov
74ff8b895c update snapshots 2018-01-14 18:13:19 +03:00
igor
5fcf200a08 Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
#	.editorconfig
#	addons/storyshots/package.json
#	examples/angular-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	yarn.lock
2018-01-14 13:12:46 +02:00
Norbert de Langen
85e7464edb
Merge branch 'master' into backgrounds-scrollbars 2018-01-14 00:20:01 +01:00
Hypnosphi
06c236ae99 Addon-backgrounds: remove redundant scrollbars 2018-01-14 01:00:12 +03:00
Norbert de Langen
7f38df535a
UPDATE snapshots 2018-01-13 21:22:03 +01:00
Norbert de Langen
f5d2f5599f
MOVE the DelayedRender to official example 2018-01-13 20:54:49 +01:00
Norbert de Langen
85ab7d03cc
Merge branch 'master' into addon-a11y-delayed-render 2018-01-13 17:26:12 +01:00
Michael Shilman
85e2e59183 v3.4.0-alpha.4 2018-01-13 18:32:28 +05:30
Michael Shilman
62db4d809e Mark polymer-cli private 2018-01-13 18:28:49 +05:30
Michael Shilman
56abd09768 v3.4.0-alpha.3 2018-01-13 18:09:59 +05:30
Norbert de Langen
d472688d4c
OPTIMIZE by not installing polymer-cli
It should be used in a full example, but the polymer-cli isn't used by us, and installs gigabytes of dependencies..
2018-01-13 11:56:25 +01:00
Norbert de Langen
e878dc5e64
REFACTOR stories into 2 files for clarity 2018-01-12 23:34:31 +01:00
Rahul
d2b1a3f623
Merge branch 'master' into addon-a11y-delayed-render 2018-01-12 14:31:58 -08:00
Norbert de Langen
e094775a14
Merge branch 'master' into add-polymer-support
# Conflicts:
#	.editorconfig
#	lib/cli/package.json
#	yarn.lock
2018-01-12 20:24:53 +01:00
igor
d5b30aa0ad Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
#	package.json
#	yarn.lock
2018-01-12 17:59:35 +02:00
Filipp Riabchun
545ac59b73
Noop commit 2018-01-12 03:01:07 +03:00
Dependencies.io Bot
696be02d84 Update @angular/cli from 1.6.3 to 1.6.4 in examples/angular-cli 2018-01-11 23:16:21 +00:00
Dependencies.io Bot
fac0dee462 Update zone.js from 0.8.19 to 0.8.20 in examples/angular-cli 2018-01-11 21:32:17 +00:00
Dependencies.io Bot
cf8e096a72 Update jest from 22.0.5 to 22.0.6 in examples/cra-kitchen-sink 2018-01-11 21:32:15 +00:00
Dependencies.io Bot
549d6d212e Update babel-jest from 22.0.4 to 22.0.6 in examples/cra-kitchen-sink 2018-01-11 21:32:14 +00:00
igor
f68a41020d Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
#	addons/storyshots/README.md
#	addons/storyshots/src/index.js
2018-01-11 21:12:10 +02:00
Thomas BERTET
b104897b2e
Merge branch 'master' into storyshots-add-image-snapshots 2018-01-10 16:51:29 +01:00
igor
a5eb21c745 Update storyshots to use helpers with templates support 2018-01-10 17:08:13 +02:00
igor
2e3020366d Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
#	app/angular/src/client/preview/angular/helpers.ts
2018-01-10 16:42:53 +02:00
igor
805f73e9b0 Update snapshots 2018-01-10 16:33:51 +02:00
Carlos Vega
658e976dbd
Merge branch 'master' into angular-template-support 2018-01-10 08:08:52 -06:00
Thomas BERTET
1a4d34c4a0
Merge branch 'master' into storyshots-add-image-snapshots 2018-01-10 14:57:37 +01:00
igor
c3b5aa7eb6 Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
#	addons/storyshots/package.json
#	examples/angular-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	package.json
#	yarn.lock
2018-01-10 14:49:38 +02:00
Thomas BERTET
c5a1fa1ac6
Merge branch 'master' into storyshots-add-image-snapshots 2018-01-10 11:51:28 +01:00
igor
270f2e0011 Show css warning if css rules are not configured as needed. 2018-01-10 10:24:16 +02:00
Norbert de Langen
2bda97b3d6
Merge branch 'master' into angular-support-scss 2018-01-10 09:22:26 +01:00
Michael Shilman
3201005157 v3.4.0-alpha.1 2018-01-10 12:37:29 +05:30
Carlos Vega
271ce3c2c3
Merge branch 'master' into angular-template-support 2018-01-09 23:41:06 -06:00
Carlos Vega
083f634f5a Merge branch 'master' of github.com:storybooks/storybook into angular-template-support 2018-01-09 18:43:42 -06:00
Carlos Vega
fd3b613ec7 Fixed typo in metadata/knobs sample
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2018-01-09 18:30:17 -06:00
Carlos Vega
9503c45c90 Added initial support for multiple compoonents in templates
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2018-01-09 18:27:13 -06:00
Igor
cd4027644b
Merge branch 'master' into custom-ts-config 2018-01-09 21:08:39 +02:00
Igor
847bb9aa26
Merge branch 'master' into angular-support-scss 2018-01-09 21:05:29 +02:00
igor
7d3d60777d Use scss for components in angular apps by default. 2018-01-09 19:07:03 +02:00