7592 Commits

Author SHA1 Message Date
Dependencies.io Bot
aada764aeb Update html-loader from 0.5.1 to 0.5.4 in app/react 2018-01-05 16:32:44 +00:00
Dependencies.io Bot
c8aedcd57c Update css-loader from 0.28.7 to 0.28.8 in app/react 2018-01-05 16:31:15 +00:00
Dependencies.io Bot
6b59ab2768 Update marksy from 6.0.1 to 6.0.2 in addons/info 2018-01-05 16:29:40 +00:00
Dependencies.io Bot
4ca19891de Update @types/lodash from 4.14.91 to 4.14.92 in / 2018-01-05 16:28:09 +00:00
Filipp Riabchun
9d2c34c8db
Merge pull request #2654 from storybooks/tmeasday/fix-knobs-dates
Fix the timezone for example dates
2018-01-05 04:25:50 +03:00
Tom Coleman
8c5f470240 Fix the timezone for example dates 2018-01-05 12:14:26 +11:00
Norbert de Langen
35d2636a8d
Merge pull request #2650 from mynnx/patch-1
Add IE compatibility meta tag
2018-01-04 21:41:07 +01:00
mynnx
479f1a52e7 Adding IE compatibility meta tag to Angular, Vue 2018-01-04 12:06:11 -08:00
Mark Everett
347f700005
Add IE compatibility meta tag 2018-01-04 10:31:06 -08:00
Norbert de Langen
fe409ebfb5
Merge pull request #2648 from storybooks/dependencies.io-update-build-158.0.0
Update 11 dependencies from npm
2018-01-04 18:40:29 +01:00
Norbert de Langen
d30dd99b4e
Merge branch 'master' into dependencies.io-update-build-158.0.0 2018-01-04 17:48:07 +01:00
Dependencies.io Bot
00ecaf05c2 Update @angular/language-service from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:43:49 +00:00
Dependencies.io Bot
9efc9a4793 Update @angular/compiler-cli from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:42:13 +00:00
Dependencies.io Bot
3b22a37c37 Update @angular/router from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:40:40 +00:00
Dependencies.io Bot
e17bde622e Update @angular/platform-browser-dynamic from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:39:05 +00:00
Dependencies.io Bot
61cc9140b3 Update @angular/platform-browser from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:37:33 +00:00
Dependencies.io Bot
28a0d98d67 Update @angular/http from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:35:59 +00:00
Dependencies.io Bot
1830c7db78 Update @angular/forms from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:34:26 +00:00
Dependencies.io Bot
b0c96e85e1 Update @angular/core from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:32:52 +00:00
Dependencies.io Bot
c69307ca2a Update @angular/compiler from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:31:17 +00:00
Dependencies.io Bot
8983ef8abf Update @angular/common from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:29:37 +00:00
Dependencies.io Bot
f1e7b55420 Update @angular/animations from 5.1.2 to 5.1.3 in examples/angular-cli 2018-01-04 16:27:56 +00:00
Norbert de Langen
3d27358915
Merge pull request #2644 from storybooks/fix/add-demoimgs-to-docs
ADD demo images to a new img folder with the documentation site
2018-01-04 17:20:23 +01:00
Norbert de Langen
37e2a8bebd
FIX image on addon-backgrounds readme && IMPROVE addons-backgrounds readme 2018-01-04 17:07:08 +01:00
Norbert de Langen
bac24bee7c
FIX copy script 2018-01-04 16:32:20 +01:00
Norbert de Langen
a1b300be3a
ADD demo images to a new img folder with the documentation site 2018-01-04 16:01:36 +01:00
Igor
ece503a3e6
Merge pull request #2452 from Havelaer/feature/multiple-hierarchies
Feature/multiple hierarchies
2018-01-04 15:13:01 +02:00
Igor
aaff55f1f0
Merge branch 'master' into feature/multiple-hierarchies 2018-01-04 14:45:52 +02:00
Igor
51108ef256
Merge pull request #2639 from storybooks/storyshots-ts-stories-compatibility
Add .ts compatibility to storyshots
2018-01-04 14:43:15 +02:00
Norbert de Langen
9e5019c9fe
Merge branch 'master' into storyshots-ts-stories-compatibility 2018-01-04 13:25:19 +01:00
Norbert de Langen
c650f793f7
Merge branch 'master' into feature/multiple-hierarchies
# Conflicts:
#	examples/official-storybook/config.js
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_native/package.json
#	lib/cli/test/snapshots/react_native_scripts/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
2018-01-04 13:22:56 +01:00
Norbert de Langen
27cfce1c75
Merge pull request #2640 from storybooks/knobs-peer-deps-fix
Remove @angular/core dep from knobs peer.
2018-01-04 13:09:27 +01:00
igor
2ce834ef39 Remove @angular/core dep from peer and suppress extraneous-dependencies error 2018-01-04 10:33:16 +02:00
igor
2ef02fc0aa Add .ts exts to the getPossibleStoriesFiles 2018-01-04 10:12:29 +02:00
Filipp Riabchun
afc322f246
Merge pull request #2638 from ChristianDavis/patch-1
Update prereq yarn install level
2018-01-04 09:47:50 +03:00
Christian Davis
641eac558e
Update yarn in engines field 2018-01-03 22:14:25 -06:00
Christian Davis
e4019a5b85
Update prereq yarn install level
Yarn 1.0.0 contains a linking bug that is fixed in 1.3.2, creates issues otherwise:
https://github.com/storybooks/storybook/issues/2382#issue-276990637
2018-01-03 19:02:27 -06:00
Filipp Riabchun
ae4d6a5e49
Merge pull request #2637 from storybooks/dependencies.io-update-build-157.0.0
Update 4 dependencies from npm
2018-01-04 03:45:04 +03:00
Filipp Riabchun
4038a1a287
Merge branch 'master' into dependencies.io-update-build-157.0.0 2018-01-04 03:16:16 +03:00
Norbert de Langen
16aa076bea
Merge pull request #2624 from Primigenus/patch-2
Pass alpha transparency up to the story
2018-01-04 00:17:41 +01:00
Norbert de Langen
5732beeb6e
Merge branch 'master' into patch-2 2018-01-03 23:57:17 +01:00
Rahul
448fda2533
Remove newlines 2018-01-03 14:51:34 -08:00
Dependencies.io Bot
d175f69da4 Update postcss-loader from 2.0.9 to 2.0.10 in app/vue 2018-01-03 22:20:59 +00:00
Dependencies.io Bot
d6e84a55bc Update postcss-loader from 2.0.9 to 2.0.10 in app/react-native 2018-01-03 22:19:22 +00:00
Dependencies.io Bot
ebde230b66 Update postcss-loader from 2.0.9 to 2.0.10 in app/angular 2018-01-03 22:17:46 +00:00
Dependencies.io Bot
94a1b83a2e Update postcss-loader from 2.0.9 to 2.0.10 in app/react 2018-01-03 22:16:09 +00:00
Norbert de Langen
b4dec5fa48
Merge pull request #2628 from storybooks/tmeasday/shilman-refactor-core-rebase
Merge `master` into `shilman/refactor-core`
2018-01-03 22:58:41 +01:00
Tom Coleman
b60ac0a251
Merge branch 'master' into tmeasday/shilman-refactor-core-rebase 2018-01-04 08:47:26 +11:00
Norbert de Langen
1af4e8deec
Merge pull request #2577 from FredyC/haul-xplatform
Use haul/bin/cli.js for cross-platform support
2018-01-03 20:39:36 +01:00
Norbert de Langen
3b36bc6fff
Merge branch 'master' into haul-xplatform 2018-01-03 20:16:10 +01:00