301 Commits

Author SHA1 Message Date
Michael Shilman
d8d955cbbc v3.4.0-alpha.0 2018-01-07 21:32:57 +05:30
Michael Shilman
71c528c462 merge release 3.3.4 to master 2018-01-07 19:36:11 +05:30
Michael Shilman
3abdbb6528 v3.3.4 2018-01-07 18:23:40 +05:30
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
Dependencies.io Bot
9a5a2eaf87 Update enzyme from 3.2.0 to 3.3.0 in examples/cra-kitchen-sink 2017-12-29 16:41:22 +00:00
Dan Green
82699d3f0d
Merge branch 'master' into (#1736)-Ability-to-force-redender-a-story 2017-12-28 13:07:22 -05:00
Michael Shilman
02a69e0b1b v3.3.3 2017-12-28 22:34:34 +05:30
Dan Green
293bb7ad40 Merge branch 'master' of https://github.com/storybooks/storybook into (#1736)-Ability-to-force-redender-a-story 2017-12-28 10:27:55 -05:00
Filipp Riabchun
97d49eddb5
Merge branch 'master' into eslint-imports 2017-12-28 14:02:14 +03:00
Michael Shilman
fbe50ffb46 v3.3.2 2017-12-28 12:10:49 +09:00
hypnos
7c4f87b68c Add more imports eslint rules 2017-12-28 04:38:46 +03:00
Dan Green
31a68d7b90 (#1736) Update Force ReRender storyshot 2017-12-27 11:15:36 -05:00
Norbert de Langen
ce935e6f84
Merge branch 'master' into (#1736)-Ability-to-force-redender-a-story 2017-12-27 14:47:50 +01:00
MJ Meinders
05a0699107 update snapshots 2017-12-27 10:53:02 +01:00
MJ Meinders
b3a6b01446 post rebase origin/master fixes 2017-12-27 10:52:56 +01:00
MJ Meinders
bd025b73f6 change rootSeparator to hierarchyRootSeparator 2017-12-27 10:41:31 +01:00
MJ Meinders
1276f256e8 updated snapshots 2017-12-27 10:41:31 +01:00
MJ Meinders
748b26e0e9 omit Addon prefix from addon stories 2017-12-27 10:41:31 +01:00
MJ Meinders
dbaf4e5690 extend kitchen sink example with multiple hierarchies 2017-12-27 10:41:31 +01:00
Michael Shilman
79c07c727a v3.3.1 2017-12-26 19:30:05 -08:00
Michael Shilman
0c38d5a041 Update cross-dependencies manually
Because of lerna not supporting `x.y.z-alpha.N` versions, we hardcode
these things when we are doing prerelease
2017-12-26 15:42:45 -08:00
Michael Shilman
92d7fca746 v3.3.0-rc.1 2017-12-26 09:48:54 -08:00
Lachlan Campbell
2f56ab361b Update snapshots 2017-12-25 20:52:41 -05:00
hypnos
a8d234b6e9 Update storyshots 2017-12-24 11:32:55 +01:00
Michael Shilman
aa2a8c11f3 v3.3.0-rc.0 2017-12-23 20:20:05 -08:00
Norbert de Langen
d4f00d8613
Merge branch 'release/3.3' into upgrade-jest-v2
# Conflicts:
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
2017-12-23 19:44:58 +01:00
Norbert de Langen
3cfacfe4ec UPGRADE jest to latest & FIX all failing unittests 2017-12-23 18:48:29 +01:00
hypnos
6a1f1f691f Merge branch 'master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-12-23 18:30:24 +01:00
Michael Shilman
4903d6ece7 v3.3.0-alpha.6 2017-12-23 09:25:20 -08:00
Michael Shilman
a65beced79 v3.3.0-alpha.5 2017-12-23 09:05:46 -08:00
Dependencies.io Bot
1e31011715 Update glamorous from 4.11.0 to 4.11.2 in examples/cra-kitchen-sink 2017-12-22 23:53:59 +00:00
Tom Coleman
8823299d49
Merge branch 'release/3.3' into tmeasday/add-stories 2017-12-22 09:08:10 +11:00
Norbert de Langen
6d80f690bf
Merge branch 'release/3.3' into (#1736)-Ability-to-force-redender-a-story 2017-12-21 10:59:39 +01:00
Tom Coleman
3b1d3533e7 Working on moving most storyshots tests over to official-example 2017-12-21 13:55:15 +11:00
Tom Coleman
9467976290
Merge branch 'release/3.3' into tmeasday/remove-rendundant-react-render 2017-12-20 16:39:47 +11:00
Tom Coleman
32acde3371 This is required 2017-12-20 15:38:33 +11:00
Tom Coleman
ae60bb8632 Move more complex component stories over 2017-12-20 15:24:48 +11:00
Tom Coleman
fda897567e Created examples/official-storybook with ui/components/addon stories 2017-12-20 15:22:08 +11:00
Michael Shilman
2aea83798e v3.2.18 2017-12-18 13:58:53 -08:00
Voss, Jennifer (ELS-PHI)
5efa669ab6 Update snapshots 2017-12-18 10:36:29 -05:00
Filipp Riabchun
afb0477207
Merge branch 'release/3.3' into update-addon-info-docs 2017-12-18 15:29:16 +01:00
Norbert de Langen
6486dd92ec
Merge branch 'release/3.3' into tmeasday/remove-rendundant-react-render 2017-12-18 13:51:28 +01:00
Tom Coleman
2145e6731e
Merge branch 'release/3.3' into tmeasday/move-events-stories 2017-12-18 23:45:07 +11:00
Tom Coleman
c6c13662e1 Use @storybook/client-logger in the Lifecycle example 2017-12-18 23:13:46 +11:00
Tom Coleman
7c8cdb72b3 Add events logger snapshots 2017-12-18 22:57:07 +11:00
Tom Coleman
45de9cd8f8 Add storyshots images 2017-12-18 22:50:48 +11:00
Tom Coleman
ebf57a5ed9 Don't render stories twice on bootup. 2017-12-18 14:50:15 +11:00
Tom Coleman
99a8033737 Move addon events into its own story file 2017-12-18 14:14:09 +11:00
Voss, Jennifer (ELS-PHI)
a8cb915f60 Merge remote-tracking branch 'upstream/release/3.3' into update-addon-info-docs 2017-12-17 13:07:27 -05:00
Voss, Jennifer (ELS-PHI)
bd8379807b Merge branch 'release/3.3' into update-addon-info-docs 2017-12-17 12:54:18 -05:00