328 Commits

Author SHA1 Message Date
hypnos
059835eb2d Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-22 22:51:34 +03:00
Dependencies.io Bot
3b451cf6de Update glamorous from 4.9.7 to 4.10.0 in examples/cra-kitchen-sink 2017-10-21 12:46:07 +00:00
Dependencies.io Bot
517363c198 Update webpack-dev-server from 2.9.2 to 2.9.3 in examples/vue-kitchen-sink 2017-10-20 16:27:06 +00:00
Derrick Pelletier
8ae2b76902 Merge branch 'master' into issue#1914-button-knob 2017-10-17 10:38:16 -07:00
Derrick Pelletier
ad97eb0b86 updated snapshot for my new dom elements 2017-10-17 10:05:26 -07:00
Derrick Pelletier
377e812abf less ridiculous example for button type in cra 2017-10-17 00:31:16 -07:00
hypnos
0d684f89dc Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	docs/pages/basics/faq/index.md
#	examples/vue-kitchen-sink/package.json
#	lib/cli/generators/SFC_VUE/index.js
#	lib/cli/generators/VUE/index.js
#	lib/cli/lib/helpers.js
#	lib/cli/package.json
#	lib/ui/package.json
#	package.json
#	yarn.lock
2017-10-17 03:24:46 +03:00
Filipp Riabchun
5b1f3a022c Merge branch 'release/3.3' into addon-info-add-ability-new-line-in-description-#1311 2017-10-17 02:26:45 +03:00
Dan Green
5524aac6d2 Updated snapshot 2017-10-16 19:22:17 -04:00
Filipp Riabchun
522bfee637 Merge branch 'master' into vue-2.5.1-23.0.0-app--vue 2017-10-16 01:20:47 +03:00
Dependencies.io Bot
acc55cda39 Update webpack-dev-server from 2.9.1 to 2.9.2 in examples/vue-kitchen-sink 2017-10-15 16:28:11 +00:00
Dan Green
6273258a14 Add ability to parse line breaks into <br/> for Docgen description in info addon 2017-10-15 11:51:13 -04:00
hypnos
c8ffe5543d Merge remote-tracking branch 'origin/vue-template-compiler-2.5.2-24.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	examples/vue-kitchen-sink/package.json
2017-10-15 01:52:33 +03:00
hypnos
11d1575c01 Merge remote-tracking branch 'origin/vue-2.5.2-24.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	examples/vue-kitchen-sink/package.json
#	yarn.lock
2017-10-15 01:51:41 +03:00
Dependencies.io Bot
e2e9586e47 Update vue-template-compiler from 2.4.4 to 2.5.2 in examples/vue-kitchen-sink 2017-10-14 16:40:54 +00:00
Dependencies.io Bot
b453fcd911 Update vue from 2.4.4 to 2.5.2 in examples/vue-kitchen-sink 2017-10-14 16:39:41 +00:00
Carlos Vega
64b7d3daff Bumping @storybook/* versions
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2017-10-14 10:34:50 -06:00
hypnos
4bd12098e5 Merge remote-tracking branch 'origin/vuex-2.5.0-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue
# Conflicts:
#	examples/vue-kitchen-sink/package.json
#	yarn.lock
2017-10-13 21:48:01 +03:00
hypnos
1f0fd22647 Merge remote-tracking branch 'origin/vue-template-compiler-2.5.1-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:45:20 +03:00
hypnos
fcd4ed48f2 Merge remote-tracking branch 'origin/vue-hot-reload-api-2.2.0-23.0.0-examples--vue-kitchen-sink' into vue-2.5.1-23.0.0-app--vue 2017-10-13 21:44:43 +03:00
Dependencies.io Bot
d888a9b0b5 Update vue-template-compiler from 2.4.4 to 2.5.1 in examples/vue-kitchen-sink 2017-10-13 16:36:16 +00:00
Dependencies.io Bot
9ff8628dd7 Update vue-hot-reload-api from 2.1.0 to 2.2.0 in examples/vue-kitchen-sink 2017-10-13 16:34:53 +00:00
Dependencies.io Bot
17002cd051 Update vuex from 2.4.1 to 2.5.0 in examples/vue-kitchen-sink 2017-10-13 16:33:29 +00:00
Dependencies.io Bot
36c8b7559e Update vue from 2.4.4 to 2.5.1 in examples/vue-kitchen-sink 2017-10-13 16:32:07 +00:00
Derrick Pelletier
e54076b97c Merge branch 'master' into issue#1914-button-knob 2017-10-09 19:16:11 -07:00
Derrick Pelletier
2576d3af27 updated examples for cra and vue 2017-10-09 18:01:24 -07:00
Derrick Pelletier
f2e8d14a41 Added button knob type, with handler callback support 2017-10-09 17:54:53 -07:00
kazuya kawaguchi
0dd7b95353
👕 refactor(eslint): fix lint errors 2017-10-09 02:53:45 +09:00
kazuya kawaguchi
3e84d8d083
🍭 examples(vue): update for JSX example 2017-10-09 01:42:26 +09:00
Carlos Vega
217ec79eb8 Merge branch 'release/3.3' of github.com:storybooks/storybook into 269-angular-support 2017-10-06 08:46:33 -06:00
Michael Shilman
cbf60d374e Update example dips to 3.3.0-alpha.2 2017-10-03 22:22:01 +02:00
Michael Shilman
fee641ad9c Upgrade example dependencies to 3.3.0-alpha.1
Necessary because lerna doesn’t support non-semver versions
2017-10-02 21:09:31 +02:00
Michael Shilman
70825cb2dc resolve conflicts merging master into release/3.3 2017-10-02 20:20:10 +02:00
hypnos
2e8240d176 Fix/suppress current eslint warnings.
Raise `import/no-unresolved` and `import/extensions` to error level
everywhere except `docs`
2017-10-02 01:40:46 +03:00
hypnos
41054abc7a Run prettier 2017-10-01 03:07:34 +03: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
Norbert de Langen
2b4930d223 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 18:03:48 +02:00
Norbert de Langen
5d2e3f15f8 Merge branch 'master' into add_braces 2017-09-30 13:35:53 +02:00
Norbert de Langen
98e066388c Merge branch 'master' into ndelangen/upgrade-react 2017-09-29 23:39:29 +02:00
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
Brandon Vandegrift
dbfc2c1de0 update storyshots 2017-09-29 14:09:01 -04:00
hypnos
8003d59142 Run eslint --fix 2017-09-29 02:50:06 +03:00
hypnos
74e34a3e88 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/info/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/src/stories/index.js
#	lerna.json
#	lib/ui/package.json
2017-09-29 02:46:39 +03:00
hypnos
1c2ca25464 Run eslint --fix on master 2017-09-29 02:13:59 +03:00
Carlos Vega
0ae971f78e Actually, button component is used several times, adding onClick palceholder 2017-09-14 09:09:25 -06:00
Carlos Vega
3d8eb0fcc4 Updating to latest Angular 5 beta 2017-09-14 08:50:03 -06:00
Carlos Vega
8137d67dfa Debouncing render calls
- Angular's bootstrapping process is async and sometimes storybook triggers two re renders. In these cases, we reach an inconsistent state in which we can't properly dispose the old view and listeners get duplicated. With this debounce function we make sure we're accounting for those times.
2017-09-13 18:35:08 -06:00
Carlos Vega
b05d6d82eb Fixing the styles example 2017-09-12 16:29:30 -06:00
Carlos Vega
cad98bbd69 Merge branch '269-angular-support' of github.com:storybooks/storybook into 269-angular-support 2017-09-12 13:00:16 -06:00
Norbert de Langen
a86701828e SYNC versions && FIX 2017-09-12 20:41:36 +02:00