24 Commits

Author SHA1 Message Date
Filipp Riabchun
f152c0dcb6 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 06:21:30 -07:00
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
hypnos
2f53feb64a Use yarn workspaces on master 2017-09-29 23:00:47 +03:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Michael Shilman
c6a690e037 v3.2.7 2017-08-23 09:23:41 -07: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
a3647be4a6 v3.2.6 2017-08-22 11:02:17 -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 2017-08-22 00:31:44 -07:00
hypnos
37d01955af Fix new lint problem 2017-08-18 12:23:25 +03:00
Norbert de Langen
67cb7dccdc FIX some code-review 2017-08-17 22:51:19 +02:00
Norbert de Langen
36b3671871 REMOVE duplicated theme.js 2017-08-16 16:02:32 +02:00
Norbert de Langen
cde1b7c087 MOVE storybook of components to cra-kitchen-sink
This prevents cyclical dependencies!
2017-08-16 10:37:26 +02:00
Norbert de Langen
70f6708711 FIX for onClick changing over time 2017-08-16 08:58:47 +02:00
Norbert de Langen
6660bd9548 Use snapshots && isolate tests with clear setup fn / remove beforeEach 2017-08-15 10:25:22 +02:00
hypnos
52ae662a72 Move baseFonts and RoutedLink to @storybook/components 2017-08-15 02:39:01 +03:00
Norbert de Langen
c11c189d7e UPDATE everything (including eslint 4) 2017-07-25 11:20:08 +02:00
Michael Shilman
b20e6f5091 Remove package-lock.json 2017-06-23 01:03:45 +10:00
Michael Shilman
e5041fa06a Add package-lock.json
Per discussion with @tmeasday 😉
2017-06-22 11:17:16 +10:00
Michael Shilman
02f39b9131 Add a file to @storybook/components so that the build doesn't break 2017-06-18 00:25:48 +10:00
Michael Shilman
0ab1de3f6f Remove demo components from @storybook/components 2017-06-18 00:17:41 +10:00
Norbert de Langen
08f3f837d7 WIP 2017-06-12 08:47:44 +02:00
Norbert de Langen
3fdd1a1f91 ADD package 2017-06-11 22:58:13 +02:00