4635 Commits

Author SHA1 Message Date
Norbert de Langen
55a2b9a0df IMPROVE confirm message 2017-08-23 23:16:40 +02:00
Norbert de Langen
faec65edb3 Merge branch 'master' into improve-bootstrap-command 2017-08-23 22:57:49 +02:00
Michael Shilman
0159955ba7 v3.2.8 v3.2.8 2017-08-23 13:55:09 -07:00
Michael Shilman
4f84bb5133 3.2.8 changelog 2017-08-23 13:38:52 -07:00
Michael Shilman
f4f223e376 Merge pull request #1721 from satazor/patch-1
Fix storyshots with new babel config
2017-08-23 13:22:55 -07:00
Daniel Duan
c5fc849b50 Merge branch 'master' into patch-1 2017-08-23 16:12:47 -04:00
Filipp Riabchun
658e359296 Merge pull request #1722 from PierrickP/master
Fix generators export
2017-08-23 23:05:36 +03:00
André Cruz
227dc9df1e Fix storyshots with new babel config 2017-08-23 20:55:38 +01:00
Pierrick PAUL
fded7874f8 Fix generators export
Correctly export `VUE` and `WEBPACK_REACT` generators
2017-08-23 21:43:42 +02:00
Norbert de Langen
30e7c3779b ADD a confirmation step when doing the reset task, it will NOT ask when --reset is set 2017-08-23 21:16:08 +02:00
Norbert de Langen
7fd661c666 Merge branch 'master' into improve-bootstrap-command 2017-08-23 20:36:13 +02:00
Norbert de Langen
0723401b51 ADD -- --core to CONTRIBUTING.md 2017-08-23 20:35:57 +02:00
Norbert de Langen
2b9d9053ac Merge pull request #1719 from SpainTrain/patch-1
docs(knobs) Add caveat about date defaultValue
2017-08-23 20:12:58 +02:00
Norbert de Langen
6dd4ae783b Merge branch 'improve-bootstrap-command' of github.com:storybooks/storybook into improve-bootstrap-command 2017-08-23 20:11:18 +02:00
Norbert de Langen
f84623d86b ADD .vscode and .idea to gitignore, but whitelist them from being removed with git clean 2017-08-23 20:08:16 +02:00
Norbert de Langen
9f30bbfd57 Merge branch 'master' into improve-bootstrap-command 2017-08-23 18:43:00 +02:00
Mike S
d98f5e838a Merge branch 'master' into patch-1 2017-08-23 12:25:28 -04:00
Mike S
a8216e7938 docs(knobs) Add caveat about date defaultValue
Related to #804
2017-08-23 12:24:22 -04:00
Michael Shilman
c6a690e037 v3.2.7 v3.2.7 2017-08-23 09:23:41 -07:00
Michael Shilman
92fd9dafce 3.2.7 changelog 2017-08-23 09:17:23 -07:00
Norbert de Langen
43b8753ea1 Merge branch 'master' into improve-bootstrap-command 2017-08-23 17:54:00 +02:00
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