hypnos
f07cb15973
Merge remote-tracking branch 'origin/master' into release/3.3
2017-10-05 02:42:23 +03:00
Filipp Riabchun
854fb24a4e
Merge branch 'master' into url-loader-0.6.2-9.0.0-app--react
2017-10-04 15:39:06 -07:00
Dependencies.io Bot
75f71aea27
Update url-loader from 0.5.9 to 0.6.2 in app/react
2017-10-04 21:54:04 +00:00
Dependencies.io Bot
f81e36865e
Update react-modal from 2.3.2 to 2.3.3 in app/react
2017-10-04 21:52:31 +00: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
5030ee196c
v3.3.0-alpha.1
2017-10-02 20:57:35 +02:00
hypnos
41054abc7a
Run prettier
2017-10-01 03:07:34 +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
Filipp Riabchun
f152c0dcb6
Merge branch 'master' into ndelangen/upgrade-react
2017-09-30 06:21:30 -07:00
Filipp Riabchun
38df1ed32b
Merge branch 'master' into release/3.3
2017-09-30 03:18:59 -07:00
Norbert de Langen
ebd2f8b632
Merge branch 'master' into yarn-master
2017-09-30 11:17:03 +02:00
Norbert de Langen
37898d693b
Merge branch 'master' into ndelangen/upgrade-react
2017-09-30 11:03:15 +02:00
Norbert de Langen
0cb96963f9
Merge branch 'master' into array-iterator-polyfill
2017-09-30 10:46:13 +02:00
Bradley Ayers
aaea3157b1
Gracefully handle fatal webpack errors.
2017-09-30 15:34:10 +10:00
hypnos
6c2ac98609
Add polyfills to fix addon-actions in IE11
2017-09-30 01:36:50 +03: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
603c1bfac7
Fix polyfills loading order
2017-09-28 03:25:25 +03:00
Michael Shilman
33977480e7
v3.2.11
2017-09-27 00:53:29 +02:00
Norbert de Langen
44e5ec89ae
Merge branch 'master' into release/3.3
2017-09-25 13:28:54 +02:00
Filippo Sarzana
4d2fc56685
Update github link
...
This is broken in `yarn outdated`
2017-09-25 12:28:35 +02:00
Michael Shilman
748e5959ec
v3.2.10
2017-09-22 22:42:13 +01:00
Filipp Riabchun
8d99aa8352
Merge branch 'release/3.3' into routed-link-to
2017-09-21 23:14:55 +03:00
Daniel Duan
2fd17040ec
Merge branch 'master' into release/3.3
2017-09-21 14:21:18 -04:00
Rob Richard
7868ada098
Log correct url when using --https
2017-09-20 15:44:50 -04:00
Filipp Riabchun
e76d8ebe11
Merge branch 'release/3.3' into routed-link-to
2017-09-17 00:16:31 +03:00
hypnos
aae4d52c68
Merge remote-tracking branch 'upstream/master' into release/3.3
...
# Conflicts:
# addons/storyshots/src/index.js
2017-09-17 00:09:12 +03:00
Filipp Riabchun
fccb5be208
Merge branch 'release/3.3' into routed-link-to
2017-09-15 23:20:29 +03:00
hypnos
494b0fc949
Exit with code 1 if start-storybook --smoke-test fails
2017-09-15 22:56:46 +03:00
Vesa Laakso
64e2f6b188
Add missing regenerator and runtime babel transform pkgs to package.json
...
app/react/src/server/config/babel.js uses require.resolve on both of
these packages, yet as they are not in the dependencies, they won't be
found unless they are installed alongside storybook itself
2017-09-15 11:39:13 +03:00
hypnos
39af55a076
addon-links: add LinkTo component, and hrefTo function
2017-09-09 22:51:31 +03:00
hypnos
824bbd6a6d
Replace the deprecated prepublish script with prepare
2017-09-08 03:19:39 +03:00
hypnos
2308e98269
Use yarn scripts where possible, omitting extra -- because now we can
2017-09-07 01:58:49 +03:00
hypnos
dc0bd90930
Merge remote-tracking branch 'upstream/release/3.3' into yarn-workspaces
...
# Conflicts:
# yarn.lock
2017-09-07 01:07:27 +03:00
hypnos
4d10a55997
Introduce yarn workspaces
2017-09-07 00:55:44 +03:00
Michael Shilman
94723262d9
v3.3.0-alpha.0
2017-09-06 13:46:17 -07:00
Norbert de Langen
7ab74c6a34
LINTING
2017-09-06 20:57:31 +02:00
Norbert de Langen
8dd71b2bb1
Merge branch 'release/3.3' into thomasbertet/fix-ordering-chunk-load
...
# Conflicts:
# app/react/src/server/index.html.js
# app/vue/src/server/index.html.js
2017-09-06 08:18:33 +02:00
Norbert de Langen
7610652d39
Merge branch 'master' into release/3.3
2017-09-06 07:24:35 +02:00
hypnos
3f51b0b891
Merge remote-tracking branch 'upstream/master' into release/3.3
...
# Conflicts:
# .circleci/config.yml
2017-09-06 03:08:34 +03:00
Filipp Riabchun
ab8340afd9
Merge branch 'master' into ndelangen/update-root-dependencies
2017-09-06 03:04:01 +03:00
Norbert de Langen
db96f28d0f
UPGRADE root dependencies and SYNC with packages
2017-09-06 01:54:21 +02:00
Filipp Riabchun
e1cb69ba5f
Merge branch 'master' into smoke-test-master
2017-09-06 02:47:07 +03:00
hypnos
8c5a813e9f
Add smoke-test option to start-storybook commands
...
(cherry picked from commit dc2159d)
2017-09-06 02:42:24 +03:00
Norbert de Langen
f1ff7b1e1f
Merge branch 'master' into release/3.3
...
# Conflicts:
# app/react/src/server/babel_config.test.js
# examples/cra-kitchen-sink/src/stories/index.js
# examples/crna-kitchen-sink/storybook/stories/index.js
# examples/react-native-vanilla/package.json
# examples/react-native-vanilla/storybook/stories/index.js
# lib/ui/src/modules/ui/components/layout/index.js
2017-09-06 01:33:18 +02:00
