262 Commits

Author SHA1 Message Date
Michael Shilman
02a69e0b1b v3.3.3 2017-12-28 22:34:34 +05:30
Filipp Riabchun
97d49eddb5
Merge branch 'master' into eslint-imports 2017-12-28 14:02:14 +03:00
Michael Shilman
fbe50ffb46 v3.3.2 2017-12-28 12:10:49 +09:00
hypnos
7c4f87b68c Add more imports eslint rules 2017-12-28 04:38:46 +03:00
Filipp Riabchun
1b1c38e89f
Merge branch 'master' into addon-info-logger-fix 2017-12-27 19:02:07 +03:00
Matt Ferderer
0b91a77f44
Updated Readme.md propTablesExclude
Changed to agreed upon instructions for propTablesExclude to provide clearer documentation.
2017-12-27 09:04:57 -06:00
Matt Ferderer
3bf4996971
Merge branch 'master' into patch-2 2017-12-27 08:57:37 -06:00
Taras Yevtushenko
379d519840 Fix @storybook/client-logger import 2017-12-27 15:38:18 +01: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
Matt Ferderer
b31bcc42b7
Attempt to make propTablesExclude usage clearer
See issue #2266, specifically https://github.com/storybooks/storybook/issues/2266#issuecomment-351472412 for discussion.
2017-12-26 16:32:49 -06:00
Michael Shilman
92d7fca746 v3.3.0-rc.1 2017-12-26 09:48:54 -08:00
Lachlan Campbell
2f56ab361b Update snapshots 2017-12-25 20:52:41 -05:00
Norbert de Langen
47fd9e5057
Merge branch 'master' into patch-1 2017-12-25 12:40:47 +01:00
Michael Shilman
aa2a8c11f3 v3.3.0-rc.0 2017-12-23 20:20:05 -08:00
Lachlan Campbell
890c0c2cf3
Fix whitespace on info add-on card 2017-12-23 16:57:47 -05: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
Michael Shilman
c0318266dc v3.2.19 2017-12-23 09:58:18 -08:00
Norbert de Langen
3cfacfe4ec UPGRADE jest to latest & FIX all failing unittests 2017-12-23 18:48:29 +01: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
Norbert de Langen
a76f2a61ec
UPDATE readme with new slackin link 2017-12-22 18:06:27 +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
Voss, Jennifer (ELS-PHI)
2852af82e3 Allow fn or object prop for styles for backward compatibility 2017-12-13 14:18:27 -05:00
hypnos
170f3eb54a Migrate to marksy@6 2017-12-12 03:02:42 +03:00
Voss, Jennifer (ELS-PHI)
355f7e31d4 Update styles reference in README 2017-12-10 11:31:39 -05:00
Voss, Jennifer (ELS-PHI)
f081207086 Change styles prop to expect an object instead of a function 2017-12-10 11:26:44 -05:00
Jason Murad
e4ec0325cb no "required" propDefs from flow component 2017-12-08 18:44:06 -05:00
Voss, Jennifer (ELS-PHI)
dbcf1fe865 Update styles option reference per https://github.com/storybooks/storybook/issues/2144 2017-12-08 15:42:46 -05:00
Terrence Wong
0f38aaddb6 Add TableComponent option for addon-info 2017-12-04 13:17:37 +01:00
Michael Shilman
2e1fe20fc6 v3.2.17 2017-12-03 11:59:11 -08:00
Syneva Runyan
0e5e3c74d5 Merge branch 'release/3.3' of https://github.com/storybooks/storybook into issue-2196_fix-unittest-warnings-r3.3 2017-11-29 19:06:11 -05:00
Norbert de Langen
9635c29367
Merge branch 'release/3.3' into addons-peer 2017-11-28 23:25:18 +01:00
Syneva Runyan
5d9b6964b0 Merge branch 'release/3.3' of https://github.com/storybooks/storybook into issue-2196_fix-unittest-warnings-r3.3 2017-11-26 20:45:07 -05:00
Syneva Runyan
2d88d6a57b fixed remaining core test warnings including upgrade of addon-a11ys version on storybook 2017-11-26 20:16:46 -05:00
Filipp Riabchun
7c5c00c893
Merge branch 'master' into release/3.3 2017-11-25 18:55:45 +03:00
hypnos
417afe1f86 Run eslint --fix 2017-11-25 18:55:14 +03:00
Bakti Aditya
09ff079ccf Expose style for customisation 2017-11-25 21:25:43 +07:00
Syneva Runyan
9d0a9890bc Updated Snapshots and Began Test Cleanup 2017-11-22 22:09:11 -05:00
Syneva Runyan
ffcd4eb6a5 pulled release/3.3 2017-11-22 21:06:25 -05:00
hypnos
23e8953063 Merge branch 'release/3.3' into addons-peer
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
2017-11-22 20:43:36 +03:00
Michael Shilman
3c1715daca v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
Norbert de Langen
dd0a5e585d
Merge branch 'release/3.3' into addons-peer 2017-11-22 00:09:06 +01:00
hypnos
8fa2847249 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
2017-11-21 03:37:04 +03:00
Syneva Runyan
48fe2475d4 self code review 2017-11-19 18:28:22 -05:00