171 Commits

Author SHA1 Message Date
Joe Kohlmann
0989765e43 Merge branch 'master' into patch-1 2017-06-15 09:43:24 -04:00
Michael Shilman
f64f5b7482 v3.1.4 2017-06-15 22:08:24 +10:00
Joe Kohlmann
9035f43af2 Info add-on: update z-index of container 2017-06-12 10:41:44 -04:00
Michael Hsu (徐承志)
106514f6f2 feat(Addon/info): use external links 2017-06-12 16:44:38 +08:00
Michael Hsu
71a48df16c isRequired 2017-06-12 11:41:47 +08:00
Michael Hsu
13939bdb46 update propTypes 2017-06-12 11:31:59 +08:00
Michael Hsu
a7ddf63169 add propTypes 2017-06-12 11:14:46 +08:00
Michael Hsu
7a95ee2594 fix(addons/info): Cannot read property 'props' of undefined
fix(addons/info): Cannot read property 'props' of undefined
2017-06-12 11:00:36 +08:00
Michael Shilman
b32cae6846 v3.1.3 2017-06-10 23:47:36 +12:00
Adam Donahue
c9ee900031 prop-fix: Use correct type. 2017-06-09 16:18:17 -04:00
Michael Shilman
c289d15bc7 v3.1.2 2017-06-09 23:53:03 +12:00
Michael Shilman
ea616369eb v3.1.1 2017-06-09 23:31:52 +12:00
Michael Shilman
56052112c3 v3.1.0 2017-06-09 22:52:20 +12:00
Michael Shilman
6807b5e7f8 Cherry-pick linting update from #1224 2017-06-09 19:58:01 +12:00
Norbert de Langen
d6b3d13f4b Merge branch 'master' into update-addon-info-design 2017-06-09 08:09:49 +02:00
Lucas Motta
3a555b85c4 Add small design update to addon info package
When using the "info" addon inline, the current designs blends in
too much with the component, making it quite confusing and sometimes
difficult to preview.
This change wraps the Story info into a "box" with a light border and
shadow, also adds some more padding and margin to give a bit more room.
2017-06-07 17:01:06 +01:00
Evgeniy Zaitsev
70f7b51f61 Fix build and lint after merge 2017-06-07 11:58:13 +03:00
Evgeniy Zaitsev
613eeb8153 Merge branch 'master' into addon-info-new-options 2017-06-07 10:32:56 +03:00
Norbert de Langen
432c371b65 Merge branch 'master' into eslint-strict 2017-06-06 22:04:00 +02:00
Norbert de Langen
afc56fe37e Merge branch 'master' into patch-1 2017-06-06 21:43:30 +02:00
Eli Sherer
8f1bf37957 fix bug marksy initialized with mtrcConf intead of marksyConf 2017-06-06 22:23:48 +03:00
Dmitry Naumov
d5753e2dc8 Update marksy dependecy due broken 1.1.0 version 2017-06-06 21:42:34 +03:00
Norbert de Langen
28a4b32323 CHANGE all package.jsons so they are uniformly sorted 2017-06-06 17:46:55 +02:00
Norbert de Langen
7765c4534b Merge branch 'master' into eslint-strict
# Conflicts:
#	app/react-native/src/manager/components/PreviewHelp.js
2017-06-06 17:43:50 +02:00
Norbert de Langen
d75bcb896f FIX linting 2017-06-06 15:55:44 +02:00
Michael Shilman
5ec0dad1a3 Updated repository URL to address broken npm images 2017-06-06 01:48:54 +12:00
Norbert de Langen
a1042139cf Merge branch 'master' into addon-info-new-options 2017-06-05 14:59:59 +02:00
Michael Shilman
77e167599e v3.0.1 2017-06-06 00:58:57 +12:00
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
31b8e9efca Updating package.json to use the new dependency 2017-06-04 20:33:40 -05: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
6be7f418f9 fix stories 2017-05-31 13:05:54 +03: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
c6ebe9a4a0 Merge branch 'master' into addon-info-new-options 2017-05-30 17:10:51 +03:00
Evgeniy Zaitsev
ab611bdc6a add new options to info addon 2017-05-30 17:10:08 +03:00
Michael Shilman
af41dd1c48 v3.0.0 2017-05-31 01:39:35 +12:00
Michael Shilman
470c22f92a v3.0.0-rc.3 2017-05-30 20:46:11 +12:00
Norbert de Langen
db3cd0b6eb FIX spelling 2017-05-27 22:10:34 +02:00
Norbert de Langen
4a2bc9333a v3.0.0-rc.2 2017-05-27 13:46:50 +02:00
Norbert de Langen
67d902f237 FIX listing for markdown 2017-05-26 11:21:46 +02:00
Norbert de Langen
474d6c7945 FIX linting 2017-05-26 10:05:20 +02:00
Norbert de Langen
8be2c88085 FIX cyclical dependencies 2017-05-25 22:22:33 +02:00
Norbert de Langen
f88dfc37ea v3.0.0-rc.0 2017-05-25 18:28:23 +02:00
Michael Shilman
f5237574cd v3.0.0-alpha.5 2017-05-24 08:59:26 +10:00