114 Commits

Author SHA1 Message Date
Dan Green
82699d3f0d
Merge branch 'master' into (#1736)-Ability-to-force-redender-a-story 2017-12-28 13:07:22 -05:00
Michael Shilman
02a69e0b1b v3.3.3 2017-12-28 22:34:34 +05:30
Dan Green
293bb7ad40 Merge branch 'master' of https://github.com/storybooks/storybook into (#1736)-Ability-to-force-redender-a-story 2017-12-28 10:27:55 -05: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
igor
b3792ef521 Use ɵReflectionCapabilities + knobs example 2017-12-28 10:31:57 +02:00
Igor
fc197de71c
Merge branch 'master' into fix-di 2017-12-28 09:03:50 +02:00
Igor
3e2e915e10
Revert "Move everything from lodash to lodash-es" 2017-12-28 08:47:51 +02:00
Michael Shilman
fbe50ffb46 v3.3.2 2017-12-28 12:10:49 +09:00
Filipp Riabchun
19e2761fef
Merge branch 'master' into eslint-imports 2017-12-28 04:46:44 +03:00
hypnos
7c4f87b68c Add more imports eslint rules 2017-12-28 04:38:46 +03:00
Dependencies.io Bot
38a0a617f0 Update zone.js from 0.8.18 to 0.8.19 in app/angular 2017-12-28 00:12:26 +00:00
Dependencies.io Bot
4ae0eb4b4b Update uglifyjs-webpack-plugin from 1.1.4 to 1.1.5 in app/angular 2017-12-27 16:31:00 +00:00
Dan Green
597387c838 (#1736) Add forceReRender support for Angular and Vue 2017-12-27 10:28:53 -05:00
Igor
930d49e234
Merge branch 'master' into fix-di 2017-12-27 10:13:35 +02:00
Michael Shilman
79c07c727a v3.3.1 2017-12-26 19:30:05 -08:00
Michael Shilman
0c38d5a041 Update cross-dependencies manually
Because of lerna not supporting `x.y.z-alpha.N` versions, we hardcode
these things when we are doing prerelease
2017-12-26 15:42:45 -08:00
jason
8c30131d73 fixed unresolved dependency error 2017-12-27 01:29:19 +03:00
jason
32234ab45c fixed linter errors 2017-12-27 00:11:30 +03:00
jason
6d272f889c minor fix 2017-12-27 00:01:55 +03:00
jason
5635385711 fixed dependency injection for components 2017-12-26 23:09:09 +03:00
Michael Shilman
92d7fca746 v3.3.0-rc.1 2017-12-26 09:48:54 -08:00
Norbert de Langen
10cd0b275c
Merge branch 'master' into feature/use-uglify-es
# Conflicts:
#	app/react-native/src/server/config/webpack.config.prod.js
#	app/react/src/server/config/webpack.config.prod.js
#	yarn.lock
2017-12-25 01:10:40 +01:00
Igor
3714159490
Merge branch 'master' into move-lodash-to-lodash-es 2017-12-24 21:49:17 +02:00
Igor
37f158b6e0
Merge branch 'master' into lodash-es-and-misc-fixes 2017-12-24 13:36:14 +02:00
igor
30a7f31b42 Revert lodash related changes 2017-12-24 13:33:26 +02:00
igor
a42f6d043a Move everything from lodash to lodash-es 2017-12-24 13:24:10 +02:00
hypnos
0d27286058 Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-140.0.0
# Conflicts:
#	examples/angular-cli/package.json
2017-12-24 11:30:08 +01:00
igor
01518b2539 Use specific lodash-es method to prevent polluting the bundle with the entire lodash. 2017-12-24 10:58:59 +02:00
igor
da62a44c43 Change "=>" to ">=" as for @Hypnosphi comment in #2467 2017-12-24 10:52:28 +02:00
Michael Shilman
aa2a8c11f3 v3.3.0-rc.0 2017-12-23 20:20:05 -08:00
Dependencies.io Bot
b5768fd3df Update style-loader from 0.17.0 to 0.18.2 in app/angular 2017-12-24 00:45:17 +00:00
Ruslan
13bf194296
Merge branch 'release/3.3' into component-props-assignment-improvements 2017-12-24 02:47:13 +03:00
jason
02838eb4b3 - fixed overriding of default values of components inputs with undefined value,
- added ngModel property support & aded FormModule import to module,
- added @types/lodash dependency,
- added manual ngOnChanges hook call
2017-12-24 01:31:26 +03:00
Norbert de Langen
d4f00d8613
Merge branch 'release/3.3' into upgrade-jest-v2
# Conflicts:
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
2017-12-23 19:44:58 +01:00
Norbert de Langen
3cfacfe4ec UPGRADE jest to latest & FIX all failing unittests 2017-12-23 18:48:29 +01:00
Michael Shilman
4903d6ece7 v3.3.0-alpha.6 2017-12-23 09:25:20 -08:00
Michael Shilman
a65beced79 v3.3.0-alpha.5 2017-12-23 09:05:46 -08:00
ralzinov
0df588b216 added "moduleMetadata" property to IGetStory interface at index.d.ts 2017-12-22 20:58:55 +03:00
ralzinov
e00356183d fixed conflicts, added annotation to merged files 2017-12-22 13:34:14 +03:00
Ruslan
edaee12871
Merge branch 'release/3.3' into fix-angular-typings 2017-12-22 12:42:14 +03:00
Ruslan
ab75f9a947
Merge branch 'release/3.3' into fix-angular-typings 2017-12-21 21:10:31 +03:00
Carlos Vega
c367d967dc Igor's feedback
- Changing main tag to a more meaningful name
- Removing redundant type Data
- Validating moduleMetadata param
- Removing unused references

Signed-off-by: Carlos Vega <clmvega@gmail.com>
2017-12-21 09:55:22 -06:00
Carlos Vega
bc4af36ad5 Removing unused import
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2017-12-20 16:41:50 -06:00
Carlos Vega
82c1642923 Adding extra metadata to module/components 2017-12-20 16:07:38 -06:00
Norbert de Langen
7b296048b1
Merge branch 'release/3.3' into fix-ng-component-prop-output-override 2017-12-20 21:31:26 +01:00
Ruslan
6585b8777c
Merge branch 'release/3.3' into fix-ng-component-prop-output-override 2017-12-20 21:38:49 +03:00
Ruslan
841f260e01
Merge branch 'release/3.3' into fix-angular-typings 2017-12-20 21:37:35 +03:00
igor
6ed2fd8483 Fix Critical dependency: the request of a dependency is an expression in webpack.config.prod 2017-12-20 09:08:53 +02:00