Norbert de Langen
50774cb5ab
Merge branch 'release/3.3' into ( #1736 )-Ability-to-force-redender-a-story
2017-12-15 00:18:02 +01:00
hypnos
0666f9c5eb
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# addons/knobs/package.json
# app/react-native/package.json
# yarn.lock
2017-12-14 23:26:46 +03:00
Dependencies.io Bot
46e3065280
Update nodemon from 1.12.6 to 1.12.7 in app/react
2017-12-14 20:02:10 +00:00
Dependencies.io Bot
d0c1a9657b
Update style-loader from 0.18.2 to 0.19.1 in app/react
2017-12-14 20:02:09 +00:00
Dependencies.io Bot
07f54de9a6
Update autoprefixer from 7.2.2 to 7.2.3 in app/react
2017-12-14 20:02:09 +00:00
Filipp Riabchun
a9022b5d84
Merge branch 'release/3.3' into fix-types-and-refactor
2017-12-13 22:24:06 +03:00
hypnos
147a51d8dc
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# addons/knobs/package.json
# yarn.lock
2017-12-13 22:21:49 +03:00
Rob Halff
d6935160fe
Merge remote-tracking branch 'upstream/release/3.3' into fix-types-and-refactor
2017-12-13 18:24:31 +00:00
Dependencies.io Bot
0375dc2939
Update nodemon from 1.12.5 to 1.12.6 in app/react
2017-12-13 16:31:36 +00:00
hypnos
2b71e5afa1
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# addons/knobs/package.json
# app/vue/src/server/iframe.html.js
# lib/cli/generators/METEOR/index.js
# yarn.lock
2017-12-13 01:41:22 +03:00
Dependencies.io Bot
8ab527d024
Update core-js from 2.5.2 to 2.5.3 in app/react
2017-12-12 16:35:16 +00:00
Dan Green
6cb8d21486
Merge branch 'release/3.3' into ( #1736 )-Ability-to-force-redender-a-story
2017-12-11 18:31:28 -05:00
Dan Green
98fa5cd117
( #1736 ) Adds Ability to re-render a story programatically in react
...
Also adds support for redux DevTools in react/client
2017-12-11 17:58:07 -05:00
hypnos
22c994c20f
update lockfile
2017-12-09 19:01:34 +02:00
Dependencies.io Bot
97307dde47
Update core-js from 2.5.1 to 2.5.2 in app/react
2017-12-09 16:27:45 +00:00
hypnos
6f83553825
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# addons/knobs/package.json
# app/react-native/package.json
# yarn.lock
2017-12-08 20:17:54 +03:00
Dependencies.io Bot
07f514104b
Update autoprefixer from 7.2.1 to 7.2.2 in app/react
2017-12-08 16:31:12 +00:00
Rob Halff
db9e5ad1b6
Merge remote-tracking branch 'origin/fix-types-and-refactor' into fix-types-and-refactor
...
# Conflicts:
# addons/actions/src/preview.js
2017-12-07 17:07:29 +00:00
hypnos
efb5b7d1a5
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# yarn.lock
2017-12-07 02:30:12 +03:00
Dependencies.io Bot
85f2d3e9ff
Update nodemon from 1.12.4 to 1.12.5 in app/react
2017-12-06 19:37:01 +00:00
hypnos
9af5189a10
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# lib/ui/src/modules/ui/components/search_box.js
2017-12-06 01:25:09 +03:00
hypnos
eedd25798f
Run lint --fix
2017-12-05 14:58:48 +03:00
hypnos
dfd188966f
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# CHANGELOG.md
# addons/a11y/package.json
# addons/actions/package.json
# addons/background/package.json
# addons/centered/package.json
# addons/comments/package.json
# addons/events/package.json
# addons/graphql/package.json
# addons/info/package.json
# addons/jest/package.json
# addons/knobs/package.json
# addons/links/package.json
# addons/notes/package.json
# addons/options/package.json
# addons/storyshots/package.json
# app/react-native/package.json
# app/react/package.json
# app/vue/package.json
# examples/cra-kitchen-sink/package.json
# examples/vue-kitchen-sink/package.json
# lerna.json
# lib/addons/package.json
# lib/channel-postmessage/package.json
# lib/channel-websocket/package.json
# lib/channels/package.json
# lib/cli/package.json
# lib/codemod/package.json
# lib/components/package.json
# lib/ui/package.json
# yarn.lock
2017-12-05 03:22:47 +03:00
Dependencies.io Bot
c0af2111d9
Update nodemon from 1.12.1 to 1.12.4 in app/react
2017-12-04 23:36:18 +00:00
Dependencies.io Bot
da7deee8cc
Update webpack from 3.8.1 to 3.10.0 in app/react
2017-12-04 23:36:04 +00:00
Dependencies.io Bot
ac99830b3e
Update commander from 2.12.1 to 2.12.2 in app/react
2017-12-04 23:35:44 +00:00
Dependencies.io Bot
4ccd300222
Update autoprefixer from 7.1.6 to 7.2.1 in app/react
2017-12-04 23:35:41 +00:00
Dependencies.io Bot
94aea02767
Update airbnb-js-shims from 1.3.0 to 1.4.0 in app/react
2017-12-04 23:35:36 +00:00
Filipp Riabchun
2645a0feb3
Merge branch 'master' into update-deps
2017-12-05 00:47:31 +03:00
Michael Shilman
2e1fe20fc6
v3.2.17
2017-12-03 11:59:11 -08:00
hypnos
ac81d924f4
Major updates for devDependencies
2017-12-03 15:32:52 +03:00
hypnos
feb942266b
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# yarn.lock
2017-11-29 04:33:51 +03:00
Dependencies.io Bot
078c2091d5
Update webpack-hot-middleware from 2.20.0 to 2.21.0 in app/react
2017-11-27 16:26:51 +00:00
Dependencies.io Bot
56441440eb
Update webpack-dev-middleware from 1.12.1 to 1.12.2 in app/react
2017-11-27 16:25:37 +00:00
Dan Green
a34e7093bb
Merge branch 'release/3.3' into Replace-console.log-with-npmlog
2017-11-25 12:16:27 -05:00
Dan Green
283f6dd70c
Merge branch 'Replace-console.log-with-npmlog' of https://github.com/storybooks/storybook into Replace-console.log-with-npmlog
2017-11-24 22:51:08 -05:00
Dan Green
6619a56a34
( #1513 ) Broke up client/node logger packages, implemented new logger in app/react
2017-11-24 22:50:37 -05:00
hypnos
78c53c4ebc
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# yarn.lock
2017-11-25 01:08:09 +03:00
Dependencies.io Bot
c650a920eb
Update postcss-loader from 2.0.8 to 2.0.9 in app/react
2017-11-24 19:55:45 +00:00
Dependencies.io Bot
383f363b4d
Update common-tags from 1.4.0 to 1.5.1 in app/react
2017-11-24 19:54:27 +00:00
Dan Green
0499713a85
Merge branch 'release/3.3' into Replace-console.log-with-npmlog
2017-11-23 19:38:15 -05:00
hypnos
1dd0024cb0
Test styles directly instead of using snapshots
2017-11-24 02:54:36 +03:00
Dependencies.io Bot
e890f70f3c
Update webpack-dev-middleware from 1.12.0 to 1.12.1 in app/react
2017-11-23 16:34:49 +00:00
Dependencies.io Bot
cfd194999d
Update commander from 2.11.0 to 2.12.1 in app/react
2017-11-23 16:33:18 +00:00
Dan Green
4085c1954a
Merge branch 'release/3.3' into Replace-console.log-with-npmlog
2017-11-22 09:33:04 -05:00
Dan Green
f82ae06e9e
( #1513 ) Remove references to npm log from files that are run in the browser
2017-11-22 08:18:40 -05:00
Michael Shilman
5022705708
Merge branch 'release/3.3' of github.com:storybooks/storybook into release/3.3
2017-11-22 03:29:00 -08:00
hypnos
9c3ec0aa6d
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# yarn.lock
2017-11-22 14:17:16 +03:00
Michael Shilman
3c1715daca
v3.3.0-alpha.4
2017-11-22 03:15:31 -08:00
Tom Coleman
6638f5cfb7
Save the preview frame URL as the story changes.
...
Sometimes when there are problems with HMR, we end up doing a
hard-reload of the preview iframe, whilst leaving the main window.
As the preview iframe didn't change its URL ever, this led to problems
where the old (usually original) story was loaded in such circumstances.
See #614 and #1328
2017-11-22 17:11:12 +11:00
