282 Commits

Author SHA1 Message Date
hypnos
288f5ed4ce Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-12-19 00:09:11 +01:00
hypnos
34edb72e19 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/a11y/package.json
#	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/jest/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
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/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-12-18 23:56:37 +01:00
hypnos
d450633d32 Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-126.0.0
# Conflicts:
#	addons/graphql/package.json
#	yarn.lock
2017-12-18 23:44:05 +01:00
Michael Shilman
2aea83798e v3.2.18 2017-12-18 13:58:53 -08:00
Voss, Jennifer (ELS-PHI)
a8cb915f60 Merge remote-tracking branch 'upstream/release/3.3' into update-addon-info-docs 2017-12-17 13:07:27 -05:00
Dependencies.io Bot
231c731b3e Update ws from 3.3.2 to 3.3.3 in app/react-native 2017-12-17 16:25:13 +00:00
Dependencies.io Bot
34cafba678 Update file-loader from 1.1.5 to 1.1.6 in app/react-native 2017-12-16 16:27:54 +00:00
hypnos
0666f9c5eb Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	yarn.lock
2017-12-14 23:26:46 +03:00
Dependencies.io Bot
68f5acd561 Update style-loader from 0.18.2 to 0.19.1 in app/react-native 2017-12-14 20:02:08 +00:00
Dependencies.io Bot
0c70ceae74 Update autoprefixer from 7.2.2 to 7.2.3 in app/react-native 2017-12-14 20:02:07 +00:00
Rob Halff
d6935160fe Merge remote-tracking branch 'upstream/release/3.3' into fix-types-and-refactor 2017-12-13 18:24:31 +00:00
hypnos
6f83553825 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	yarn.lock
2017-12-08 20:17:54 +03:00
Dependencies.io Bot
d8c6c42607 Update autoprefixer from 7.2.1 to 7.2.2 in app/react-native 2017-12-08 16:29:46 +00:00
Rob Halff
db9e5ad1b6 Merge remote-tracking branch 'origin/fix-types-and-refactor' into fix-types-and-refactor
# Conflicts:
#	addons/actions/src/preview.js
2017-12-07 17:07:29 +00:00
hypnos
efb5b7d1a5 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-12-07 02:30:12 +03:00
Dependencies.io Bot
55bf8e8e3f Update react-native from 0.50.4 to 0.51.0 in app/react-native 2017-12-06 19:36:53 +00:00
hypnos
9af5189a10 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	lib/ui/src/modules/ui/components/search_box.js
2017-12-06 01:25:09 +03:00
hypnos
eedd25798f Run lint --fix 2017-12-05 14:58:48 +03:00
hypnos
dfd188966f Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/a11y/package.json
#	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/jest/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
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/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-12-05 03:22:47 +03:00
Dependencies.io Bot
4aea87d0eb Update webpack from 3.8.1 to 3.10.0 in app/react-native 2017-12-04 23:35:32 +00:00
Dependencies.io Bot
13c2b4b16b Update commander from 2.12.1 to 2.12.2 in app/react-native 2017-12-04 23:35:10 +00:00
Dependencies.io Bot
9fe3d7e3f3 Update autoprefixer from 7.1.6 to 7.2.1 in app/react-native 2017-12-04 23:35:08 +00:00
Michael Shilman
2e1fe20fc6 v3.2.17 2017-12-03 11:59:11 -08:00
hypnos
feb942266b Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-29 04:33:51 +03:00
Dependencies.io Bot
f6bfd1177e Update webpack-hot-middleware from 2.20.0 to 2.21.0 in app/react-native 2017-11-27 16:24:30 +00:00
Dependencies.io Bot
6bb31be141 Update webpack-dev-middleware from 1.12.1 to 1.12.2 in app/react-native 2017-11-27 16:23:21 +00:00
hypnos
78c53c4ebc Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-25 01:08:09 +03:00
Dependencies.io Bot
395fc0da79 Update react-native from 0.50.3 to 0.50.4 in app/react-native 2017-11-24 19:53:04 +00:00
Dependencies.io Bot
1433b58197 Update postcss-loader from 2.0.8 to 2.0.9 in app/react-native 2017-11-24 19:50:45 +00:00
hypnos
1dd0024cb0 Test styles directly instead of using snapshots 2017-11-24 02:54:36 +03:00
Dependencies.io Bot
32441c61a7 Update webpack-dev-middleware from 1.12.0 to 1.12.1 in app/react-native 2017-11-23 16:31:47 +00:00
Dependencies.io Bot
813399b94c Update commander from 2.11.0 to 2.12.1 in app/react-native 2017-11-23 16:30:22 +00:00
Michael Shilman
3c1715daca v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
hypnos
462a8d9425 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-11-21 21:32:38 +03:00
Dependencies.io Bot
9f92d009ca Update ws from 3.3.1 to 3.3.2 in app/react-native 2017-11-21 16:26:37 +00:00
Michael Shilman
7a6c901d71 v3.2.16 2017-11-15 18:03:04 -08:00
Norbert de Langen
cdcecb6a78
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react 2017-11-15 22:44:56 +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
9fc6e35c69
Merge branch 'master' into fix/react-native-drawer-width 2017-11-13 23:34:16 -05:00
Dan Green
f3d0827695 Add support for markdown to jest, vue, react native, and angular 2017-11-13 23:06:01 -05:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00
ahanriat
6f069dec86 [react-native] fix drawer width 2017-11-13 15:39:29 +01: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
Dependencies.io Bot
9383acdaf5 Update ws from 3.3.0 to 3.3.1 in app/react-native 2017-11-10 20:42:46 +00: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
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
Daniel Duan
59bb39abc6 good enough improvements to storybook 2017-11-08 23:24:47 -05:00
Daniel Duan
c9169cf793 detect iPhoneX only 2017-11-08 23:24:47 -05:00
Daniel Duan
77b3151b9c #2243 optimizing for iphone x 2017-11-08 23:20:22 -05:00