575 Commits

Author SHA1 Message Date
Daniel Duan
6e73d4a6a0
Merge branch 'release/3.3' into channel-onPeer 2017-11-15 16:51:01 -05:00
hypnos
5c34ccfd7a Merge remote-tracking branch 'origin/release/3.3' into release/3.3 2017-11-16 00:20:30 +03:00
hypnos
c1a7fd95a7 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-11-16 00:19:01 +03:00
Norbert de Langen
66478401f0
Merge branch 'release/3.3' into safe-shortcuts 2017-11-15 21:57:29 +01:00
hypnos
bf90080a59 Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-67.0.0
# Conflicts:
#	yarn.lock
2017-11-15 23:46:55 +03:00
hypnos
6c665e2bf8 Update CLI snapshot 2017-11-15 23:06:07 +03:00
Oleg Proskurin
96daaa859f Fix linting 2017-11-15 14:18:43 -05:00
Oleg Proskurin
2ef57f4d3e Add addPeerListener 2017-11-15 14:18:43 -05:00
Oleg Proskurin
9e65c39968 Add test for addPeerListerner 2017-11-15 14:18:43 -05:00
Norbert de Langen
9d18407052
Merge branch 'master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-15 19:50:17 +01: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
Daniel Duan
c316b4ea1c #2303 use our own published packages 2017-11-15 12:03:29 -05:00
Dependencies.io Bot
dbabb67e52 Update react-split-pane from 0.1.70 to 0.1.71 in lib/ui 2017-11-15 16:39:08 +00:00
Daniel Duan
167e9d78b2
Merge branch 'release/3.3' into safe-shortcuts 2017-11-14 16:10:12 -05:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00
hypnos
cd7236eb0a Remove noise in CI tests 2017-11-11 14:28:47 +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
03507ceb3b Run lint --fix 2017-11-10 23:59:40 +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
hypnos
fb604f98e8 Update CLI snapshot 2017-11-10 03:22:53 +03:00
hypnos
1bfa583d8d Run prettier 2017-11-10 03:11:45 +03:00
hypnos
01f8b63a9a Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/comments/src/manager/components/CommentItem/index.js
#	addons/comments/src/manager/components/CommentItem/style.js
#	addons/knobs/package.json
#	app/react-native/src/preview/components/OnDeviceUI/index.js
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
#	yarn.lock
2017-11-10 03:11:24 +03:00
hypnos
36c7eb84ab Update test snapshots 2017-11-09 23:03:13 +03:00
hypnos
81ab36b5f5 Fix accessibility warnings 2017-11-09 03:10:45 +03:00
Filipp Riabchun
b7c9ace701
Merge branch 'master' into replace-state 2017-11-08 03:29:12 +03:00
hypnos
1920ed1a04 Use replaceState instead of pushState when the story stays the same 2017-11-08 03:23:25 +03:00
hypnos
9af3afc42e Remove unused prop 2017-11-08 02:56:13 +03:00
Dependencies.io Bot
56b908ca40 Update react-modal from 3.1.0 to 3.1.2 in lib/ui 2017-11-07 16:34:06 +00:00
Michael Shilman
6df219ec81 Handle deprecated @storybook/addon-comments codemod 2017-11-07 22:43:29 +09:00
Michael Shilman
60504f8f8c Fix broken CI build
- restore code from
https://github.com/storybooks/storybook/commit/cba07adda085fb3a8d7850f2b
53673be95196c3e
- update test fixture for codemod
2017-11-07 22:13:27 +09:00
Norbert de Langen
cf054ad1b3
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/knobs/package.json
#	addons/knobs/src/components/types/Array.js
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
2017-11-07 09:33:30 +01:00
Michael Shilman
1a6082a4ad v3.3.0-alpha.3 2017-11-07 12:56:56 +09:00
hypnos
5db6040221 Update react-modal to 3.1.0 2017-11-06 05:57:56 +03:00
Norbert de Langen
f20d8603b1
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/src/manager/components/CommentItem/index.js
#	addons/comments/src/manager/containers/CommentsPanel/dataStore.js
#	addons/comments/src/manager/containers/CommentsPanel/index.js
#	addons/info/src/components/PropTable.js
#	lib/cli/bin/generate.js
#	lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
#	lib/ui/src/modules/ui/components/addon_panel/index.test.js
#	scripts/test.js
2017-11-03 00:43:42 +01:00
Filipp Riabchun
ec3a54eac5
Merge branch 'master' into dd/hmr 2017-11-02 15:07:53 +03:00
Daniel Duan
cfb80dd9df #2081 add hmr to other rn app template 2017-11-01 22:57:26 -04:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03:00
hypnos
37e4d2384f Fix CLI tests 2017-11-02 03:06:20 +03:00
Michael Shilman
f15eaa6a68 v3.2.14 2017-11-01 16:21:34 +09:00
hypnos
d891d9fbd8 CLI test: always remove run directory before exiting 2017-11-01 06:43:11 +03:00
hypnos
43450c53c0 Update CLI snapshot for RN 2017-11-01 05:13:45 +03: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
Filipp Riabchun
49fbf3506e
Merge branch 'master' into dependencies.io-update-build-48.0.0 2017-11-01 04:45:03 +03:00
Dependencies.io Bot
ac1dfcf0ed Update react-inspector from 2.2.0 to 2.2.1 in lib/ui 2017-10-31 23:34:46 +00:00
Daniel Duan
1d0d679edf
Merge branch 'release/3.3' into dd/auto-import 2017-10-31 19:28:15 -04: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
e984abdf0a deleting old snapshot files 2017-10-31 18:18:30 -04:00
Daniel Duan
8deadc1edf new snapshots and lock file 2017-10-31 17:21:01 -04:00
Daniel Duan
4f0d2dde44 #1013 autoload all *.stories.js files in cli templates 2017-10-31 13:46:35 -04:00