230 Commits

Author SHA1 Message Date
Dependencies.io Bot
3b451cf6de Update glamorous from 4.9.7 to 4.10.0 in examples/cra-kitchen-sink 2017-10-21 12:46:07 +00:00
Dependencies.io Bot
517363c198 Update webpack-dev-server from 2.9.2 to 2.9.3 in examples/vue-kitchen-sink 2017-10-20 16:27:06 +00:00
Derrick Pelletier
8ae2b76902 Merge branch 'master' into issue#1914-button-knob 2017-10-17 10:38:16 -07:00
Derrick Pelletier
ad97eb0b86 updated snapshot for my new dom elements 2017-10-17 10:05:26 -07:00
Derrick Pelletier
377e812abf less ridiculous example for button type in cra 2017-10-17 00:31:16 -07:00
Filipp Riabchun
522bfee637 Merge branch 'master' into vue-2.5.1-23.0.0-app--vue 2017-10-16 01:20:47 +03:00
Dependencies.io Bot
acc55cda39 Update webpack-dev-server from 2.9.1 to 2.9.2 in examples/vue-kitchen-sink 2017-10-15 16:28:11 +00:00
hypnos
c8ffe5543d Merge remote-tracking branch 'origin/vue-template-compiler-2.5.2-24.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	examples/vue-kitchen-sink/package.json
2017-10-15 01:52:33 +03:00
hypnos
11d1575c01 Merge remote-tracking branch 'origin/vue-2.5.2-24.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	examples/vue-kitchen-sink/package.json
#	yarn.lock
2017-10-15 01:51:41 +03:00
Dependencies.io Bot
e2e9586e47 Update vue-template-compiler from 2.4.4 to 2.5.2 in examples/vue-kitchen-sink 2017-10-14 16:40:54 +00:00
Dependencies.io Bot
b453fcd911 Update vue from 2.4.4 to 2.5.2 in examples/vue-kitchen-sink 2017-10-14 16:39:41 +00:00
hypnos
4bd12098e5 Merge remote-tracking branch 'origin/vuex-2.5.0-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	examples/vue-kitchen-sink/package.json
#	yarn.lock
2017-10-13 21:48:01 +03:00
hypnos
1f0fd22647 Merge remote-tracking branch 'origin/vue-template-compiler-2.5.1-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:45:20 +03:00
hypnos
fcd4ed48f2 Merge remote-tracking branch 'origin/vue-hot-reload-api-2.2.0-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:44:43 +03:00
Dependencies.io Bot
d888a9b0b5 Update vue-template-compiler from 2.4.4 to 2.5.1 in examples/vue-kitchen-sink 2017-10-13 16:36:16 +00:00
Dependencies.io Bot
9ff8628dd7 Update vue-hot-reload-api from 2.1.0 to 2.2.0 in examples/vue-kitchen-sink 2017-10-13 16:34:53 +00:00
Dependencies.io Bot
17002cd051 Update vuex from 2.4.1 to 2.5.0 in examples/vue-kitchen-sink 2017-10-13 16:33:29 +00:00
Dependencies.io Bot
36c8b7559e Update vue from 2.4.4 to 2.5.1 in examples/vue-kitchen-sink 2017-10-13 16:32:07 +00:00
Derrick Pelletier
e54076b97c Merge branch 'master' into issue#1914-button-knob 2017-10-09 19:16:11 -07:00
Derrick Pelletier
2576d3af27 updated examples for cra and vue 2017-10-09 18:01:24 -07:00
Derrick Pelletier
f2e8d14a41 Added button knob type, with handler callback support 2017-10-09 17:54:53 -07:00
kazuya kawaguchi
0dd7b95353
👕 refactor(eslint): fix lint errors 2017-10-09 02:53:45 +09:00
kazuya kawaguchi
3e84d8d083
🍭 examples(vue): update for JSX example 2017-10-09 01:42:26 +09:00
hypnos
2e8240d176 Fix/suppress current eslint warnings.
Raise `import/no-unresolved` and `import/extensions` to error level
everywhere except `docs`
2017-10-02 01:40:46 +03:00
Norbert de Langen
2b4930d223 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 18:03:48 +02:00
Norbert de Langen
5d2e3f15f8 Merge branch 'master' into add_braces 2017-09-30 13:35:53 +02: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
Brandon Vandegrift
dbfc2c1de0 update storyshots 2017-09-29 14:09:01 -04:00
hypnos
1c2ca25464 Run eslint --fix on master 2017-09-29 02:13:59 +03:00
Norbert de Langen
db96f28d0f UPGRADE root dependencies and SYNC with packages 2017-09-06 01:54:21 +02:00
Norbert de Langen
665116009c Merge branch 'master' into ndelangen/fix-prettier-linting 2017-09-06 00:59:28 +02:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Norbert de Langen
341cccad75 REMOVE mock-fs and replace it with jest.mock() 2017-09-06 00:39:33 +02:00
ethaan
5a4fe01b10 Fixing typo on VueJS withNotes Example
Fixing wrong param passed to withNotes method.
2017-09-02 17:18:58 -05:00
hypnos
8721f0777d Fix new lint errors 2017-08-22 23:25:47 +03:00
hypnos
0e33495a95 Merge remote-tracking branch 'upstream/master' into stricter-lint-imports
# Conflicts:
#	examples/crna-kitchen-sink/storybook/stories/Button/index.android.js
#	examples/crna-kitchen-sink/storybook/stories/Button/index.ios.js
#	examples/crna-kitchen-sink/storybook/stories/CenterView/index.js
#	examples/crna-kitchen-sink/storybook/stories/Welcome/index.js
#	examples/react-native-vanilla/storybook/stories/Button/index.android.js
#	examples/react-native-vanilla/storybook/stories/Button/index.ios.js
#	examples/react-native-vanilla/storybook/stories/CenterView/index.js
#	examples/react-native-vanilla/storybook/stories/Welcome/index.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js
2017-08-22 23:23:25 +03:00
Michael Shilman
46211e99d5 Use prop-types for RN CLI instead of deprecated react PropTypes 2017-08-22 09:59:48 -07:00
Filipp Riabchun
88ef5b2171 Merge branch 'master' into stricter-lint-imports 2017-08-22 12:50:25 +03:00
Tom Coleman
e27a9c08f1 Remove the test-cra example app.
No longer needed, we can now test `cra-kitchen-sink`
2017-08-22 15:39:46 +10:00
hypnos
524110b2e5 Revert "Deprecate confusing option names"
This reverts commit 713623201b987d13cdcd39013ee96e256e5908fd.
2017-08-20 06:31:00 +03:00
hypnos
713623201b Deprecate confusing option names 2017-08-20 06:27:53 +03:00
hypnos
fb5e28fa01 Merge remote-tracking branch 'upstream/master' into stricter-lint-imports
# Conflicts:
#	examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap
2017-08-19 14:37:56 +03:00
Norbert de Langen
b26ec2d452 FIX snapshots 2017-08-18 22:11:32 +02:00
hypnos
85aeb4ee72 Fix new errors 2017-08-18 19:10:28 +03:00
Filipp Riabchun
4b4914833f Merge branch 'master' into stricter-lint-imports 2017-08-18 18:45:58 +03:00
Daniel Duan
0b0b26dd04 snapshot update 2017-08-18 11:40:17 -04:00
Joao Ribeiro
03ea103166 Add flowtype example again 2017-08-18 11:40:17 -04:00
Daniel Duan
2e25fee3d2 docgen spacing issues 2017-08-18 11:06:43 -04:00
Daniel Duan
2c289d7666 Merge pull request #1562 from storybooks/info-docgen
Add new react-docgen propTypes to info addon
2017-08-18 11:03:40 -04:00