268 Commits

Author SHA1 Message Date
hypnos
c1a7fd95a7 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-11-16 00:19:01 +03: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
Dependencies.io Bot
61162d4759 Update enzyme-adapter-react-16 from 1.0.4 to 1.1.0 in / 2017-11-15 16:32:31 +00:00
Dependencies.io Bot
88de68bebb Update enzyme from 3.1.1 to 3.2.0 in / 2017-11-15 16:28:25 +00:00
Chang Wang
22979c9b23 add process-nextick-args to dev-dep for netlify 2017-11-13 21:45:13 -05:00
hypnos
454ebeca7e Update inquirer to 4.0.0 2017-11-12 21:44:15 +03:00
hypnos
289c1948f8 Update lint-staged to 5.0.0
(cherry picked from commit 1340361)
2017-11-11 19:38:06 +03:00
hypnos
38f2f49a95 Revert "Update lint-staged to 5.0.0"
This reverts commit 1340361
2017-11-11 19:37:32 +03:00
hypnos
13403611ec Update lint-staged to 5.0.0 2017-11-11 19:36:56 +03:00
Dependencies.io Bot
8d38b08839 Update puppeteer from 0.12.0 to 0.13.0 in / 2017-11-11 16:28:29 +00:00
Dependencies.io Bot
bcf2d8af22 Update eslint from 4.10.0 to 4.11.0 in / 2017-11-11 16:25:45 +00: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
Dependencies.io Bot
c27faf29f1 Update prettier from 1.8.1 to 1.8.2 in / 2017-11-10 20:39:22 +00:00
Dependencies.io Bot
d730e2731b Update eslint-plugin-jest from 21.2.0 to 21.3.2 in / 2017-11-10 20:36:44 +00:00
hypnos
0c4ef51fc5 Update React to 16.1.0 2017-11-10 19:58:38 +03:00
hypnos
01f8b63a9a Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/comments/src/manager/components/CommentItem/index.js
#	addons/comments/src/manager/components/CommentItem/style.js
#	addons/knobs/package.json
#	app/react-native/src/preview/components/OnDeviceUI/index.js
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
#	yarn.lock
2017-11-10 03:11:24 +03:00
Dependencies.io Bot
eb0415dee8 Update jest-image-snapshot from 2.1.0 to 2.2.0 in / 2017-11-08 10:36:41 +00:00
Dependencies.io Bot
5fd0bca51e Update prettier from 1.7.4 to 1.8.1 in / 2017-11-07 16:32:16 +00:00
Dependencies.io Bot
f9fa522842 Update danger from 2.0.0 to 2.0.1 in / 2017-11-07 16:28:55 +00:00
Norbert de Langen
cf054ad1b3
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/knobs/package.json
#	addons/knobs/src/components/types/Array.js
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
2017-11-07 09:33:30 +01:00
Aaron Friel
c9526175b4
Merge branch 'master' into winqol 2017-11-06 16:27:52 -06:00
AaronFriel
db5288c6d9 Run test script with node. 2017-11-06 16:23:53 -06:00
AaronFriel
ccd20f1294 Add cross-env as root devdep, remove unnecessary script. 2017-11-06 16:20:51 -06:00
Aaron Friel
5715039446 Run bootstrap script with node. 2017-11-06 16:20:21 -06:00
Dependencies.io Bot
6c4dcc4bfb Update babel-eslint from 8.0.1 to 8.0.2 in / 2017-11-06 22:12:16 +00:00
hypnos
4a786f0c4b Update devDependencies 2017-11-05 11:51:33 +03:00
hypnos
971ac96f9a Update devDependencies 2017-11-05 03:07:18 +03:00
hypnos
c3d88932f0 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/src/components/__tests__/Array.js
#	examples/cra-kitchen-sink/.storybook/addons.js
#	examples/cra-kitchen-sink/package.json
#	yarn.lock
2017-11-05 02:34:45 +03:00
Norbert de Langen
f20d8603b1
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/src/manager/components/CommentItem/index.js
#	addons/comments/src/manager/containers/CommentsPanel/dataStore.js
#	addons/comments/src/manager/containers/CommentsPanel/index.js
#	addons/info/src/components/PropTable.js
#	lib/cli/bin/generate.js
#	lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
#	lib/ui/src/modules/ui/components/addon_panel/index.test.js
#	scripts/test.js
2017-11-03 00:43:42 +01:00
Norbert de Langen
e83e86454f
WIP 2017-11-02 23:13:00 +01:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03: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
hypnos
d8a0c7bd8b Update jest-image-snapshot to 2.1.0 2017-10-30 21:49:27 +03:00
hypnos
a1fe0e1950 Revert "Update jest-image-snapshot to 2.1.0"
This reverts commit c900170
2017-10-30 00:54:55 +03:00
hypnos
c9001708ea Update jest-image-snapshot to 2.1.0 2017-10-29 23:47:40 +03:00
hypnos
8a8b8c6e65 Update codecov to 3.0.0 2017-10-29 23:34:35 +03:00
Dependencies.io Bot
7ed39388c9 Update eslint from 4.9.0 to 4.10.0 in / 2017-10-29 00:06:13 +00:00
Norbert de Langen
462ea1cc4a Merge branch 'master' into release/3.3 2017-10-24 23:25:18 +02:00
Filipp Riabchun
e49e4ef869 Merge branch 'master' into screenshot-testing 2017-10-24 21:48:45 +03:00
Dependencies.io Bot
25a640e36b Update chalk from 2.2.0 to 2.3.0 in / 2017-10-24 16:25:44 +00:00
Norbert de Langen
c1d14191cb ADD integration test: automatic screenshot of cra-kitchen-sink and vue-kitchen-sink examples 2017-10-24 01:39:59 +02:00
hypnos
059835eb2d Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-22 22:51:34 +03:00
Michael Shilman
af3972b20d 3.3.13 changelog 2017-10-20 21:18:19 +02:00
Dependencies.io Bot
fe493cd4cf Update eslint-plugin-import from 2.7.0 to 2.8.0 in / 2017-10-19 16:25:10 +00:00
hypnos
9a4a1e28b9 Merge remote-tracking branches 'remotes/origin/@storybook/react-fuzzy-0.4.1-28.0.0-lib--ui', 'remotes/origin/chalk-2.2.0-28.0.0', 'remotes/origin/chalk-2.2.0-28.0.0-app--react', 'remotes/origin/chalk-2.2.0-28.0.0-app--vue', 'remotes/origin/chalk-2.2.0-28.0.0-lib--cli' and 'remotes/origin/lint-staged-4.3.0-28.0.0' into update-deps 2017-10-18 21:05:30 +03:00
Dependencies.io Bot
e1d10b2a82 Update lint-staged from 4.2.3 to 4.3.0 in / 2017-10-18 16:30:47 +00:00
Dependencies.io Bot
3c480ef3f3 Update chalk from 2.1.0 to 2.2.0 in / 2017-10-18 16:27:44 +00:00
Filipp Riabchun
315021fd58 Merge branch 'master' into enzyme-adapter-react-16-1.0.2-27.0.0 2017-10-18 01:25:12 +03:00
Dependencies.io Bot
042b388aba Update enzyme-adapter-react-16 from 1.0.1 to 1.0.2 in / 2017-10-17 16:28:23 +00:00
Dependencies.io Bot
cd0ddc8787 Update babel-preset-env from 1.6.0 to 1.6.1 in / 2017-10-17 16:25:34 +00:00