3659 Commits

Author SHA1 Message Date
Norbert de Langen
59d4cc2b15 Merge branch 'master' into add-lib-components
# Conflicts:
#	examples/cra-kitchen-sink/src/stories/Button.js
#	examples/cra-kitchen-sink/src/stories/Welcome.js
2017-06-16 08:49:59 +02:00
Daniel Duan
253ce664be Merge pull request #1264 from kohlmannj/patch-1
Info add-on: update z-index of container
2017-06-15 12:15:49 -04:00
Joe Kohlmann
0989765e43 Merge branch 'master' into patch-1 2017-06-15 09:43:24 -04:00
Michael Shilman
23c39026e9 Merge pull request #1288 from storybooks/1220-cra-kitchensink-reboot
Redo CRA kitchen sink work from scratch
2017-06-15 22:56:06 +10:00
Michael Shilman
aaa6e5b9c7 Merge branch 'master' into 1220-cra-kitchensink-reboot 2017-06-15 22:38:05 +10:00
Michael Shilman
f64f5b7482 v3.1.4 v3.1.4 2017-06-15 22:08:24 +10:00
Michael Shilman
1bf9eb706f 3.1.4 changelog 2017-06-15 21:37:16 +10:00
Michael Shilman
3cb388c539 Remove package-lock.json files accidentally added 2017-06-15 15:25:14 +10:00
Michael Shilman
9571b40452 Redo CRA kitchen sink work in a single commit
- renamed project
- added `info`, `notes`, `centered`, `knobs` examples
2017-06-15 15:09:08 +10:00
Michael Shilman
88a6fa92b7 Merge pull request #1282 from storybooks/document-1232
Add documentation for `shallowSnapshot`
2017-06-15 12:19:22 +10:00
Michael Shilman
fbe8557673 Merge branch 'master' into document-1232 2017-06-15 12:19:14 +10:00
Michael Shilman
5e1cbb3f8c Merge pull request #1280 from storybooks/1277-react-native-getstorybook
Fix bug in RN gestorybook
2017-06-15 12:16:36 +10:00
Michael Shilman
ea6224af28 Merge branch 'master' into 1277-react-native-getstorybook 2017-06-15 12:16:28 +10:00
Tom Coleman
c254d17732 Create README.md 2017-06-15 10:53:31 +10:00
Tom Coleman
103c72eb2c Merge pull request #1232 from heinzmuller/master
Add a `shallowSnapshot` option for storyshots `test` functions
2017-06-15 10:52:21 +10:00
Norbert de Langen
b7a91109bf Merge branch 'master' into add-lib-components 2017-06-15 00:19:07 +02:00
Michael Shilman
3bf2eeb3d9 Merge pull request #1271 from aaronjheinen/patch-1
Update old namespace link and incorrect UI link
2017-06-15 08:08:30 +10:00
Michael Shilman
a7078fd8ba Merge branch 'master' into patch-1 2017-06-15 08:08:18 +10:00
Michael Shilman
61a3f80831 Merge pull request #1273 from slorber/patch-1
Fix typo in contributing guide
2017-06-15 08:07:36 +10:00
Michael Shilman
07db118e0a Fix typo 2017-06-15 08:04:21 +10:00
Michael Shilman
222ca3c0e3 Fix bug in RN gestorybook
- replace APP_NAME in the correct file
- add a warning if APP_NAME cannot be found
2017-06-15 07:37:57 +10:00
Michael Shilman
ccfa35d84c Merge branch 'master' into patch-1 2017-06-15 07:32:45 +10:00
Michael Shilman
606f34b945 Merge pull request #1276 from storybooks/danger-check-pr-labels
Don't run danger if DANGER_GITHUB_API_TOKEN is not set
2017-06-15 07:31:52 +10:00
Michael Shilman
8ec814fd92 Merge branch 'master' into danger-check-pr-labels 2017-06-15 06:48:56 +10:00
Michael Shilman
e4daeeac12 Don't run danger if DANGER_GITHUB_API_TOKEN is not set 2017-06-14 20:42:15 +10:00
Sébastien Lorber
b95cab063d Fix typo in contributing guide 2017-06-14 11:17:13 +02:00
Aaron Ranard
d8c032daff update old namespace link and incorrect UI link
I noticed the npm link command is out of date in the contribution guide and updated it to what I believe it should be, as well as a link to the Storybook UI page.
2017-06-13 11:57:22 -06:00
Michael Shilman
2e364413ff Merge branch 'master' into patch-1 2017-06-14 01:48:32 +12:00
Alexander Nilsson
1288dfbc64 Merge branch 'master' into master 2017-06-13 07:22:13 +02:00
Michael Shilman
36d7ec2668 Merge pull request #1251 from storybooks/danger-check-pr-labels
Add danger to start automating some code review tasks
2017-06-13 14:12:17 +12:00
Michael Shilman
368265572a Update danger to post status rather than break the build 2017-06-13 13:39:50 +12:00
Michael Shilman
7866788ffe Merge pull request #1269 from panosvoudouris/master
Add versions plugin to docs
2017-06-13 09:01:17 +12:00
Panos Voudouris
c0778d614a Add versions plugin to docs 2017-06-12 21:35:05 +01:00
Norbert de Langen
abac2be0af Merge branch 'master' into add-lib-components 2017-06-12 19:39:50 +02:00
Norbert de Langen
294923bac3 Use new common demo-components 2017-06-12 18:09:37 +02:00
Joe Kohlmann
9035f43af2 Info add-on: update z-index of container 2017-06-12 10:41:44 -04:00
Michael Shilman
bbbdf5444c Merge branch 'master' into danger-check-pr-labels 2017-06-12 21:38:28 +12:00
Michael Shilman
8bfdc25115 Merge pull request #1258 from evenchange4/patch-1
fix(addons/info): Cannot read property 'props' of undefined
2017-06-12 21:13:43 +12:00
Michael Hsu (徐承志)
106514f6f2 feat(Addon/info): use external links 2017-06-12 16:44:38 +08:00
Alexander Nilsson
b85904e524 Merge branch 'master' into master 2017-06-12 09:32:36 +02:00
Norbert de Langen
08f3f837d7 WIP 2017-06-12 08:47:44 +02:00
Michael Hsu
71a48df16c isRequired 2017-06-12 11:41:47 +08:00
Michael Hsu
13939bdb46 update propTypes 2017-06-12 11:31:59 +08:00
Michael Hsu
a7ddf63169 add propTypes 2017-06-12 11:14:46 +08:00
Michael Hsu
7a95ee2594 fix(addons/info): Cannot read property 'props' of undefined
fix(addons/info): Cannot read property 'props' of undefined
2017-06-12 11:00:36 +08:00
Michael Shilman
f936a1623c Warn about missing labels instead of failing 2017-06-12 11:49:06 +12:00
Norbert de Langen
3fdd1a1f91 ADD package 2017-06-11 22:58:13 +02:00
Michael Shilman
5bb5fd9b45 Check for "do not merge" and required pr-log labels 2017-06-12 02:26:55 +12:00
Michael Shilman
7bb724f53a Add danger to start automating some code review tasks 2017-06-12 00:50:57 +12:00
Norbert de Langen
a81283f901 Merge pull request #1249 from storybooks/improve-design-events-addon
IMPROVE design of addon-events
2017-06-11 13:05:08 +02:00