217 Commits

Author SHA1 Message Date
Hypnosphi
83d76e4536 Merge remote-tracking branch 'origin/master' into release/3.3 2017-11-17 21:17:28 +03:00
Dependencies.io Bot
e111d45afb Update vue-template-compiler from 2.5.3 to 2.5.5 in app/vue 2017-11-17 17:49:44 +00:00
Dependencies.io Bot
e5499fe719 Update vue from 2.5.3 to 2.5.5 in app/vue 2017-11-17 17:48:07 +00:00
Dependencies.io Bot
2e0f72264d Update vue-hot-reload-api from 2.2.3 to 2.2.4 in app/vue 2017-11-17 17:46:35 +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
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
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
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
Dependencies.io Bot
897d05b2ab Update vue-loader from 13.4.0 to 13.5.0 in app/vue 2017-11-08 10:45:03 +00:00
Dependencies.io Bot
095fbb92bc Update vue-hot-reload-api from 2.2.0 to 2.2.3 in app/vue 2017-11-08 10:43:36 +00: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
AaronFriel
b893e3b2dc Fix package.json in app/vue 2017-11-06 16:33:57 -06:00
AaronFriel
ccd20f1294 Add cross-env as root devdep, remove unnecessary script. 2017-11-06 16:20:51 -06:00
Aaron Friel
8d03cda91d Build scripts working on Windows. 2017-11-06 16:20:21 -06:00
Filipp Riabchun
16276a8058
Merge branch 'master' into update-dev-deps 2017-11-06 22:07:44 +03:00
Filipp Riabchun
1c5a7d1234
Merge branch 'master' into update-file-loader 2017-11-06 21:36:56 +03:00
hypnos
5db6040221 Update react-modal to 3.1.0 2017-11-06 05:57:56 +03:00
hypnos
1609d048c7 Update file-loader to 1.1.5 2017-11-06 03:41:07 +03:00
hypnos
971ac96f9a Update devDependencies 2017-11-05 03:07:18 +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
hypnos
9856f319da Fix apps 2017-11-02 04:56:40 +03:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03:00
Michael Shilman
f15eaa6a68 v3.2.14 2017-11-01 16:21:34 +09:00
hypnos
5362da6137 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	app/react/src/server/index.js
#	app/vue/src/server/index.js
2017-11-01 05:10:22 +03:00
Filipp Riabchun
7d07c40688
Merge branch 'master' into derekstavis-patch-2 2017-11-01 05:02:12 +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
Dependencies.io Bot
86e386eb39 Update babel-preset-react-app from 3.0.3 to 3.1.0 in app/vue 2017-10-31 23:40:43 +00:00
Filipp Riabchun
e98afd942c
Merge branch 'master' into derekstavis-patch-2 2017-11-01 02:32:25 +03:00
hypnos
7028a8a41c Copypaste the change to vue app 2017-11-01 02:26:42 +03:00
Filipp Riabchun
61a8ed026b
Merge branch 'master' into release/3.3 2017-11-01 01:37:42 +03:00
Norbert de Langen
7fa3945dd5
Update README.md 2017-10-31 23:29:09 +01:00
Norbert de Langen
462ea1cc4a Merge branch 'master' into release/3.3 2017-10-24 23:25:18 +02:00
Dependencies.io Bot
eeccac014a Update chalk from 2.2.0 to 2.3.0 in app/vue 2017-10-24 16:28:47 +00:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
gkrafsig
171da12dd4 Updating to new favicon 2017-10-22 20:42:55 -04:00
hypnos
059835eb2d Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-22 22:51:34 +03:00
Dependencies.io Bot
837fa8806f Update autoprefixer from 7.1.5 to 7.1.6 in app/vue 2017-10-22 16:28:20 +00:00
Michael Shilman
a701365e70 v3.2.13 2017-10-20 21:44:34 +02:00
Norbert de Langen
18d5528eef Merge branch 'master' into patch-1 2017-10-20 14:54:39 +02:00
Dependencies.io Bot
521b738e60 Update chalk from 2.1.0 to 2.2.0 in app/vue 2017-10-18 16:37:41 +00:00
Rahul Kadyan
d7ab8eb067 Merge branch 'master' into patch-1 2017-10-17 11:39:32 +00:00
hypnos
26bbc69282 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-10-17 03:27:19 +03:00
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
dbf9fde605 Update webpack-hot-middleware from 2.19.1 to 2.20.0 in app/vue 2017-10-16 16:30:25 +00:00