Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/3.2 #1383

Merged
merged 240 commits into from Jul 27, 2017
Merged

Release/3.2 #1383

merged 240 commits into from Jul 27, 2017

Conversation

shilman
Copy link
Member

@shilman shilman commented Jun 29, 2017

Issue: N/A

What I did

Placeholder for 3.2 release

How to test

TBD

ndelangen and others added 30 commits June 12, 2017 21:13
Add support for vue in addon-notes
# Conflicts:
#	examples/cra-kitchen-sink/.storybook/addons.js
#	examples/cra-kitchen-sink/package.json
@ndelangen ndelangen requested a review from a team July 25, 2017 20:35
Copy link
Member

@danielduan danielduan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The published alpha works well for me!

ndelangen and others added 5 commits July 26, 2017 18:04
`withKnobs` the decorator is still the base API. (This now works for
Vue).

The new API is called `wrapperKnobs` and will eventually be merged into
`withKnob` (c.f. medium term addons plan, to be posted)
Revert knobs API to previous API.
@@ -33,7 +33,7 @@
"react-komposer": "^2.0.0",
"react-modal": "^1.7.7",
"react-split-pane": "^0.1.63",
"react-treebeard": "^2.0.3",
"react-split-pane": "^0.1.65",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad merge??

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet