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
Thomas BERTET
b104897b2e
Merge branch 'master' into storyshots-add-image-snapshots
2018-01-10 16:51:29 +01:00
Carlos Vega
658e976dbd
Merge branch 'master' into angular-template-support
2018-01-10 08:08:52 -06:00
Thomas Bertet
96a5df5284
Add more details in READMEfor image snapshots
2018-01-10 11:51:45 +01:00
Thomas BERTET
c5a1fa1ac6
Merge branch 'master' into storyshots-add-image-snapshots
2018-01-10 11:51:28 +01:00
Michael Shilman
3201005157
v3.4.0-alpha.1
2018-01-10 12:37:29 +05:30
Carlos Vega
083f634f5a
Merge branch 'master' of github.com:storybooks/storybook into angular-template-support
2018-01-09 18:43:42 -06:00
Olena Sovyn
0c85dd70aa
fix link to preview of viewport addon
2018-01-09 13:57:02 +02:00
Carlos Vega
bf25c4390d
Adding support for Angular templates
2018-01-08 13:54:46 -06:00
Thomas BERTET
6a5911f649
Merge branch 'master' into storyshots-add-image-snapshots
2018-01-08 10:08:13 +01:00
Tom Coleman
7083670047
Remove src/ from remaining .npmignores.
...
Following on from #2677
2018-01-08 15:12:34 +11:00
Michael Shilman
d8d955cbbc
v3.4.0-alpha.0
2018-01-07 21:32:57 +05:30
Michael Shilman
71c528c462
merge release 3.3.4 to master
2018-01-07 19:36:11 +05:30
Michael Shilman
3abdbb6528
v3.3.4
2018-01-07 18:23:40 +05:30
Filipp Riabchun
c0a0acf28b
Merge pull request #2659 from storybooks/dependencies.io-update-build-159.0.0
2018-01-07 18:14:27 +05:30
Carlos Vega
70d56d10aa
Merge pull request #2646 from storybooks/camelcased-angular-knobs
...
Removed lowercase-only restriction for knobs
2018-01-07 17:02:32 +05:30
Igor
ac40b5dbb1
Merge pull request #2639 from storybooks/storyshots-ts-stories-compatibility
...
Add .ts compatibility to storyshots
2018-01-07 16:48:50 +05:30
Norbert de Langen
5d58157d17
Merge pull request #2640 from storybooks/knobs-peer-deps-fix
...
Remove @angular/core dep from knobs peer.
2018-01-07 16:48:36 +05:30
Norbert de Langen
dd55884b7d
Merge pull request #2624 from Primigenus/patch-2
...
Pass alpha transparency up to the story
2018-01-07 16:48:21 +05:30
Filipp Riabchun
cbe00b1930
Merge pull request #2626 from rhalff/master
...
skip serializing (Synthetic)Events
2018-01-07 16:47:26 +05:30
Filipp Riabchun
d8d2bf6408
Merge pull request #2601 from alansouzati/FIX_PEER_DEPENDENCIES
...
Fixed all peerDependencies for apps.
2018-01-07 16:43:35 +05:30
Dependencies.io Bot
464ad16358
Update marksy from 6.0.2 to 6.0.3 in addons/info
2018-01-06 16:31:36 +00:00
Filipp Riabchun
c4908b4bfe
Merge branch 'master' into dependencies.io-update-build-159.0.0
2018-01-05 21:47:10 +03:00
Dependencies.io Bot
6b59ab2768
Update marksy from 6.0.1 to 6.0.2 in addons/info
2018-01-05 16:29:40 +00:00
Norbert de Langen
ce9f389d6f
Merge branch 'master' into storyshots-add-image-snapshots
2018-01-04 19:45:25 +01:00
Carlos Vega
d129d65e4a
Removing lowercase-only restriction for knobs
...
Take in account that now the knob name needs to be the same as the angular component @Input attribute. Otherwise it'll not bind to the correct property.
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2018-01-04 10:49:16 -06:00
Norbert de Langen
37e2a8bebd
FIX image on addon-backgrounds readme && IMPROVE addons-backgrounds readme
2018-01-04 17:07:08 +01:00
Igor
aaff55f1f0
Merge branch 'master' into feature/multiple-hierarchies
2018-01-04 14:45:52 +02:00
Norbert de Langen
9e5019c9fe
Merge branch 'master' into storyshots-ts-stories-compatibility
2018-01-04 13:25:19 +01:00
Norbert de Langen
c650f793f7
Merge branch 'master' into feature/multiple-hierarchies
...
# Conflicts:
# examples/official-storybook/config.js
# lib/cli/test/snapshots/angular-cli/package.json
# lib/cli/test/snapshots/meteor/package.json
# lib/cli/test/snapshots/react/package.json
# lib/cli/test/snapshots/react_native/package.json
# lib/cli/test/snapshots/react_native_scripts/package.json
# lib/cli/test/snapshots/react_project/package.json
# lib/cli/test/snapshots/react_scripts/package.json
# lib/cli/test/snapshots/sfc_vue/package.json
# lib/cli/test/snapshots/update_package_organisations/package.json
# lib/cli/test/snapshots/vue/package.json
# lib/cli/test/snapshots/webpack_react/package.json
2018-01-04 13:22:56 +01:00
Thomas BERTET
ddde7213b4
Merge branch 'master' into storyshots-add-image-snapshots
2018-01-04 10:30:41 +01:00
igor
2ce834ef39
Remove @angular/core dep from peer and suppress extraneous-dependencies error
2018-01-04 10:33:16 +02:00
igor
2ef02fc0aa
Add .ts exts to the getPossibleStoriesFiles
2018-01-04 10:12:29 +02:00
Rahul
448fda2533
Remove newlines
2018-01-03 14:51:34 -08:00
Thomas BERTET
fcce2cda44
Merge branch 'master' into storyshots-add-image-snapshots
2018-01-03 19:15:24 +01:00
Norbert de Langen
947e7f1842
Merge branch 'master' into patch-2
2018-01-03 16:04:45 +01:00
Rob Halff
89d400e8a7
skip serializing (Synthetic)Events
2018-01-03 03:30:35 +00:00
Rahul
0828155d06
Pass alpha transparency up to the story
...
Fixes #802 .
Instead of just passing `color.hex`, also pass the alpha value.
2018-01-02 16:06:10 -08:00
Norbert de Langen
20765745de
Merge branch 'master' into storyshots-add-image-snapshots
2017-12-30 19:52:42 +01:00
Dependencies.io Bot
3ec1cc9481
Update enzyme from 3.2.0 to 3.3.0 in addons/links
2017-12-29 16:34:15 +00:00
Dependencies.io Bot
86d1cb1ec1
Update graphiql from 0.11.10 to 0.11.11 in addons/graphql
2017-12-29 16:32:25 +00:00
Norbert de Langen
7a74298073
Merge branch 'master' into storyshots-add-image-snapshots
2017-12-29 10:40:49 +01:00
Alan Souza
f816e30e7e
Fixed all peerDependencies for apps.
2017-12-28 12:35:02 -08:00
Dependencies.io Bot
172fc0f84f
Update axe-core from 2.6.0 to 2.6.1 in addons/a11y
2017-12-28 19:05:07 +00:00
Michael Shilman
02a69e0b1b
v3.3.3
2017-12-28 22:34:34 +05:30
Thomas BERTET
5759db9280
Merge branch 'master' into storyshots-add-image-snapshots
2017-12-28 14:51:34 +01:00
Igor
46732c3024
Merge branch 'master' into fix-di
2017-12-28 13:35:14 +02:00
Filipp Riabchun
14ff60655e
Merge branch 'master' into eslint-imports
2017-12-28 14:04:52 +03:00
Filipp Riabchun
97d49eddb5
Merge branch 'master' into eslint-imports
2017-12-28 14:02:14 +03:00
Thomas Bertet
b96345b484
add jest-image-snapshot to storyshots
2017-12-28 10:33:26 +01:00
