87 Commits

Author SHA1 Message Date
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
Hypnosphi
da232aeba2 Move @storybook/addons to peerDependencies in all addons 2017-11-17 22:59:30 +03:00
Norbert de Langen
e8c8f33f97
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/links/package.json
#	addons/storyshots/package.json
#	examples/cra-kitchen-sink/.storybook/addons.js
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
#	yarn.lock
2017-11-15 19:40:55 +01:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00
hypnos
8c8b35a2d2 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/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
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
#	yarn.lock
2017-11-11 03:24:39 +03:00
hypnos
0c4ef51fc5 Update React to 16.1.0 2017-11-10 19:58:38 +03:00
Michael Shilman
0be4efcec8 v3.2.15 2017-11-10 11:39:27 +09:00
Michael Shilman
1a6082a4ad v3.3.0-alpha.3 2017-11-07 12:56:56 +09:00
Michael Shilman
f15eaa6a68 v3.2.14 2017-11-01 16:21:34 +09:00
Norbert de Langen
effe2ee84b Merge branch 'master' into release/3.3
# Conflicts:
#	app/react-native/readme.md
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/cra-kitchen-sink/src/stories/index.js
#	examples/crna-kitchen-sink/package.json
#	integration/__image_snapshots__/cra-kitchen-sink-snap.png
#	integration/__image_snapshots__/vue-kitchen-sink-snap.png
#	yarn.lock
2017-10-31 23:26:48 +01:00
Daniel Duan
336c0a5fbb
Merge branch 'master' into dd/changelo 2017-10-30 10:54:05 -04:00
Daniel Duan
5391854962
Update README.md 2017-10-29 18:56:52 -04:00
Daniel Duan
a4dff5fdd9 #1557 getting rid of old change logs 2017-10-28 19:20:35 -04:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
Norbert de Langen
82cffc7502 Update README.md 2017-10-23 16:01:20 +02:00
Michael Shilman
a701365e70 v3.2.13 2017-10-20 21:44:34 +02:00
Michael Shilman
b577ddd543 v3.3.0-alpha.2 2017-10-03 22:10:15 +02:00
Michael Shilman
3f97c6f175 v3.2.12 2017-10-03 00:29:46 +02:00
Michael Shilman
5030ee196c v3.3.0-alpha.1 2017-10-02 20:57:35 +02:00
Norbert de Langen
a270216e96 Merge branch 'master' into release/3.3
# Conflicts:
#	CONTRIBUTING.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	dependencies.yml
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/crna-kitchen-sink/package.json
#	examples/react-native-vanilla/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js
#	yarn.lock
2017-09-30 23:19:44 +02:00
Filipp Riabchun
f152c0dcb6 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 06:21:30 -07:00
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
hypnos
2f53feb64a Use yarn workspaces on master 2017-09-29 23:00:47 +03:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
hypnos
824bbd6a6d Replace the deprecated prepublish script with prepare 2017-09-08 03:19:39 +03:00
Michael Shilman
94723262d9 v3.3.0-alpha.0 2017-09-06 13:46:17 -07:00
hypnos
26307a08a0 Update addons/options README 2017-08-31 02:08:32 +03:00
Filipp Riabchun
bb21744a2f Merge branch 'master' into deprecate-left-down 2017-08-22 23:21:07 +03:00
Michael Shilman
a3647be4a6 v3.2.6 2017-08-22 11:02:17 -07:00
Michael Shilman
c21a88b47a v3.2.6-alpha.0 2017-08-22 00:31:44 -07:00
hypnos
1b7481be23 Revert "Revert "Deprecate confusing option names""
This reverts commit 524110b2e5c62a901ee9dfa326a1bd5a99e55520.
2017-08-20 06:32:42 +03:00
hypnos
524110b2e5 Revert "Deprecate confusing option names"
This reverts commit 713623201b987d13cdcd39013ee96e256e5908fd.
2017-08-20 06:31:00 +03:00
hypnos
713623201b Deprecate confusing option names 2017-08-20 06:27:53 +03:00
Michael Shilman
4bd3312244 v3.2.4 2017-08-12 16:59:11 -07:00
Oleg Proskurin
da3ed2efd7 Rename selectedDownPanel to selectedAddonPanel 2017-08-12 16:41:11 +03:00
Oleg Proskurin
9bf90d9903 Add docs 2017-08-11 22:33:36 +03:00
michaltaberski
e375f48b68 Add sidebarAnimations config prop 2017-08-04 19:54:08 +02:00
Michael Shilman
ac2c8bdeaa v3.2.3 2017-08-01 13:38:10 -07:00
Michael Shilman
d527512ee4 v3.2.3-alpha.0 2017-08-01 13:13:24 -07:00
Daniel Duan
7cdc25ad9e corrected search box description 2017-08-01 13:24:59 -04:00
Daniel Duan
5e23c37670 add short description to each addon option. 2017-08-01 13:09:05 -04:00
Michael Shilman
47e1396596 v3.2.1 2017-07-31 16:50:55 -07:00
igor
bef736ad73 Check if hierarchySeparator presents in the options object 2017-08-01 01:01:34 +03:00
Michael Shilman
8e03aacb68 v3.2.0 2017-07-31 07:12:08 -07:00
Michael Shilman
c7c7ccb2b9 v3.2.0-alpha.12 2017-07-30 16:35:43 -07:00
Oleg Proskurin
124b3646fb Update regExpStringify 2017-07-30 20:48:33 +03:00
Oleg Proskurin
2e590bfa9f Add regExpStringify 2017-07-30 20:07:11 +03:00
Michael Shilman
0188ace87f v3.2.0-alpha.10 2017-07-27 01:06:54 -07:00
Norbert de Langen
de75c5df89 Merge branch 'master' into release/3.2 2017-07-25 22:34:27 +02:00