690 Commits

Author SHA1 Message Date
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
Yusuke Kato
89702a813f Add support for using Nuxt in dependensies 2017-10-16 00:56:08 +09:00
hypnos
d45349833d Update CLI snapshot 2017-10-15 01:43:34 +03:00
hypnos
854ec247c1 Add @storybook/cli to list of cli internal deps 2017-10-15 01:37:41 +03:00
Carlos Vega
9becf40098 Mocking @storybook/angular version for the time being
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2017-10-14 10:36:10 -06:00
Carlos Vega
a554bc9080 Updating template and snapshot version
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2017-10-14 10:35:36 -06:00
Carlos Vega
8cb2599835 Fixing protractor and typescript issues with cli tests
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2017-10-14 09:47:25 -06:00
Anthony M
2974669c87 Handle full screen scrolling on iOS 2017-10-13 20:26:24 -07:00
Dependencies.io Bot
833a1e336e Update update-notifier from 2.2.0 to 2.3.0 in lib/cli 2017-10-09 22:22:45 +00:00
Norbert de Langen
6db2b3ba1e Merge branch 'master' into feature/jsx-for-vue 2017-10-09 20:24:05 +02:00
kazuya kawaguchi
0dd7b95353
👕 refactor(eslint): fix lint errors 2017-10-09 02:53:45 +09:00
kazuya kawaguchi
56e3602cbf
improvement(cli): setup JSX configration for Vue 2017-10-09 01:40:48 +09:00
Filipp Riabchun
f3e4068a5e Merge branch 'master' into react-modal-2.4.1-14.0.0-lib--ui 2017-10-07 00:03:44 +02:00
Dependencies.io Bot
6224295b7a Update react-modal from 2.3.3 to 2.4.1 in lib/ui 2017-10-06 16:22:51 +00:00
Dependencies.io Bot
ce0f0de99c Update react-icons from 2.2.5 to 2.2.7 in lib/ui 2017-10-06 16:21:24 +00:00
Carlos Vega
217ec79eb8 Merge branch 'release/3.3' of github.com:storybooks/storybook into 269-angular-support 2017-10-06 08:46:33 -06:00
hypnos
f07cb15973 Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-05 02:42:23 +03:00
Dependencies.io Bot
f32a439521 Update react-modal from 2.3.2 to 2.3.3 in lib/ui 2017-10-04 21:46:15 +00:00
hypnos
83f988b8e3 Merge branch 'master' into release/3.3
# Conflicts:
#	lerna.json
#	package.json
2017-10-04 02:35:31 +03:00
hypnos
ea99cdd5f3 Fix sidebar header wrapping 2017-10-04 01:24:04 +03:00
hypnos
37d81de583 Use a single enzyme dependency 2017-10-04 00:20:18 +03:00
Michael Shilman
cbf60d374e Update example dips to 3.3.0-alpha.2 2017-10-03 22:22:01 +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
fee641ad9c Upgrade example dependencies to 3.3.0-alpha.1
Necessary because lerna doesn’t support non-semver versions
2017-10-02 21:09:31 +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
Michael Shilman
5450f7dc84 Remove open collective notice from storybook install 2017-10-02 18:29:42 +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
hypnos
cd0291d5e0 Fix tests 2017-10-01 03:07:09 +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
igor
6f3580f401 Fix stories_tree/index.test.js 2017-09-30 17:21:57 +03: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
hypnos
a268c5061e Update CLI snapshots 2017-09-28 02:35:21 +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
Filipp Riabchun
061c0fab3f Merge branch 'release/3.3' into vue-cli-actions 2017-09-23 14:16:47 +03:00
Filipp Riabchun
1841a9f999 Merge branch 'release/3.3' into safe-shortcuts 2017-09-23 14:16:39 +03:00
hypnos
c77777da31 Fix actions in SFC_VUE template 2017-09-23 01:37:16 +03:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
hypnos
83cd54b9d8 CLI: Use actions in sample stories for vue 2017-09-20 01:29:08 +03:00