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 |
|
Igor
|
23b85f06d9
|
Merge branch 'master' into angular-storyshots
|
2018-01-04 08:04:20 +02:00 |
|
Rahul
|
448fda2533
|
Remove newlines
|
2018-01-03 14:51:34 -08:00 |
|
igor
|
acfd41ef5d
|
Disable with specific rule, so the imports will be even uglier
|
2018-01-04 00:46:54 +02:00 |
|
igor
|
279090c4be
|
Disable each specific import separately with ugly "eslint-disable-next-line"
|
2018-01-04 00:18:09 +02:00 |
|
Thomas BERTET
|
fcce2cda44
|
Merge branch 'master' into storyshots-add-image-snapshots
|
2018-01-03 19:15:24 +01:00 |
|
igor
|
ee1fad494c
|
Remove react from deps as well and remove wildcard from react-test-renderer
|
2018-01-03 20:07:03 +02:00 |
|
igor
|
45c7f24c89
|
Remove angular and vue deps from storyshots and suppress no-extraneous-dependencies.
|
2018-01-03 19:52:59 +02:00 |
|
igor
|
3bb8ab9d39
|
Move angular back to peer to check if cli tests are failing.
|
2018-01-03 19:17:27 +02:00 |
|
Igor
|
6a5b3b851a
|
Merge branch 'master' into angular-storyshots
|
2018-01-03 17:32:59 +02:00 |
|
Norbert de Langen
|
947e7f1842
|
Merge branch 'master' into patch-2
|
2018-01-03 16:04:45 +01:00 |
|
igor
|
a1fd3cf21e
|
typo and indentation
|
2018-01-03 16:36:05 +02:00 |
|
igor
|
ea2db195cc
|
Wrap story with app.component like in the app/angular and set dynamically all the props
|
2018-01-03 15:53:39 +02:00 |
|
Norbert de Langen
|
a0d4e1016e
|
Merge pull request #2614 from storybooks/vue-storyshots
Vue storyshots
|
2018-01-03 13:00:16 +01:00 |
|
igor
|
347bdc20a4
|
Add utils.test.js
|
2018-01-03 13:26:54 +02:00 |
|
igor
|
51b91d8aba
|
Merge remote-tracking branch 'origin/angular-storyshots' into vue-storyshots
# Conflicts:
# addons/storyshots/package.json
|
2018-01-03 12:29:53 +02:00 |
|
igor
|
08cbbc87dd
|
Move angular and react to regular reps
|
2018-01-03 12:25:20 +02:00 |
|
igor
|
7fc4888955
|
Define global.STORYBOOK_ENV to be 'vue' because there are addons that check this env variable
|
2018-01-03 11:30:39 +02:00 |
|
igor
|
4b612ebb3c
|
Merge remote-tracking branch 'origin/angular-storyshots' into vue-storyshots
|
2018-01-03 10:43:01 +02:00 |
|
igor
|
84237fb5cc
|
Angular + Jest + Storyshots = Crazy Shit. Move the jest-preset-angular/setupJest to be required before any storybook code is running inside jest - one of the things that jest-preset-angular/setupJest does is extending the window.Reflect with all the needed metadata functions, that are required for emission of the TS decorations like 'design:paramtypes'
|
2018-01-03 10:38:21 +02:00 |
|
igor
|
5ba2e9e727
|
Use prepare script in storyshots
|
2018-01-03 08:58:36 +02: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 |
|
igor
|
36daf9c514
|
Use config-loader in vue/loader
|
2018-01-02 01:33:27 +02:00 |
|
igor
|
7193eeec80
|
Merge remote-tracking branch 'origin/angular-storyshots' into vue-storyshots
|
2018-01-02 01:25:11 +02:00 |
|
igor
|
db89374d6e
|
Extract common config-loading logic to a separate module
|
2018-01-02 01:21:41 +02:00 |
|
igor
|
3cbd772a34
|
Add vue storyshots fork
|
2018-01-02 00:13:34 +02:00 |
|
Igor
|
3c782a6a54
|
Merge branch 'master' into angular-storyshots
|
2018-01-01 22:48:20 +02: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 |
|
igor
|
b09b631c24
|
Few cleanups
|
2017-12-29 17:24:02 +02:00 |
|
igor
|
887182f44b
|
Support promises in storyshots
|
2017-12-29 16:27:39 +02:00 |
|
igor
|
d9942cf96e
|
Fix indentation in package.json
|
2017-12-29 16:27:38 +02:00 |
|
Igor
|
43a273b423
|
Merge branch 'master' into angular-storyshots
|
2017-12-29 14:00:54 +02: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 |
|
igor
|
714b694ca4
|
Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
# addons/storyshots/package.json
# examples/angular-cli/package.json
|
2017-12-28 22:34:35 +02: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
|
8f549faf9e
|
Merge remote-tracking branch 'origin/master' into angular-storyshots
# Conflicts:
# addons/storyshots/package.json
# app/angular/src/client/preview/angular/helpers.ts
# examples/angular-cli/package.json
# jest.config.js
|
2017-12-28 15:50:19 +02: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 |
|
igor
|
b3792ef521
|
Use ɵReflectionCapabilities + knobs example
|
2017-12-28 10:31:57 +02:00 |
|