5 Commits

Author SHA1 Message Date
Norbert de Langen
fef21c26a7
Merge branch 'master' into tech/overhaul-ui
# Conflicts:
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/jest/src/register.js
#	addons/knobs/src/components/types/Array.js
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/storyshots/storyshots-core/package.json
#	lib/channel-websocket/package.json
#	lib/components/package.json
#	lib/components/src/layout/desktop.js
#	lib/ui/package.json
#	lib/ui/src/modules/api/actions/api.js
#	lib/ui/src/modules/shortcuts/actions/shortcuts.js
#	lib/ui/src/modules/ui/components/stories_panel/index.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.js
#	lib/ui/src/modules/ui/components/stories_panel/text_filter.test.js
#	lib/ui/src/modules/ui/containers/header.js
#	lib/ui/src/modules/ui/containers/layout.js
#	lib/ui/src/modules/ui/libs/filters.js
#	yarn.lock
2018-10-11 11:21:31 +02:00
igor-dv
abf3c3c045 Mock addon-jest.testresults.json for storyshots 2018-09-17 18:57:15 +03:00
igor-dv
0c98009520 Add custom config implementation + allow configPath to point on config.js file 2018-06-11 02:51:24 +03:00
igor-dv
3326e19c9a Add integrityOptions to storyshots with multiSnapshotWithOptions 2018-04-15 10:17:02 +03:00
igor
97c2b4242f Initial dirty-half-working-POC of the storyshots for angular 2017-12-26 16:32:18 +02:00