36 Commits

Author SHA1 Message Date
Michael Shilman
79a88964e8 Merge pull request #1531 from storybooks/fix-3.2-package-versions
Fix bad merge that removed react-treebeard dep from lib/ui
2017-07-27 01:01:05 -07:00
Norbert de Langen
5ba0e4f3ee SYNC dependencies for improved hoisting 2017-07-27 09:56:26 +02:00
Michael Shilman
6b8a1b82a5 Fix bad merge that removed react-treebeard dep from lib/ui 2017-07-27 00:52:40 -07:00
igor
d6f1b89828 Add warnings if 'module' is missing 2017-07-26 10:00:26 +03:00
Norbert de Langen
73130d4cd1 Merge branch 'master' into release/3.2 2017-07-25 09:34:12 +02:00
Michael Shilman
4513cc9f74 v3.2.0-alpha.8 2017-07-20 13:29:18 -07:00
Zander Martineau
6fe09dddde bump react-split-pane version
this should fix issue #1352
2017-07-20 10:26:02 +01:00
Norbert de Langen
3862c99541 Merge branch 'master' into release/3.2
# Conflicts:
#	addons/actions/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	lerna.json
#	lib/cli/package.json
#	lib/ui/package.json
2017-07-20 09:23:47 +02:00
igor
48ee2cd9cf Change the react-treebeard to the main repo version 2017-07-19 09:49:31 +03:00
Norbert de Langen
299a53ac72 SWITCH to circleci over travisCI && CHANGE lerna bootstrap procedure:
- Use yarn for installation
- Hoist all dependencies to root
- Hoist known packages to root

- Test storyshots in cra-kitchen-sink
2017-07-19 08:01:50 +02:00
Michael Shilman
c0933a7a99 v3.1.9 2017-07-16 13:50:00 -07:00
Michael Shilman
f6e4c1167f v3.2.0-alpha.7 2017-07-06 01:39:33 -07:00
Michael Shilman
5642b7df6f v3.2.0-alpha.5 2017-07-02 10:22:53 -07:00
igor
3d65aad62a Upgrade storybook-react-treebeard to a newer version that fixes import syntax 2017-07-02 11:33:34 +03:00
igor
3e315bb73e Use a forked version of the react-treebeard 2017-07-01 13:46:53 +03:00
igor
2fdf710f0f Merge remote-tracking branch 'origin/151-story-hierarchy' into story-hierarchy-3rd-party 2017-06-29 17:27:39 +03:00
igor
8a98f621dc Add react-icons for a better tree structure 2017-06-29 09:17:32 +03:00
Michael Shilman
d8f22cdb85 v3.1.6 2017-06-26 16:32:38 +10:00
igor
b4e794dbb3 Try to use react-treebeard 2017-06-25 19:43:06 +03:00
Michael Shilman
a620cfed2a v3.1.5 2017-06-22 16:36:43 +10:00
Michael Shilman
b32cae6846 v3.1.3 2017-06-10 23:47:36 +12: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
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
Michael Shilman
5ec0dad1a3 Updated repository URL to address broken npm images 2017-06-06 01:48:54 +12:00
Michael Shilman
77e167599e v3.0.1 2017-06-06 00:58:57 +12: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
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
4a2bc9333a v3.0.0-rc.2 2017-05-27 13:46:50 +02:00
Norbert de Langen
f88dfc37ea v3.0.0-rc.0 2017-05-25 18:28:23 +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
bf7db99e6d v3.0.0-alpha.0 2017-05-17 21:49:25 +02:00
Norbert de Langen
69b91f6e53 CHANGE folder structure && CHANGE package-names 2017-05-15 00:08:46 +02:00