Evgeniy Zaitsev
|
8b98172b33
|
Merge branch 'master' into addon-info-new-options
|
2017-06-05 15:55:48 +03:00 |
|
Norbert de Langen
|
baecbf7970
|
FIX after merge
|
2017-06-05 11:45:04 +02:00 |
|
Norbert de Langen
|
e40ef62aa5
|
Merge branch 'master' into eslint-strict
|
2017-06-05 11:33:01 +02:00 |
|
Dustin Kane
|
f9d1a145da
|
Issue 1114: Replacing use of deprecated markdown-to-react-components in addon-info to use marksy
|
2017-06-04 19:16:43 -05:00 |
|
Norbert de Langen
|
8fef4bb2d8
|
FIX linting
|
2017-06-05 00:58:23 +02:00 |
|
Norbert de Langen
|
da961dc508
|
FIX linting
|
2017-06-03 21:06:48 +02:00 |
|
Evgeniy Zaitsev
|
c46d701bb1
|
replace context with props
|
2017-05-31 13:05:43 +03:00 |
|
Norbert de Langen
|
9d38bf8bd3
|
Mostly re-applied changes
|
2017-05-31 08:29:09 +02:00 |
|
Norbert de Langen
|
af1b0c11d2
|
Merge branch 'master' into eslint-strict
# Conflicts:
# .eslintignore
# .travis.yml
# addons/actions/src/containers/ActionLogger/index.js
# addons/centered/package.json
# addons/graphql/package.json
# addons/info/src/components/PropTable.js
# addons/info/src/components/Props.js
# addons/knobs/package.json
# addons/knobs/src/components/Panel.js
# addons/notes/package.json
# addons/notes/src/index.js
# addons/notes/src/register.js
# addons/storyshots/package.json
# addons/storyshots/src/index.js
# app/react-native/package.json
# app/react/package.json
# examples/cra-storybook/package.json
# examples/cra-storybook/src/stories/Welcome.js
# examples/test-cra/src/stories/Button.js
# examples/test-cra/src/stories/Welcome.js
# lib/channel-postmessage/package.json
# lib/channel-websocket/package.json
# lib/cli/bin/generate.js
# lib/cli/generators/METEOR/index.js
# lib/cli/generators/REACT/index.js
# lib/cli/generators/REACT/template/stories/index.js
# lib/cli/generators/REACT_NATIVE/index.js
# lib/cli/generators/REACT_SCRIPTS/index.js
# lib/cli/generators/REACT_SCRIPTS/template/src/stories/Welcome.js
# lib/cli/generators/WEBPACK_REACT/index.js
# lib/cli/lib/helpers.js
# lib/cli/package.json
# package.json
|
2017-05-31 07:45:04 +02:00 |
|
Evgeniy Zaitsev
|
ab611bdc6a
|
add new options to info addon
|
2017-05-30 17:10:08 +03:00 |
|
Norbert de Langen
|
9462027f28
|
FIX linting
|
2017-05-26 10:06:06 +02:00 |
|
Norbert de Langen
|
08a49db8c0
|
Merge branch 'master' into eslint-strict
|
2017-05-19 22:10:51 +02:00 |
|
Nelson, Joe
|
ad0fcfe94f
|
fixed code style problems.
|
2017-05-19 11:06:14 -07:00 |
|
Nelson, Joe
|
622dadb4ef
|
removed reference to window since it is not needed.
|
2017-05-19 11:06:14 -07:00 |
|
Nelson, Joe
|
ad15e80cc2
|
added code to support js documentation for adding descriptions to a component, fixed issue with content was being rendered as an object and give errors for that, added a fix to when you use PropTypes from something other than React that you can get the type from docgen.
|
2017-05-19 11:04:16 -07:00 |
|
Nelson, Joe
|
edd6b6920a
|
working on getting more documentation.
|
2017-05-19 11:01:28 -07:00 |
|
Norbert de Langen
|
0142e4b116
|
FIX linting
|
2017-05-19 01:04:48 +02:00 |
|
Norbert de Langen
|
24544af38d
|
FIX linting
|
2017-05-19 00:21:13 +02:00 |
|
Daniel Duan
|
cd75e24917
|
Removed > typo in Info prop table header
|
2017-05-18 16:09:24 -04:00 |
|
Norbert de Langen
|
2bcaae9d81
|
FIX linting
|
2017-05-18 09:14:29 +02:00 |
|
Norbert de Langen
|
09747c667b
|
Merge branch 'master' into eslint-strict
# Conflicts:
# addons/centered/package.json
# addons/graphql/package.json
# addons/info/package.json
# addons/knobs/package.json
# addons/links/.storybook/config.js
# addons/notes/package.json
# addons/notes/src/index.js
# addons/notes/src/register.js
# addons/options/src/manager/index.js
# addons/storyshots/src/index.js
# addons/storyshots/stories/required_with_context/Button.stories.js
# addons/storyshots/stories/required_with_context/Welcome.js
# app/react-native/package.json
# app/react-native/src/manager/index.js
# lib/channel-postmessage/package.json
# lib/channel-postmessage/src/index.js
# lib/channel-websocket/package.json
# lib/channel-websocket/src/index.js
# lib/cli/generators/METEOR/index.js
# lib/cli/generators/REACT/template/stories/Welcome.js
# lib/cli/generators/REACT_SCRIPTS/index.js
# lib/cli/generators/WEBPACK_REACT/template/stories/Welcome.js
# packages/react-storybook/src/server/track_usage.js
# packages/storybook-ui/src/modules/ui/components/layout/usplit.js
# scripts/prepublish.js
|
2017-05-17 23:41:09 +02:00 |
|
Norbert de Langen
|
36c7ca7c1d
|
FIX linting
|
2017-05-17 00:34:34 +02:00 |
|
Norbert de Langen
|
69b91f6e53
|
CHANGE folder structure && CHANGE package-names
|
2017-05-15 00:08:46 +02:00 |
|