67 Commits

Author SHA1 Message Date
Michael Shilman
aa2a8c11f3 v3.3.0-rc.0 2017-12-23 20:20:05 -08:00
hypnos
6a1f1f691f Merge branch 'master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-12-23 18:30:24 +01:00
Michael Shilman
4903d6ece7 v3.3.0-alpha.6 2017-12-23 09:25:20 -08:00
Michael Shilman
a65beced79 v3.3.0-alpha.5 2017-12-23 09:05:46 -08:00
Dependencies.io Bot
0e48cfb360 Update glamorous from 4.11.0 to 4.11.2 in lib/components 2017-12-22 23:53:47 +00:00
Norbert de Langen
a76f2a61ec
UPDATE readme with new slackin link 2017-12-22 18:06:27 +01:00
Tom Coleman
913324ec7a Add snapshots for new stories.
Don't compile (i.e. copy) them w/ babel
2017-12-21 20:09:34 +11:00
Tom Coleman
ae60bb8632 Move more complex component stories over 2017-12-20 15:24:48 +11:00
Tom Coleman
fda897567e Created examples/official-storybook with ui/components/addon stories 2017-12-20 15:22:08 +11:00
Tom Coleman
f3d72adb09 Use correct storybook version in components 2017-12-20 15:17:26 +11:00
Michael Shilman
2aea83798e v3.2.18 2017-12-18 13:58:53 -08:00
Tom Coleman
e625eb8551 Added stories for @storybook/components 2017-12-18 15:05:10 +11:00
hypnos
170f3eb54a Migrate to marksy@6 2017-12-12 03:02:42 +03:00
Michael Shilman
2e1fe20fc6 v3.2.17 2017-12-03 11:59:11 -08:00
hypnos
1dd0024cb0 Test styles directly instead of using snapshots 2017-11-24 02:54:36 +03:00
Michael Shilman
3c1715daca v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
Norbert de Langen
6648656e07
IMPROVE jest failureMessages 2017-11-18 21:14:38 +01:00
Michael Shilman
7a6c901d71 v3.2.16 2017-11-15 18:03:04 -08:00
Norbert de Langen
e8c8f33f97
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/links/package.json
#	addons/storyshots/package.json
#	examples/cra-kitchen-sink/.storybook/addons.js
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
#	yarn.lock
2017-11-15 19:40:55 +01:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00
hypnos
8c8b35a2d2 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
#	yarn.lock
2017-11-11 03:24:39 +03:00
hypnos
0c4ef51fc5 Update React to 16.1.0 2017-11-10 19:58:38 +03:00
Michael Shilman
0be4efcec8 v3.2.15 2017-11-10 11:39:27 +09:00
Michael Shilman
1a6082a4ad v3.3.0-alpha.3 2017-11-07 12:56:56 +09:00
Michael Shilman
f15eaa6a68 v3.2.14 2017-11-01 16:21:34 +09:00
Norbert de Langen
effe2ee84b Merge branch 'master' into release/3.3
# Conflicts:
#	app/react-native/readme.md
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/cra-kitchen-sink/src/stories/index.js
#	examples/crna-kitchen-sink/package.json
#	integration/__image_snapshots__/cra-kitchen-sink-snap.png
#	integration/__image_snapshots__/vue-kitchen-sink-snap.png
#	yarn.lock
2017-10-31 23:26:48 +01:00
Dependencies.io Bot
8f7efe2575 Update glamorous from 4.10.0 to 4.11.0 in lib/components 2017-10-27 16:24:17 +00:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
Norbert de Langen
1a2c952f58 ADD README.md for lib/components 2017-10-23 16:19:43 +02:00
hypnos
059835eb2d Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-22 22:51:34 +03:00
Dependencies.io Bot
806ffb7898 Update glamorous from 4.9.7 to 4.10.0 in lib/components 2017-10-21 12:41:33 +00:00
Michael Shilman
a701365e70 v3.2.13 2017-10-20 21:44:34 +02:00
hypnos
83f988b8e3 Merge branch 'master' into release/3.3
# Conflicts:
#	lerna.json
#	package.json
2017-10-04 02:35:31 +03:00
hypnos
37d81de583 Use a single enzyme dependency 2017-10-04 00:20:18 +03:00
Michael Shilman
b577ddd543 v3.3.0-alpha.2 2017-10-03 22:10:15 +02:00
Michael Shilman
3f97c6f175 v3.2.12 2017-10-03 00:29:46 +02:00
Michael Shilman
5030ee196c v3.3.0-alpha.1 2017-10-02 20:57:35 +02:00
Norbert de Langen
a270216e96 Merge branch 'master' into release/3.3
# Conflicts:
#	CONTRIBUTING.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	dependencies.yml
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/crna-kitchen-sink/package.json
#	examples/react-native-vanilla/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js
#	yarn.lock
2017-09-30 23:19:44 +02:00
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
hypnos
824bbd6a6d Replace the deprecated prepublish script with prepare 2017-09-08 03:19:39 +03:00
Michael Shilman
94723262d9 v3.3.0-alpha.0 2017-09-06 13:46:17 -07:00
Norbert de Langen
7ab74c6a34 LINTING 2017-09-06 20:57:31 +02:00
Billy Vong
691771fc01 fix: use native buttons 2017-09-05 16:08:06 -07:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Billy Vong
34333bdc8c add: styled components 2017-08-28 15:24:50 -07: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