Daniel Duan
|
2d29fc30ae
|
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react
|
2017-11-15 20:41:47 -05:00 |
|
Daniel Duan
|
efcc280a77
|
more clear examples
|
2017-11-15 20:31:28 -05:00 |
|
Daniel Duan
|
ebd12705fd
|
keep old string
|
2017-11-15 20:12:40 -05:00 |
|
hypnos
|
7fa756c6d4
|
Update storyshot
|
2017-11-16 03:04:26 +03:00 |
|
hypnos
|
04caea154d
|
Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
# examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
|
2017-11-16 02:59:49 +03:00 |
|
Filipp Riabchun
|
e23face689
|
Merge pull request #2321 from storybooks/remove-actions-eval
Addon actions: replace eval with function name assignment
|
2017-11-16 02:56:53 +03:00 |
|
Dan Green
|
dafe0313f5
|
Merge branch 'add-support-for-importing-markdown-in-storybook-react' of https://github.com/storybooks/storybook into add-support-for-importing-markdown-in-storybook-react
|
2017-11-15 18:55:51 -05:00 |
|
Dan Green
|
79b05fed29
|
Fixed a type
|
2017-11-15 18:55:40 -05:00 |
|
hypnos
|
7c72d40c89
|
Addon actions: replace eval with function name assignment
|
2017-11-16 02:12:59 +03:00 |
|
Filipp Riabchun
|
5efd97e270
|
Merge pull request #1879 from storybooks/channel-onPeer
Add method to channel that ignores event from self
|
2017-11-16 01:58:39 +03:00 |
|
Daniel Duan
|
6e73d4a6a0
|
Merge branch 'release/3.3' into channel-onPeer
|
2017-11-15 16:51:01 -05:00 |
|
Norbert de Langen
|
369b8e6fd3
|
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react
|
2017-11-15 22:48:12 +01:00 |
|
Norbert de Langen
|
cdcecb6a78
|
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react
|
2017-11-15 22:44:56 +01:00 |
|
hypnos
|
5c34ccfd7a
|
Merge remote-tracking branch 'origin/release/3.3' into release/3.3
|
2017-11-16 00:20:30 +03:00 |
|
hypnos
|
c1a7fd95a7
|
Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
# addons/knobs/package.json
# yarn.lock
|
2017-11-16 00:19:01 +03:00 |
|
Filipp Riabchun
|
6a50297a58
|
Merge pull request #1858 from storybooks/safe-shortcuts
Safer keyboard shortcuts
|
2017-11-16 00:16:29 +03:00 |
|
Filipp Riabchun
|
969aadbd2f
|
Merge pull request #2312 from storybooks/dependencies.io-update-build-67.0.0
Update 5 dependencies from npm
|
2017-11-16 00:08:55 +03:00 |
|
Norbert de Langen
|
66478401f0
|
Merge branch 'release/3.3' into safe-shortcuts
|
2017-11-15 21:57:29 +01:00 |
|
Filipp Riabchun
|
f53a63b015
|
Merge branch 'master' into dependencies.io-update-build-67.0.0
|
2017-11-15 23:50:11 +03:00 |
|
Filipp Riabchun
|
5473799235
|
Merge pull request #2318 from storybooks/add-reset-to-lockfile-update-instruction
Add `--reset` to lockfile update instruction
|
2017-11-15 23:50:02 +03:00 |
|
hypnos
|
bf90080a59
|
Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-67.0.0
# Conflicts:
# yarn.lock
|
2017-11-15 23:46:55 +03:00 |
|
hypnos
|
a0cfbfbc1d
|
Merge remote-tracking branch 'origin/master' into add-reset-to-lockfile-update-instruction
|
2017-11-15 23:38:01 +03:00 |
|
hypnos
|
8b278d6fae
|
Add --reset to lockfile update instruction
|
2017-11-15 23:36:37 +03:00 |
|
hypnos
|
6c665e2bf8
|
Update CLI snapshot
|
2017-11-15 23:06:07 +03:00 |
|
hypnos
|
1fa8badce2
|
Update lockfile
|
2017-11-15 23:06:07 +03:00 |
|
Filipp Riabchun
|
ee23db022f
|
Merge branch 'master' into release/3.3
|
2017-11-15 23:02:54 +03:00 |
|
Filipp Riabchun
|
a87435863d
|
Merge pull request #2311 from storybooks/dependencies.io-update-build-67.1.0
Update 3 dependencies from npm
|
2017-11-15 23:00:52 +03:00 |
|
Filipp Riabchun
|
db06fa3cfd
|
Merge branch 'master' into dependencies.io-update-build-67.1.0
|
2017-11-15 22:50:29 +03:00 |
|
Norbert de Langen
|
305a32a00b
|
Add missing devDependency eslint complains about
|
2017-11-15 20:45:36 +01:00 |
|
Oleg Proskurin
|
96daaa859f
|
Fix linting
|
2017-11-15 14:18:43 -05:00 |
|
Oleg Proskurin
|
2ef57f4d3e
|
Add addPeerListener
|
2017-11-15 14:18:43 -05:00 |
|
Oleg Proskurin
|
9e65c39968
|
Add test for addPeerListerner
|
2017-11-15 14:18:43 -05:00 |
|
Norbert de Langen
|
9d18407052
|
Merge branch 'master' into release/3.3
# Conflicts:
# yarn.lock
|
2017-11-15 19:50:17 +01:00 |
|
Norbert de Langen
|
e8c8f33f97
|
Merge branch 'master' into release/3.3
# Conflicts:
# addons/comments/package.json
# addons/links/package.json
# addons/storyshots/package.json
# examples/cra-kitchen-sink/.storybook/addons.js
# examples/cra-kitchen-sink/package.json
# examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
# yarn.lock
|
2017-11-15 19:40:55 +01:00 |
|
Daniel Duan
|
4ef3d961b3
|
Merge pull request #2314 from storybooks/dd/deprecated-dependencies
use @storybook published deprecated dependencies
|
2017-11-15 13:40:42 -05:00 |
|
Daniel Duan
|
d9f8ef396f
|
new lock
|
2017-11-15 13:24:01 -05:00 |
|
Daniel Duan
|
1ca03d0df9
|
new lock file
|
2017-11-15 12:26:03 -05:00 |
|
Daniel Duan
|
c316b4ea1c
|
#2303 use our own published packages
|
2017-11-15 12:03:29 -05:00 |
|
Dependencies.io Bot
|
dbabb67e52
|
Update react-split-pane from 0.1.70 to 0.1.71 in lib/ui
|
2017-11-15 16:39:08 +00:00 |
|
Dependencies.io Bot
|
1c990b7e87
|
Update @types/react from 16.0.22 to 16.0.23 in addons/knobs
|
2017-11-15 16:36:52 +00:00 |
|
Dependencies.io Bot
|
c15f1d807b
|
Update @types/node from 8.0.51 to 8.0.52 in addons/knobs
|
2017-11-15 16:34:47 +00:00 |
|
Dependencies.io Bot
|
61162d4759
|
Update enzyme-adapter-react-16 from 1.0.4 to 1.1.0 in /
|
2017-11-15 16:32:31 +00:00 |
|
Dependencies.io Bot
|
33be29e5c3
|
Update gatsby-remark-images from 1.5.31 to 1.5.32
|
2017-11-15 16:28:45 +00:00 |
|
Dependencies.io Bot
|
88de68bebb
|
Update enzyme from 3.1.1 to 3.2.0 in /
|
2017-11-15 16:28:25 +00:00 |
|
Dependencies.io Bot
|
a481215405
|
Update gatsby-plugin-sharp from 1.6.20 to 1.6.21
|
2017-11-15 16:26:20 +00:00 |
|
Dependencies.io Bot
|
44807e47f8
|
Update gatsby-link from 1.6.27 to 1.6.28
|
2017-11-15 16:23:59 +00:00 |
|
Dan Green
|
9621521d8b
|
Added better documentation for using markdown
|
2017-11-15 09:16:14 -05:00 |
|
Dan Green
|
6e3496e672
|
Merge branch 'add-support-for-importing-markdown-in-storybook-react' of github.com:storybooks/storybook into add-support-for-importing-markdown-in-storybook-react
|
2017-11-14 19:07:40 -05:00 |
|
Dan Green
|
83e016f293
|
Added markdown example to withNotes addon
Fixed withNotes addon example to use proper JSX (self closing element)
|
2017-11-14 19:06:46 -05:00 |
|
Daniel Duan
|
167e9d78b2
|
Merge branch 'release/3.3' into safe-shortcuts
|
2017-11-14 16:10:12 -05:00 |
|