4822 Commits

Author SHA1 Message Date
Norbert de Langen
6f7d8f38db Merge pull request #1716 from storybooks/revert-1481-fixes-877
Revert "Improved error checking in global addDecorator"
2017-08-23 14:59:30 +02:00
Igor
743fb3b65e Revert "Improved error checking in global addDecorator" 2017-08-23 15:49:02 +03:00
Norbert de Langen
1843196549 ADD crna-kitchen-sink bootstrap command 2017-08-23 08:30:15 +02:00
Norbert de Langen
879928d9af Merge branch 'master' into improve-bootstrap-command
# Conflicts:
#	.circleci/config.yml
2017-08-23 08:25:07 +02:00
Norbert de Langen
5ee5038570 Merge pull request #1713 from storybooks/fix/1709-cacheDirectory
FIX #1709
2017-08-23 08:00:19 +02:00
Norbert de Langen
d0b51769e3 Linting 2017-08-23 07:50:16 +02:00
Norbert de Langen
b195b2c26b Merge branch 'master' into fix/1709-cacheDirectory 2017-08-23 07:16:50 +02:00
Norbert de Langen
c291483d9c Merge pull request #1714 from storybooks/cli-ensure-proptypes
CLI (React Native): ensure having an explicit dependency on `prop-types`
2017-08-23 07:16:10 +02:00
Norbert de Langen
1a26814f5a Merge pull request #1715 from storybooks/eslint-vue
Enable eslint for vue-related stuff
2017-08-23 07:15:05 +02:00
hypnos
a81b53fd13 Fix rest of lint errors 2017-08-23 03:44:20 +03:00
hypnos
c7508d424b Enable eslint for vue-related stuff. Run eslint --fix 2017-08-23 03:36:32 +03:00
hypnos
2188121c53 CLI (React Native): ensure having an explicit dependency on prop-types 2017-08-23 02:45:50 +03:00
hypnos
4bcff45de0 Revert "CLI (React Native): ensure having an explicit dependency on prop-types"
This reverts commit cfc8bf070a1cd3635a31884012d13d114d1c2b6f.
2017-08-23 02:44:40 +03:00
hypnos
cfc8bf070a CLI (React Native): ensure having an explicit dependency on prop-types 2017-08-23 02:43:52 +03:00
Norbert de Langen
2890dd35f3 FIX #1709 2017-08-23 00:52:49 +02:00
Filipp Riabchun
70d8829e5d Merge pull request #1676 from storybooks/stricter-lint-imports
Stricter linting rules for imports
2017-08-22 23:37:22 +03: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
Daniel Duan
fc1aecb90a Merge pull request #1711 from mordentware/addon-info-remove-broken-prop-sort
Addon Info: Remove broken prop type sort (keep defined order)
2017-08-22 15:29:24 -04:00
mordentware
e821e9dd9a Merge branch 'master' into addon-info-remove-broken-prop-sort 2017-08-22 15:01:18 -04:00
Matthew Gardner
a0fcde6930 Addon Info: Remove broken prop type sort (keep defined order) 2017-08-22 14:40:04 -04:00
Michael Shilman
a3647be4a6 v3.2.6 v3.2.6 2017-08-22 11:02:17 -07:00
Michael Shilman
ac7f213eaa 3.2.6 changelog 2017-08-22 10:59:11 -07:00
Michael Shilman
ff86d37a47 Merge pull request #1710 from storybooks/upgrade-rn-cli-proptypes
Replace React PropTypes with prop-types in RN CLI/examples
2017-08-22 10:48:05 -07: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
Michael Shilman
c21a88b47a v3.2.6-alpha.0 v3.2.6-alpha.0 2017-08-22 00:31:44 -07:00
Michael Shilman
418ab4bfb0 3.2.6 changelog 2017-08-22 00:16:54 -07:00
Norbert de Langen
d1e57b87f5 Merge pull request #1707 from storybooks/greenkeeper/sync-versions
SYNC dependencies between packages
2017-08-22 09:10:19 +02:00
Michael Shilman
7acec61aa4 Merge branch 'master' into greenkeeper/sync-versions 2017-08-21 23:51:43 -07:00
Michael Shilman
92ec2d6d31 Merge pull request #1705 from storybooks/fix-broken-rn-channel
We missed this as part of #1515
2017-08-21 23:46:00 -07:00
Norbert de Langen
49514805a3 SYNC 4 dependencies between packages 2017-08-22 08:27:44 +02:00
Tom Coleman
fd48cbe9c9 Merge branch 'master' into fix-broken-rn-channel 2017-08-22 15:52:43 +10:00
Tom Coleman
c843886519 Merge pull request #1706 from storybooks/remove-test-cra
Remove the `test-cra` example app.
2017-08-22 15:52:33 +10: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
Tom Coleman
e6062b2aa9 We missed this as part of #1515
We need to check for the channel exception on both sides of the channel.
2017-08-22 15:18:25 +10:00
Filipp Riabchun
aa47d71f1b Merge branch 'master' into stricter-lint-imports 2017-08-22 00:40:20 +03:00
Filipp Riabchun
8f4d05a4c5 Merge pull request #1702 from storybooks/hotfix-eslint
[SHOW STOPPER] Fix new eslint error
2017-08-22 00:39:33 +03:00
hypnos
c150b41546 Fix new eslint error 2017-08-21 23:49:00 +03:00
Filipp Riabchun
34daf41fa6 Merge branch 'master' into stricter-lint-imports 2017-08-21 22:28:35 +03:00
Oleg Proskurin
ff23bdf1ab Merge pull request #1700 from ajfuller/patch-1
[documentation] Remove imports from README that are not necessary with latest API
2017-08-21 22:15:37 +03:00
Andrew Fuller
87ae38d4d6 Remove imports from README that are not necessary with latest API 2017-08-21 14:05:42 -05:00
Norbert de Langen
7940e62577 REVERT incorrect changes on docs/pages 2017-08-21 08:07:08 +02:00
Norbert de Langen
b215110e01 FIX circleCI.yml 2017-08-21 07:57:12 +02:00
Norbert de Langen
ed0e61ea03 Merge branch 'master' into improve-bootstrap-command 2017-08-21 01:03:53 +02:00
Norbert de Langen
de7777e16c SWITCH to normal node for bootstrap script && CHANGE circleCI to use new bootstrap script 2017-08-21 01:03:34 +02:00
Norbert de Langen
c85776a605 WIP 2017-08-20 23:48:27 +02:00
hypnos
8b2608687b Restrict import/extensions to warning everywhere 2017-08-20 18:40:47 +03:00
hypnos
2bde6b5bfd Merge remote-tracking branch 'upstream/stricter-lint-imports' into stricter-lint-imports 2017-08-20 18:30:42 +03:00
hypnos
c0dc8212d3 Merge remote-tracking branch 'upstream/master' into stricter-lint-imports 2017-08-20 18:29:47 +03:00