1005 Commits

Author SHA1 Message Date
Michael Shilman
aa2a8c11f3 v3.3.0-rc.0 2017-12-23 20:20:05 -08: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
677e8ccac9 Update internal package deps for 3.3.0-alpha.6 2017-12-23 09:34:38 -08:00
hypnos
6a1f1f691f Merge branch 'master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-12-23 18:30:24 +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
Dependencies.io Bot
73c4d76137 Update vue from 2.5.12 to 2.5.13 in addons/knobs 2017-12-22 23:53:49 +00:00
Dependencies.io Bot
5bb6b12fb4 Update @types/node from 8.5.1 to 8.5.2 in addons/knobs 2017-12-22 23:53:48 +00:00
Dependencies.io Bot
2c775c7e25 Update glamorous from 4.11.0 to 4.11.2 in addons/jest 2017-12-22 23:53:48 +00:00
Norbert de Langen
a76f2a61ec
UPDATE readme with new slackin link 2017-12-22 18:06:27 +01:00
Carlos Vega
1f132740e4 Merge branch 'angular-module-metadata' of github.com:storybooks/storybook into angular-module-metadata 2017-12-21 09:55:46 -06: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
Norbert de Langen
0e951a0df6
Merge branch 'release/3.3' into angular-module-metadata 2017-12-21 16:28:46 +01:00
Norbert de Langen
5966ae3d8e
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/storyshots/package.json
#	lib/ui/package.json
#	yarn.lock
2017-12-21 15:58:34 +01:00
Norbert de Langen
3b5f291e3a
Merge branch 'release/3.3' into angular-module-metadata 2017-12-21 11:32:44 +01:00
Norbert de Langen
5eaa473b24
Merge branch 'master' into fix-babel-core 2017-12-21 11:03:05 +01:00
Norbert de Langen
4d59b5f291
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/a11y/package.json
#	addons/comments/package.json
#	addons/knobs/package.json
#	package.json
#	yarn.lock
2017-12-21 10:38:04 +01:00
Carlos Vega
82c1642923 Adding extra metadata to module/components 2017-12-20 16:07:38 -06:00
igor
08b0bdafa6 Remove setMeta 2017-12-20 08:38:30 +02:00
igor
dd0d1859e9 Move back to peer deps 2017-12-20 08:09:24 +02:00
Igor
9cc09dbb97
Merge branch 'release/3.3' into angular-versions-support 2017-12-20 06:55:22 +02:00
Dependencies.io Bot
e19dfc70a6 Update moment from 2.20.0 to 2.20.1 in addons/comments 2017-12-19 16:36:26 +00:00
Dependencies.io Bot
8e75e8a468 Update vue from 2.5.11 to 2.5.12 in addons/knobs 2017-12-19 16:32:21 +00:00
Dependencies.io Bot
596169953f Update moment from 2.20.0 to 2.20.1 in addons/knobs 2017-12-19 16:30:29 +00:00
Dependencies.io Bot
13a2b2c352 Update axe-core from 2.5.0 to 2.6.0 in addons/a11y 2017-12-19 16:28:27 +00:00
igor
95771daad5 Add knobs support 2017-12-19 18:00:25 +02:00
Igor
0a8c5816dd
Merge branch 'release/3.3' into angular-versions-support 2017-12-19 08:02:55 +02:00
hypnos
34edb72e19 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
#	yarn.lock
2017-12-18 23:56:37 +01:00
hypnos
d450633d32 Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-126.0.0
# Conflicts:
#	addons/graphql/package.json
#	yarn.lock
2017-12-18 23:44:05 +01:00
Michael Shilman
2aea83798e v3.2.18 2017-12-18 13:58:53 -08:00
Voss, Jennifer (ELS-PHI)
46ba3d9c21 Set styles to proptypes.func 2017-12-18 10:02:32 -05:00
Voss, Jennifer (ELS-PHI)
a8cb915f60 Merge remote-tracking branch 'upstream/release/3.3' into update-addon-info-docs 2017-12-17 13:07:27 -05:00
Voss, Jennifer (ELS-PHI)
bd8379807b Merge branch 'release/3.3' into update-addon-info-docs 2017-12-17 12:54:18 -05:00
Voss, Jennifer (ELS-PHI)
435dcab136 Pass stylesheet as the default arg to props.styles, update README and cra examples 2017-12-17 12:49:54 -05:00
Dependencies.io Bot
5e330152f9 Update moment from 2.19.4 to 2.20.0 in addons/comments 2017-12-17 16:26:41 +00:00
Dependencies.io Bot
0895c1dc12 Update moment from 2.19.4 to 2.20.0 in addons/knobs 2017-12-17 16:23:54 +00:00
Dependencies.io Bot
28ec9e343a Update graphql from 0.11.7 to 0.12.3 in addons/graphql 2017-12-17 16:22:38 +00:00
Dependencies.io Bot
0a8a66b1a1 Update @types/react from 16.0.30 to 16.0.31 in addons/knobs 2017-12-16 16:26:18 +00:00
Dependencies.io Bot
48034a458e Update graphql from 0.11.7 to 0.12.0 in addons/graphql 2017-12-16 16:24:47 +00:00
Norbert de Langen
68c119e01c
Merge branch 'release/3.3' into angular-versions-support 2017-12-16 10:05:48 +01:00
Emmanuel Vuigner
54ae75fabf
fix: move babel-core to peerDependencies
typo

do same for storyshots addon
2017-12-15 13:49:21 +01:00
hypnos
0666f9c5eb Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	yarn.lock
2017-12-14 23:26:46 +03:00
Dependencies.io Bot
e5e3653787 Update vue from 2.5.10 to 2.5.11 in addons/knobs 2017-12-14 20:02:07 +00:00
Dependencies.io Bot
8264edb4b6 Update style-loader from 0.19.0 to 0.19.1 in addons/knobs 2017-12-14 20:02:06 +00:00
Dependencies.io Bot
17fb36a2de Update @types/react from 16.0.29 to 16.0.30 in addons/knobs 2017-12-14 20:02:05 +00:00
Dependencies.io Bot
408c71b712 Update @types/node from 8.0.58 to 8.5.1 in addons/knobs 2017-12-14 20:02:04 +00:00
Norbert de Langen
eb252c7726
Merge branch 'release/3.3' into angular-versions-support 2017-12-14 18:45:04 +01:00
igor
fc980e79e3 Merge remote-tracking branch 'origin/release/3.3' into angular-versions-support
# Conflicts:
#	yarn.lock
2017-12-14 11:10:30 +02:00
Filipp Riabchun
a9022b5d84
Merge branch 'release/3.3' into fix-types-and-refactor 2017-12-13 22:24:06 +03:00