301 Commits

Author SHA1 Message Date
hypnos
0d684f89dc Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	docs/pages/basics/faq/index.md
#	examples/vue-kitchen-sink/package.json
#	lib/cli/generators/SFC_VUE/index.js
#	lib/cli/generators/VUE/index.js
#	lib/cli/lib/helpers.js
#	lib/cli/package.json
#	lib/ui/package.json
#	package.json
#	yarn.lock
2017-10-17 03:24:46 +03:00
Dependencies.io Bot
577656ab44 Update webpack-hot-middleware from 2.19.1 to 2.20.0 in app/react-native 2017-10-16 16:27:55 +00:00
Dependencies.io Bot
7b8462102d Update postcss-loader from 2.0.7 to 2.0.8 in app/react-native 2017-10-14 16:33:16 +00:00
Dependencies.io Bot
87f4eff357 Update webpack from 3.6.0 to 3.7.1 in app/react-native 2017-10-12 16:24:13 +00:00
Filipp Riabchun
6834226a7e Merge branch 'master' into postcss-loader-2.0.7-21.0.0-app--react-native 2017-10-11 23:13:15 +02:00
Dependencies.io Bot
2c6cf4b212 Update postcss-loader from 2.0.6 to 2.0.7 in app/react-native 2017-10-11 16:25:28 +00:00
Dependencies.io Bot
b56dc97a29 Update express from 4.16.1 to 4.16.2 in app/react-native 2017-10-11 16:23:46 +00:00
Filipp Riabchun
e6c63e998b Merge branch 'master' into react-native-0.49.1-9.0.0-app--react-native 2017-10-10 01:41:33 +02:00
hypnos
ebbda931fd Merge remote-tracking branch 'origin/master' into react-native-0.49.1-9.0.0-app--react-native
# Conflicts:
#	yarn.lock
2017-10-10 01:24:17 +02:00
Dependencies.io Bot
6f78c2e3f3 Update autoprefixer from 7.1.4 to 7.1.5 in app/react-native 2017-10-09 22:24:19 +00:00
hypnos
f07cb15973 Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-05 02:42:23 +03:00
Filipp Riabchun
f0ce6a3d66 Merge branch 'master' into react-native-0.49.1-9.0.0-app--react-native 2017-10-04 16:41:06 -07:00
Dependencies.io Bot
8396bc4ffe Update react-native from 0.43.4 to 0.49.1 in app/react-native 2017-10-04 21:50:49 +00:00
Dependencies.io Bot
a67e0cb7f5 Update url-loader from 0.5.9 to 0.6.2 in app/react-native 2017-10-04 21:47:51 +00: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
hypnos
41054abc7a Run prettier 2017-10-01 03:07:34 +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
98e066388c Merge branch 'master' into ndelangen/upgrade-react 2017-09-29 23:39:29 +02: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
hypnos
8003d59142 Run eslint --fix 2017-09-29 02:50:06 +03:00
hypnos
74e34a3e88 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/info/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/src/stories/index.js
#	lerna.json
#	lib/ui/package.json
2017-09-29 02:46:39 +03:00
hypnos
1c2ca25464 Run eslint --fix on master 2017-09-29 02:13:59 +03:00
Luke Williams
289a77933f Clarify where left pane is
I thought at first the left pane would be somewhere in my app, but this is referring to a left pane in the web browser.
2017-09-27 15:03:49 -04:00
Michael Shilman
33977480e7 v3.2.11 2017-09-27 00:53:29 +02:00
Norbert de Langen
44e5ec89ae Merge branch 'master' into release/3.3 2017-09-25 13:28:54 +02:00
hypnos
5e2e58fb04 Merge remote-tracking branch 'upstream/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	CONTRIBUTING.md
#	addons/actions/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
2017-09-23 18:29:03 +03:00
Norbert de Langen
fbbff53434 Merge branch 'master' into rmevans9/rn-cli-commands 2017-09-23 12:46:28 +02:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
Michael Shilman
b492555965 Upgrade outdated babel-plugin-transform-regenerator 2017-09-22 22:33:00 +01:00
Richard Evans
8d4805aad5 Add two additional CLI commands to storybook CLI 2017-09-18 20:51:00 -04:00
hypnos
aae4d52c68 Merge remote-tracking branch 'upstream/master' into release/3.3
# Conflicts:
#	addons/storyshots/src/index.js
2017-09-17 00:09:12 +03:00
Gytis Vinclovas
be88c0b690 Added option for custom packager port 2017-09-13 16:02:41 +03:00
Filipp Riabchun
65d1dda4e6 Merge branch 'master' into release/3.3 2017-09-09 22:48:27 +03:00
Maksim Orlov
01c65a3c21 Fix broken links in the deprecation warning for RN and Vue apps 2017-09-09 12:40:03 +07: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
Norbert de Langen
7ab74c6a34 LINTING 2017-09-06 20:57:31 +02:00
Norbert de Langen
99e9ab331c Merge branch 'release/3.3' into fix-ordering-chunk-load 2017-09-06 14:09:43 +02:00
Filipp Riabchun
4a224d7063 Merge branch 'release/3.3' into master 2017-09-06 12:44:00 +03:00
Norbert de Langen
bd6d8a64e6 use HtmlWebpackPlugin for RN & CRNA 2017-09-06 11:12:44 +02:00
Norbert de Langen
8dd71b2bb1 Merge branch 'release/3.3' into thomasbertet/fix-ordering-chunk-load
# Conflicts:
#	app/react/src/server/index.html.js
#	app/vue/src/server/index.html.js
2017-09-06 08:18:33 +02:00
Norbert de Langen
7610652d39 Merge branch 'master' into release/3.3 2017-09-06 07:24:35 +02:00
hypnos
3f51b0b891 Merge remote-tracking branch 'upstream/master' into release/3.3
# Conflicts:
#	.circleci/config.yml
2017-09-06 03:08:34 +03:00
Filipp Riabchun
ab8340afd9 Merge branch 'master' into ndelangen/update-root-dependencies 2017-09-06 03:04:01 +03:00