5972 Commits

Author SHA1 Message Date
Norbert de Langen
a13614f17c
Merge pull request #2212 from storybooks/update-airbnb-eslint
Upgrade eslint-config-airbnb and make it pass
2017-11-02 07:11:25 +01:00
Daniel Duan
23b5958151
let's close some issues 2017-11-01 23:06:59 -04:00
Daniel Duan
cfb80dd9df #2081 add hmr to other rn app template 2017-11-01 22:57:26 -04:00
hypnos
9856f319da Fix apps 2017-11-02 04:56:40 +03:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03:00
Filipp Riabchun
e365f8d251
Merge pull request #2210 from storybooks/dd/knob-select
#2209 knobs refactor accidentally removed select
2017-11-02 03:56:18 +03:00
Daniel Duan
a5f3c38529 #2209 knobs refactor accidentally removed select 2017-11-01 20:34:01 -04:00
hypnos
37e4d2384f Fix CLI tests 2017-11-02 03:06:20 +03:00
hypnos
72e43052c9 Remove @types/jasminewd2 dependency
(cherry picked from commit a458fa6)
2017-11-02 02:42:24 +03:00
Norbert de Langen
7a43dd1303
Merge branch 'master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/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
2017-11-01 21:57:39 +01:00
Filipp Riabchun
640dc3209f
Merge pull request #2201 from storybooks/cli-autocleanup
CLI test: always remove `run` directory before exiting
2017-11-01 14:12:03 +03:00
Norbert de Langen
d8535918f5
Merge branch 'release/3.3' into cli-autocleanup 2017-11-01 08:39:50 +01:00
Michael Shilman
f15eaa6a68 v3.2.14 v3.2.14 2017-11-01 16:21:34 +09:00
Michael Shilman
619af05519 3.2.14 changelog 2017-11-01 16:11:48 +09:00
Filipp Riabchun
40776bfb82
Merge branch 'master' into release/3.3 2017-11-01 07:20:12 +03:00
Filipp Riabchun
02b04cceb0
Merge pull request #2202 from mccullochk/update-readme
Change README to match package.json script
2017-11-01 07:19:30 +03:00
mccullochk
7843994031 Change README to match package.json scripts 2017-10-31 20:53:34 -07:00
hypnos
d891d9fbd8 CLI test: always remove run directory before exiting 2017-11-01 06:43:11 +03:00
Filipp Riabchun
1904c54d1f
Merge pull request #2189 from storybooks/dd/remove-comments
#2180 removing addon comments from codebase
2017-11-01 06:04:17 +03:00
hypnos
64b5774306 Merge branch 'release/3.3' into dd/remove-comments
# Conflicts:
#	yarn.lock
2017-11-01 05:47:03 +03:00
hypnos
c07552c471 Merge branch 'release/3.3' into dd/remove-comments
# Conflicts:
#	yarn.lock
2017-11-01 05:23:22 +03:00
hypnos
b5546afb5f Update lockfile 2017-11-01 05:22:06 +03:00
Filipp Riabchun
5819e814b3
Merge branch 'release/3.3' into dd/remove-comments 2017-11-01 05:14:14 +03:00
hypnos
43450c53c0 Update CLI snapshot for RN 2017-11-01 05:13:45 +03:00
hypnos
3af05719ad Integrate changes from #2199 into app/angular 2017-11-01 05:11:35 +03:00
hypnos
5362da6137 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	app/react/src/server/index.js
#	app/vue/src/server/index.js
2017-11-01 05:10:22 +03:00
Filipp Riabchun
3a25d937d9
Merge pull request #2199 from storybooks/derekstavis-patch-2
Avoid logging an object on compilation errors [2]
2017-11-01 05:08:24 +03:00
Filipp Riabchun
7d07c40688
Merge branch 'master' into derekstavis-patch-2 2017-11-01 05:02:12 +03:00
Filipp Riabchun
e5758da30f
Merge branch 'release/3.3' into dd/remove-comments 2017-11-01 05:01:43 +03:00
hypnos
73a8026801 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	examples/cra-kitchen-sink/package.json
#	yarn.lock
2017-11-01 05:00:41 +03:00
Filipp Riabchun
90feaf9315
Merge pull request #2200 from storybooks/dependencies.io-update-build-48.0.0
7 packages updated by dependencies.io
2017-11-01 04:57:23 +03:00
Daniel Duan
d75fd44797
Merge branch 'master' into derekstavis-patch-2 2017-10-31 21:55:53 -04:00
Filipp Riabchun
49fbf3506e
Merge branch 'master' into dependencies.io-update-build-48.0.0 2017-11-01 04:45:03 +03:00
Filipp Riabchun
10dcb53f3d
Merge pull request #2194 from storybooks/dd/rn-hmr
#2081 fix hmr in react-native template
2017-11-01 04:44:18 +03:00
hypnos
dae445fbb3 Merge branch 'release/3.3' into dd/remove-comments
# Conflicts:
#	yarn.lock
2017-11-01 03:55:12 +03:00
Filipp Riabchun
3e1fdff84b
Merge branch 'master' into release/3.3 2017-11-01 03:30:32 +03:00
Filipp Riabchun
ea5276f96c
Merge branch 'master' into dd/rn-hmr 2017-11-01 03:29:14 +03:00
Filipp Riabchun
f05108250e
Merge pull request #2195 from storybooks/dd/auto-import
#1013 autoload all *.stories.js files in cli templates
2017-11-01 02:59:06 +03:00
Dependencies.io Bot
35822f169c Update react-scripts from 1.0.14 to 1.0.16 in examples/cra-kitchen-sink 2017-10-31 23:43:33 +00:00
Dependencies.io Bot
86e386eb39 Update babel-preset-react-app from 3.0.3 to 3.1.0 in app/vue 2017-10-31 23:40:43 +00:00
Dependencies.io Bot
288e9aa305 Update babel-preset-react-app from 3.0.3 to 3.1.0 in app/react 2017-10-31 23:37:46 +00:00
Dependencies.io Bot
ac1dfcf0ed Update react-inspector from 2.2.0 to 2.2.1 in lib/ui 2017-10-31 23:34:46 +00:00
Dependencies.io Bot
8124706299 Update typescript from 2.5.3 to 2.6.1 in addons/knobs 2017-10-31 23:32:59 +00:00
Filipp Riabchun
e98afd942c
Merge branch 'master' into derekstavis-patch-2 2017-11-01 02:32:25 +03:00
Dependencies.io Bot
143dcf31e4 Update @types/react from 16.0.18 to 16.0.19 in addons/knobs 2017-10-31 23:31:06 +00:00
Dependencies.io Bot
2c0895c26d Update react-inspector from 2.2.0 to 2.2.1 in addons/actions 2017-10-31 23:29:17 +00:00
Daniel Duan
1d0d679edf
Merge branch 'release/3.3' into dd/auto-import 2017-10-31 19:28:15 -04:00
hypnos
7028a8a41c Copypaste the change to vue app 2017-11-01 02:26:42 +03:00
Filipp Riabchun
64c29d73fa
Merge pull request #2133 from storybooks/dd/fix-info-story-description
fix info not importing docgen descriptions
2017-11-01 02:12:41 +03:00
hypnos
d42e4c11d8 Fix lint 2017-11-01 02:06:22 +03:00