160 Commits

Author SHA1 Message Date
Norbert de Langen
9635c29367
Merge branch 'release/3.3' into addons-peer 2017-11-28 23:25:18 +01:00
Filipp Riabchun
7c5c00c893
Merge branch 'master' into release/3.3 2017-11-25 18:55:45 +03:00
Iurii Kucherov
25fe19abd4 Remove unused 'action' variable 2017-11-25 15:56:13 +01:00
hypnos
e92de54e50 Fix addon-actions in legacy Android browser 2017-11-25 02:14:56 +03:00
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
Michael Shilman
7a6c901d71 v3.2.16 2017-11-15 18:03:04 -08:00
hypnos
04caea154d Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
2017-11-16 02:59:49 +03:00
hypnos
7c72d40c89 Addon actions: replace eval with function name assignment 2017-11-16 02:12:59 +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
hypnos
73a8026801 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	examples/cra-kitchen-sink/package.json
#	yarn.lock
2017-11-01 05:00:41 +03:00
Dependencies.io Bot
2c0895c26d Update react-inspector from 2.2.0 to 2.2.1 in addons/actions 2017-10-31 23:29:17 +00: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
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
8a8b552332 Update README.md 2017-10-23 15:49:04 +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
Michael Shilman
70825cb2dc resolve conflicts merging master into release/3.3 2017-10-02 20:20:10 +02:00
hypnos
2e8240d176 Fix/suppress current eslint warnings.
Raise `import/no-unresolved` and `import/extensions` to error level
everywhere except `docs`
2017-10-02 01:40:46 +03: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
33977480e7 v3.2.11 2017-09-27 00:53:29 +02:00
hypnos
ac658db9dc Merge remote-tracking branch 'origin/master' into release/3.3 2017-09-26 00:49:53 +03:00
hypnos
630968ea4b Update react-inspector to fix #1831 2017-09-25 00:12:21 +03:00
Rob Halff
28bcceac8c use reviver to inject constructor.name 2017-09-24 21:33:01 +02:00
Rob Halff
dcfc078864 remove NodeRenderer 2017-09-24 20:16:52 +02:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
Norbert de Langen
b3fac7ee71
FIX by supplying a custom cyclicObject for unit tests 2017-09-22 09:59:28 +02:00
Norbert de Langen
1d8e9a9b4e Merge branch 'release/3.3' into master 2017-09-22 07:53:29 +02:00
Rob Halff
87028a6762 test if object before testing for cyclic 2017-09-22 06:53:20 +02:00
Rob Halff
ba19c3453b add isObject 2017-09-22 06:51:33 +02:00
Rob Halff
a1f0583039 increase max depth 2017-09-22 06:18:30 +02:00
Rob Halff
be8171bd9f add test 2017-09-22 04:44:11 +02:00
Rob Halff
4264f41379 use retrocycle, no deepEqual if cyclic 2017-09-22 04:37:31 +02:00
Rob Halff
659bc076cb use custom node renderer, sort objects keys & hide non enumerable 2017-09-22 04:34:18 +02:00
Rob Halff
94fe359e23 use decycle instead of json-stringify-safe 2017-09-22 04:33:03 +02:00
Rob Halff
e063717df7 add utility functions 2017-09-22 04:31:11 +02:00
Rob Halff
2bb519d1fb add custom node renderer 2017-09-22 04:29:24 +02:00