igor
5fcf200a08
Merge remote-tracking branch 'origin/master' into angular-storyshots
...
# Conflicts:
# .editorconfig
# addons/storyshots/package.json
# examples/angular-cli/package.json
# examples/vue-kitchen-sink/package.json
# yarn.lock
2018-01-14 13:12:46 +02:00
Michael Shilman
85e2e59183
v3.4.0-alpha.4
2018-01-13 18:32:28 +05:30
Michael Shilman
56abd09768
v3.4.0-alpha.3
2018-01-13 18:09:59 +05:30
igor
d5b30aa0ad
Merge remote-tracking branch 'origin/master' into angular-storyshots
...
# Conflicts:
# package.json
# yarn.lock
2018-01-12 17:59:35 +02:00
Filipp Riabchun
545ac59b73
Noop commit
2018-01-12 03:01:07 +03:00
Dependencies.io Bot
696be02d84
Update @angular/cli from 1.6.3 to 1.6.4 in examples/angular-cli
2018-01-11 23:16:21 +00:00
Dependencies.io Bot
fac0dee462
Update zone.js from 0.8.19 to 0.8.20 in examples/angular-cli
2018-01-11 21:32:17 +00:00
igor
a5eb21c745
Update storyshots to use helpers with templates support
2018-01-10 17:08:13 +02:00
igor
2e3020366d
Merge remote-tracking branch 'origin/master' into angular-storyshots
...
# Conflicts:
# app/angular/src/client/preview/angular/helpers.ts
2018-01-10 16:42:53 +02:00
igor
805f73e9b0
Update snapshots
2018-01-10 16:33:51 +02:00
Carlos Vega
658e976dbd
Merge branch 'master' into angular-template-support
2018-01-10 08:08:52 -06:00
igor
c3b5aa7eb6
Merge remote-tracking branch 'origin/master' into angular-storyshots
...
# Conflicts:
# addons/storyshots/package.json
# examples/angular-cli/package.json
# examples/vue-kitchen-sink/package.json
# package.json
# yarn.lock
2018-01-10 14:49:38 +02:00
igor
270f2e0011
Show css warning if css rules are not configured as needed.
2018-01-10 10:24:16 +02:00
Norbert de Langen
2bda97b3d6
Merge branch 'master' into angular-support-scss
2018-01-10 09:22:26 +01:00
Michael Shilman
3201005157
v3.4.0-alpha.1
2018-01-10 12:37:29 +05:30
Carlos Vega
271ce3c2c3
Merge branch 'master' into angular-template-support
2018-01-09 23:41:06 -06:00
Carlos Vega
fd3b613ec7
Fixed typo in metadata/knobs sample
...
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2018-01-09 18:30:17 -06:00
Carlos Vega
9503c45c90
Added initial support for multiple compoonents in templates
...
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2018-01-09 18:27:13 -06:00
igor
7d3d60777d
Use scss for components in angular apps by default.
2018-01-09 19:07:03 +02:00
Carlos Vega
59eadea42e
Fixed tslint issues
...
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2018-01-08 15:22:05 -06:00
Carlos Vega
bf25c4390d
Adding support for Angular templates
2018-01-08 13:54:46 -06:00
igor
b0f4064dae
Update snapshots
2018-01-08 18:19:13 +02:00
igor
11687bdc09
After merge fixes
2018-01-08 18:15:53 +02:00
igor
2aac9933fd
Merge remote-tracking branch 'origin/master' into angular-storyshots
...
# Conflicts:
# addons/storyshots/package.json
# examples/angular-cli/package.json
# examples/angular-cli/src/stories/index.ts
# examples/vue-kitchen-sink/package.json
# package.json
# tsconfig.json
2018-01-08 18:05:57 +02:00
Igor
c68264d80a
Merge branch 'master' into custom-ts-config
2018-01-08 16:50:23 +02:00
igor
a49a6c77f8
Add prettier to ts lint
2018-01-08 14:02:45 +02:00
igor
9d13ba220b
Add tslint to the linting pipe
2018-01-08 13:08:02 +02:00
Igor
2b9ddaadcd
Merge branch 'master' into custom-ts-config
2018-01-08 13:07:43 +02:00
Michael Shilman
d8d955cbbc
v3.4.0-alpha.0
2018-01-07 21:32:57 +05:30
Michael Shilman
71c528c462
merge release 3.3.4 to master
2018-01-07 19:36:11 +05:30
Michael Shilman
3abdbb6528
v3.3.4
2018-01-07 18:23:40 +05:30
Filipp Riabchun
c0a0acf28b
Merge pull request #2659 from storybooks/dependencies.io-update-build-159.0.0
2018-01-07 18:14:27 +05:30
Carlos Vega
70d56d10aa
Merge pull request #2646 from storybooks/camelcased-angular-knobs
...
Removed lowercase-only restriction for knobs
2018-01-07 17:02:32 +05:30
Norbert de Langen
84d52bdf49
Merge pull request #2592 from storybooks/angular-cli-stories-separation
...
Separate stories in angular-cli example
2018-01-07 17:01:55 +05:30
igor
fb930edec0
Add ability to load a custom tsconfig.json in the storybook config dir.
2018-01-07 11:06:24 +02:00
igor
8eee1c0411
Now I need to update snapshots...
2018-01-06 17:46:44 +02:00
Igor
227aaf535a
Merge branch 'master' into angular-storyshots
2018-01-06 12:07:14 +02:00
Filipp Riabchun
c4908b4bfe
Merge branch 'master' into dependencies.io-update-build-159.0.0
2018-01-05 21:47:10 +03:00
Dependencies.io Bot
e70fb5845b
Update @types/node from 6.0.95 to 6.0.96 in examples/angular-cli
2018-01-05 16:45:14 +00:00
Igor
185423961e
Merge branch 'master' into camelcased-angular-knobs
2018-01-04 20:42:31 +02:00
Norbert de Langen
de37c4b19d
Merge branch 'master' into angular-storyshots
2018-01-04 18:40:53 +01:00
Carlos Vega
d129d65e4a
Removing lowercase-only restriction for knobs
...
Take in account that now the knob name needs to be the same as the angular component @Input attribute. Otherwise it'll not bind to the correct property.
Signed-off-by: Carlos Vega <clmvega@gmail.com>
2018-01-04 10:49:16 -06: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