396 Commits

Author SHA1 Message Date
Hypnosphi
83d76e4536 Merge remote-tracking branch 'origin/master' into release/3.3 2017-11-17 21:17:28 +03:00
Dependencies.io Bot
c2b8f7dc0d Update vue-template-compiler from 2.5.3 to 2.5.5 in examples/vue-kitchen-sink 2017-11-17 17:54:12 +00:00
Dependencies.io Bot
631e66d266 Update vue-hot-reload-api from 2.2.3 to 2.2.4 in examples/vue-kitchen-sink 2017-11-17 17:52:48 +00:00
Dependencies.io Bot
77c2e77e5e Update vue from 2.5.3 to 2.5.5 in examples/vue-kitchen-sink 2017-11-17 17:51:16 +00:00
Daniel Duan
2d80d9eba3 update snapshot 2017-11-15 21:09:32 -05:00
Daniel Duan
2d29fc30ae
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react 2017-11-15 20:41:47 -05:00
Daniel Duan
efcc280a77 more clear examples 2017-11-15 20:31:28 -05:00
Daniel Duan
ebd12705fd keep old string 2017-11-15 20:12:40 -05:00
hypnos
7fa756c6d4 Update storyshot 2017-11-16 03:04:26 +03:00
hypnos
04caea154d Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
2017-11-16 02:59:49 +03:00
hypnos
7c72d40c89 Addon actions: replace eval with function name assignment 2017-11-16 02:12:59 +03:00
Norbert de Langen
cdcecb6a78
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react 2017-11-15 22:44:56 +01: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
Norbert de Langen
556259cce2
FIX propwarning on basebutton && ADD style prop on basebutton 2017-11-14 08:23:00 +01:00
Dan Green
f3d0827695 Add support for markdown to jest, vue, react native, and angular 2017-11-13 23:06:01 -05:00
Norbert de Langen
862d4cf2a7
ADD snapshots for new stories 2017-11-13 22:18:47 +01:00
Norbert de Langen
c3cfd7b686
ADD story for addon-a11y to cra-kitchen-sink 2017-11-12 00:40:56 +01: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
hypnos
e1201bbb27 Update storyshots 2017-11-10 03:13:59 +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
hypnos
aae332b6c4 Move stories to "Addon Info" namespace 2017-11-10 02:02:36 +03:00
Filipp Riabchun
51f0af151f
Merge branch 'master' into allow-duplicate-displaynames 2017-11-10 01:58:04 +03:00
hypnos
36c7eb84ab Update test snapshots 2017-11-09 23:03:13 +03:00
hypnos
67a5fd5841 Addon-info: allow duplicate displayNames 2017-11-09 02:22:26 +03:00
Dependencies.io Bot
5ee8b57eba Update vue-loader from 13.4.0 to 13.5.0 in examples/vue-kitchen-sink 2017-11-08 10:47:43 +00:00
Dependencies.io Bot
c2717f9417 Update vue-hot-reload-api from 2.2.0 to 2.2.3 in examples/vue-kitchen-sink 2017-11-08 10:46:25 +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
Michael Shilman
8eb2fa33fa Fix angular-cli package to avoid publishing 2017-11-07 12:55:38 +09:00
AaronFriel
ccd20f1294 Add cross-env as root devdep, remove unnecessary script. 2017-11-06 16:20:51 -06:00
Dependencies.io Bot
d26222aebc Update vue from 2.5.2 to 2.5.3 in examples/vue-kitchen-sink 2017-11-06 19:51:52 +00:00
hypnos
1b60f29a6f Update storyshot 2017-11-06 15:38:02 +03:00
hypnos
d3cd28544a Update storyshot 2017-11-06 15:36:57 +03:00
hypnos
e94b1f9aab Move LinkTo component to a separate addon-links/react endpoint 2017-11-06 07:23:36 +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
Filipp Riabchun
ec3a54eac5
Merge branch 'master' into dd/hmr 2017-11-02 15:07:53 +03:00
Daniel Duan
cfb80dd9df #2081 add hmr to other rn app template 2017-11-01 22:57:26 -04:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03:00
hypnos
72e43052c9 Remove @types/jasminewd2 dependency
(cherry picked from commit a458fa6)
2017-11-02 02:42:24 +03:00
hypnos
73a8026801 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	examples/cra-kitchen-sink/package.json
#	yarn.lock
2017-11-01 05:00:41 +03:00
Filipp Riabchun
49fbf3506e
Merge branch 'master' into dependencies.io-update-build-48.0.0 2017-11-01 04:45:03 +03:00
Dependencies.io Bot
35822f169c Update react-scripts from 1.0.14 to 1.0.16 in examples/cra-kitchen-sink 2017-10-31 23:43:33 +00:00
hypnos
d42e4c11d8 Fix lint 2017-11-01 02:06:22 +03:00
hypnos
74bd979ba8 Fix addonPanelInRight option in examples 2017-11-01 01:39:08 +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
Daniel Duan
3f6f07fa28 convert vanilla app to hmr 2017-10-31 13:04:59 -04:00
Daniel Duan
ca6fef0e94
Merge branch 'master' into dd/cra-reorg 2017-10-29 19:15:36 -04:00