9 Commits

Author SHA1 Message Date
Igor
603a09c962
Merge branch 'master' into addon-stories 2018-02-18 15:45:18 +02:00
Hypnosphi
398ff2639e eslint: remove unused disable directives 2018-02-17 20:35:37 +03:00
igor
a1f54bc6ae First addon stories integration 2018-01-31 14:54:29 +02:00
Hypnosphi
bdb1d2a397 Improve dotenv file support 2018-01-24 00:41:29 +03:00
Hypnosphi
aff8b65c40 Official-storybook: warn if *-head.html isn't loaded 2018-01-06 22:49:40 +03:00
Norbert de Langen
c650f793f7
Merge branch 'master' into feature/multiple-hierarchies
# Conflicts:
#	examples/official-storybook/config.js
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_native/package.json
#	lib/cli/test/snapshots/react_native_scripts/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
2018-01-04 13:22:56 +01:00
MJ Meinders
b3a6b01446 post rebase origin/master fixes 2017-12-27 10:52:56 +01:00
Tom Coleman
b6aadd0d19 Added chromatic for main storybook 2017-12-22 12:15:39 +11:00
Tom Coleman
fda897567e Created examples/official-storybook with ui/components/addon stories 2017-12-20 15:22:08 +11:00