hypnos
|
fca9ed2b1c
|
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/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
# 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-11-16 22:21:35 +03:00 |
|
Filipp Riabchun
|
e814a4403a
|
Merge pull request #2327 from storybooks/dependencies.io-update-build-68.1.0
Update 4 dependencies from npm
|
2017-11-16 22:15:07 +03:00 |
|
Daniel Duan
|
ec2208a8bb
|
Merge branch 'master' into dependencies.io-update-build-68.1.0
|
2017-11-16 12:51:12 -05:00 |
|
Daniel Duan
|
4246dc68d1
|
ignore more of these shelljs packages
|
2017-11-16 12:49:44 -05:00 |
|
Filipp Riabchun
|
4e43db8321
|
Merge branch 'master' into dependencies.io-update-build-68.1.0
|
2017-11-16 19:45:32 +03:00 |
|
Filipp Riabchun
|
c984edc217
|
Merge pull request #2326 from storybooks/dependencies.io-update-build-68.0.0
Update @types/node in addons/knobs from 8.0.52 to 8.0.53
|
2017-11-16 19:45:19 +03:00 |
|
Dependencies.io Bot
|
8dfa9311e2
|
Update @storybook/react from 3.2.15 to 3.2.16
|
2017-11-16 16:30:46 +00:00 |
|
Dependencies.io Bot
|
21b78e0a07
|
Update @storybook/addons from 3.2.15 to 3.2.16
|
2017-11-16 16:28:31 +00:00 |
|
Dependencies.io Bot
|
00f61f6008
|
Update @types/node from 8.0.52 to 8.0.53 in addons/knobs
|
2017-11-16 16:26:48 +00:00 |
|
Dependencies.io Bot
|
5e0a15992b
|
Update @storybook/addon-links from 3.2.15 to 3.2.16
|
2017-11-16 16:26:09 +00:00 |
|
Dependencies.io Bot
|
39d460ac71
|
Update @storybook/addon-actions from 3.2.15 to 3.2.16
|
2017-11-16 16:24:36 +00:00 |
|
Daniel Duan
|
2a2f8ce7d7
|
Merge pull request #2322 from storybooks/bithound-shelljs
Ignore shelljs in bithound
|
2017-11-15 21:32:26 -05:00 |
|
Daniel Duan
|
afcdcc9f5b
|
Merge pull request #2299 from storybooks/add-support-for-importing-markdown-in-storybook-react
Add support for importing markdown in storybook
|
2017-11-15 21:22:49 -05:00 |
|
Daniel Duan
|
0fb8a8f729
|
Merge branch 'master' into bithound-shelljs
|
2017-11-15 21:14:34 -05:00 |
|
Daniel Duan
|
2d80d9eba3
|
update snapshot
|
2017-11-15 21:09:32 -05:00 |
|
Daniel Duan
|
844b27a08e
|
Ignore shelljs in bithound
|
2017-11-15 21:05:19 -05:00 |
|
Michael Shilman
|
7a6c901d71
|
v3.2.16
v3.2.16
|
2017-11-15 18:03:04 -08:00 |
|
Michael Shilman
|
67a905881a
|
3.2.16 changelog
|
2017-11-15 18:01:48 -08:00 |
|
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 |
|