3814 Commits

Author SHA1 Message Date
igor-dv
0362bc2a96 Merge pull request #1356 from storybooks/151-story-hierarchy
Story Hierarchy (continued)
2017-06-29 22:37:12 +03:00
igor
8262b7bedc Revert code that was injected by aliens 2017-06-29 17:12:40 +03:00
igor
43ca59bb29 Merge remote-tracking branch 'origin/release/3.2' into 151-story-hierarchy
Conflicts:
	addons/info/README.md
2017-06-29 13:49:50 +03:00
Michael Shilman
74fde7bf69 Merge branch 'master' into release/3.2 2017-06-29 03:43:38 -07:00
igor
279e198857 Change the order of the atomic namespace 2017-06-29 13:41:52 +03:00
Michael Shilman
cfa20f947e Merge pull request #1373 from ummahusla/patch-1
📝 Updated link to point to the correct place
2017-06-28 05:38:11 -07:00
Edvins Antonovs
0585290f14 Updated link to point to the correct place 2017-06-28 13:32:37 +01:00
Michael Shilman
dbd6842bbb v3.1.7 v3.1.7 2017-06-28 05:23:31 -07:00
Michael Shilman
cced0648d2 CHANGELOG v3.1.7 2017-06-28 05:13:10 -07:00
Michael Shilman
4dde75b9ba Merge pull request #1348 from storybooks/release-process
Document Storybook release process
2017-06-28 05:03:30 -07:00
Michael Shilman
1cfedc3a62 Merge branch 'master' into release-process 2017-06-28 05:03:19 -07:00
Michael Shilman
afc12f9e0c Merge pull request #1372 from storybooks/joscha/error-non-zero-on-stats-errors
fix: Fail on transpilation errors
2017-06-28 04:55:58 -07:00
Michael Shilman
768f9ffb7b Merge pull request #1363 from joscha/joscha/fix-extract-text-webpack-plugin-usage
fix: allow multiple assets with different types
2017-06-28 04:55:29 -07:00
Joscha Feth
50aac0520c allow guard 2017-06-28 13:39:25 +02:00
Joscha Feth
be7625a7d5 url -> assetUrl 2017-06-28 13:37:26 +02:00
Joscha Feth
9c57ae0d3d factor into one if 2017-06-28 13:18:40 +02:00
Joscha Feth
a9d88cf2f3 u -> url 2017-06-28 13:05:37 +02:00
Joscha Feth
302f15773e Update build.js 2017-06-28 12:57:44 +02:00
Joscha Feth
f3e7a0b02a fix: Fail on transpilation errors
Currently, storybook does not exit non-zero when there are errors in the pipeline, e.g. we are using TypeScript with `ts-loader` and a type error that fails tsc does not make storybook exit non-zero even though the transpilation failed.
2017-06-28 12:57:16 +02:00
Norbert de Langen
e1ea371a10 Merge branch 'master' into release-process 2017-06-28 11:30:41 +02:00
Joscha Feth
6c8898e7bf Merge branch 'master' into joscha/fix-extract-text-webpack-plugin-usage 2017-06-27 14:13:54 +02:00
Oleg Proskurin
da6bd6555e Merge pull request #1366 from kebot/patch-1
typo fix in deprecate message
2017-06-27 14:35:51 +03:00
Keith Yao
4c4a2b07c2 typo fix 2017-06-27 11:27:27 +02:00
Joscha Feth
33472f9af2 fix: allow multiple assets with different types 2017-06-27 02:43:17 +02:00
igor
dbb04c1338 Repalce resolveStoryHierarchy func with hierarchySeparator 2017-06-26 19:48:06 +03:00
Michael Shilman
d8f22cdb85 v3.1.6 v3.1.6 2017-06-26 16:32:38 +10:00
Michael Shilman
6414487370 Clarify 3.1.6 CHANGELOG 2017-06-26 16:25:01 +10:00
Michael Shilman
cc4abb1b98 Linting fixes 2017-06-26 16:06:30 +10:00
Michael Shilman
307205a2e1 CHANGELOG for 3.1.6 2017-06-26 16:05:54 +10:00
Michael Shilman
188876ee43 Merge pull request #1350 from storybooks/1254-storyshots-babel-problem
Remove the `cacheDirectory` option from babel config
2017-06-26 15:50:50 +10:00
Michael Shilman
4752119868 Merge pull request #1359 from storybooks/fix-welcome-message
Fixed welcome instructions
2017-06-26 15:43:42 +10:00
Michael Shilman
8e6df76a2e Tweaked Welcome message and snapshot to fix the build 2017-06-26 15:28:03 +10:00
Michael Shilman
6b87d3d66c Merge pull request #1358 from formido/patch-1
Fix pointer to Button definition location
2017-06-26 15:15:58 +10:00
Michael Shilman
be77100af8 Merge pull request #1347 from marcfallows/marc-actions-uuid
Use uuid for action IDs instead of Math.random (fixes #1109)
2017-06-26 14:38:56 +10:00
Michael Shilman
f0b4141330 Merge branch 'master' into 1254-storyshots-babel-problem 2017-06-26 14:22:33 +10:00
Michael Terry
fcdc98e660 Fix pointer to Button definition location 2017-06-25 19:08:24 -07:00
Tom Coleman
1c0978f83a Only add the cacheDirectory option as we assemble the webpack config. 2017-06-26 10:49:19 +10:00
Michael Shilman
f57a602f5e Merge pull request #1329 from igor-dv/left-panel-hierarchy
Add left panel hierarchy support
2017-06-25 19:28:21 +10:00
igor
21d71731f8 Remove package-lock.json files 2017-06-25 12:20:54 +03:00
igor
df26718e3e Remove require.resolve from libs/ui webpack.config.js 2017-06-25 10:23:19 +03:00
igor
1c33fdab5a Fix tests + Add tests 2017-06-25 10:04:40 +03:00
Michael Shilman
886dfbf6a8 Merge branch 'master' into marc-actions-uuid 2017-06-25 16:17:50 +10:00
igor
bbf6360dde Fix warnings in stories.test.js 2017-06-25 09:16:12 +03:00
igor
87adce4746 Add assertions to left_panel.test.js 2017-06-24 17:08:44 +03:00
igor
17fb4f5c41 Fix the cases when the separator is not a "." 2017-06-24 16:36:29 +03:00
Michael Shilman
f2241b4e87 Merge pull request #1344 from joscha/joscha/remove-addon-notes-types
remove typings for @storybook/addon-notes
2017-06-24 09:12:07 +10:00
Michael Shilman
a88354c8bf Merge pull request #1343 from joscha/joscha/remove-addon-options-types
remove typings for @storybook/addon-options
2017-06-24 09:12:00 +10:00
Michael Shilman
11dc35db97 Merge pull request #1339 from joscha/joscha/remove-addon-knobs-types
remove typings for @storybook/addon-knobs
2017-06-24 09:11:49 +10:00
Michael Shilman
5e82586c26 Merge pull request #1342 from joscha/joscha/remove-addon-links-types
remove typings for @storybook/addon-links
2017-06-24 09:11:32 +10:00
igor
3fde529259 Fix tests + Add tests for hierarchy 2017-06-23 19:15:13 +03:00