584 Commits

Author SHA1 Message Date
Dan Green
82699d3f0d
Merge branch 'master' into (#1736)-Ability-to-force-redender-a-story 2017-12-28 13:07:22 -05:00
Michael Shilman
02a69e0b1b v3.3.3 2017-12-28 22:34:34 +05:30
Dan Green
293bb7ad40 Merge branch 'master' of https://github.com/storybooks/storybook into (#1736)-Ability-to-force-redender-a-story 2017-12-28 10:27:55 -05:00
Igor
46732c3024
Merge branch 'master' into fix-di 2017-12-28 13:35:14 +02:00
Filipp Riabchun
97d49eddb5
Merge branch 'master' into eslint-imports 2017-12-28 14:02:14 +03:00
igor
b3792ef521 Use ɵReflectionCapabilities + knobs example 2017-12-28 10:31:57 +02:00
Igor
fc197de71c
Merge branch 'master' into fix-di 2017-12-28 09:03:50 +02:00
Michael Shilman
fbe50ffb46 v3.3.2 2017-12-28 12:10:49 +09:00
Filipp Riabchun
19e2761fef
Merge branch 'master' into eslint-imports 2017-12-28 04:46:44 +03:00
hypnos
7c4f87b68c Add more imports eslint rules 2017-12-28 04:38:46 +03:00
Dependencies.io Bot
2aee63edf2 Update @angular/cli from 1.6.2 to 1.6.3 in examples/angular-cli 2017-12-28 00:16:18 +00:00
Dependencies.io Bot
1d2c65cdc6 Update zone.js from 0.8.18 to 0.8.19 in examples/angular-cli 2017-12-28 00:14:16 +00:00
Norbert de Langen
5c04892375
Merge branch 'master' into tmeasday/chromatic 2017-12-27 23:59:15 +01:00
Dependencies.io Bot
7662394e36 Update karma-coverage-istanbul-reporter from 1.3.1 to 1.3.3 in examples/angular-cli 2017-12-27 16:37:42 +00:00
Dan Green
31a68d7b90 (#1736) Update Force ReRender storyshot 2017-12-27 11:15:36 -05:00
Norbert de Langen
ce935e6f84
Merge branch 'master' into (#1736)-Ability-to-force-redender-a-story 2017-12-27 14:47:50 +01:00
Filipp Riabchun
98eba63e78
Merge branch 'master' into tmeasday/chromatic 2017-12-27 14:42:13 +03:00
jason
46699f6a26 added dependency injection usecase story to examples 2017-12-27 12:43:51 +03:00
Michael Shilman
79c07c727a v3.3.1 2017-12-26 19:30:05 -08:00
Filipp Riabchun
0230c86f49
Merge branch 'master' into tmeasday/chromatic 2017-12-27 03:29:47 +03:00
Michael Shilman
0c38d5a041 Update cross-dependencies manually
Because of lerna not supporting `x.y.z-alpha.N` versions, we hardcode
these things when we are doing prerelease
2017-12-26 15:42:45 -08:00
Tom Coleman
376527f1b5 Don't fail the test if there are changes 2017-12-27 10:20:26 +11:00
Tom Coleman
19b419b912 Merge remote-tracking branch 'origin/master' into tmeasday/chromatic 2017-12-27 09:58:08 +11:00
Michael Shilman
92d7fca746 v3.3.0-rc.1 2017-12-26 09:48:54 -08:00
Lachlan Campbell
2f56ab361b Update snapshots 2017-12-25 20:52:41 -05:00
Norbert de Langen
a165e6a417
Merge branch 'master' into tmeasday/chromatic
# Conflicts:
#	yarn.lock
2017-12-24 13:00:39 +01:00
Filipp Riabchun
52fc7fc322
Merge branch 'master' into CI-angular 2017-12-24 13:58:34 +03:00
hypnos
9127f79029 Add integration test for angular example 2017-12-24 11:58:12 +01:00
hypnos
a8d234b6e9 Update storyshots 2017-12-24 11:32:55 +01:00
hypnos
0d27286058 Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-140.0.0
# Conflicts:
#	examples/angular-cli/package.json
2017-12-24 11:30:08 +01:00
Michael Shilman
aa2a8c11f3 v3.3.0-rc.0 2017-12-23 20:20:05 -08:00
Dependencies.io Bot
7242ad8026 Update tslint from 5.3.2 to 5.8.0 in examples/angular-cli 2017-12-24 01:03:17 +00:00
Dependencies.io Bot
0aacc39b5a Update ts-node from 3.2.2 to 3.3.0 in examples/angular-cli 2017-12-24 01:01:30 +00:00
Dependencies.io Bot
4d5eb04330 Update protractor from 5.1.2 to 5.2.2 in examples/angular-cli 2017-12-24 00:59:44 +00:00
Dependencies.io Bot
a4e03c04bf Update karma-coverage-istanbul-reporter from 1.3.0 to 1.3.1 in examples/angular-cli 2017-12-24 00:57:54 +00:00
Dependencies.io Bot
b22d5116e5 Update karma-chrome-launcher from 2.1.1 to 2.2.0 in examples/angular-cli 2017-12-24 00:56:16 +00:00
Dependencies.io Bot
0630b75631 Update jasmine-spec-reporter from 4.1.1 to 4.2.1 in examples/angular-cli 2017-12-24 00:54:32 +00:00
Dependencies.io Bot
16b297d866 Update jasmine-core from 2.6.4 to 2.8.0 in examples/angular-cli 2017-12-24 00:52:54 +00:00
Dependencies.io Bot
e800da99f3 Update @types/jasmine from 2.5.54 to 2.8.2 in examples/angular-cli 2017-12-24 00:51:10 +00:00
Dependencies.io Bot
e8b2654504 Update @angular/cli from 1.3.0 to 1.6.2 in examples/angular-cli 2017-12-24 00:49:19 +00:00
Ruslan
13bf194296
Merge branch 'release/3.3' into component-props-assignment-improvements 2017-12-24 02:47:13 +03:00
jason
383ac44a72 added example story to examples/angular-cli 2017-12-24 02:24:01 +03:00
Norbert de Langen
defc1db68a
UPGRADE expo app.json 2017-12-23 23:09:34 +01:00
Norbert de Langen
3ff3a8fd7a
UPGRADE react-native 2017-12-23 21:11:08 +01:00
Norbert de Langen
8808ba5304
UPDATE snapshots 2017-12-23 20:19:22 +01:00
Norbert de Langen
d4f00d8613
Merge branch 'release/3.3' into upgrade-jest-v2
# Conflicts:
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
2017-12-23 19:44:58 +01:00
Norbert de Langen
3cfacfe4ec UPGRADE jest to latest & FIX all failing unittests 2017-12-23 18:48:29 +01:00
hypnos
6a1f1f691f Merge branch 'master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-12-23 18:30:24 +01:00
Michael Shilman
4903d6ece7 v3.3.0-alpha.6 2017-12-23 09:25:20 -08:00
Michael Shilman
a65beced79 v3.3.0-alpha.5 2017-12-23 09:05:46 -08:00