1128 Commits

Author SHA1 Message Date
Dependencies.io Bot
53daa9865a batch bootstrap 2018-05-22 21:32:11 +00:00
Neville Mehta
578942bd5c
Merge branch 'master' into addmarkosupport 2018-05-19 18:57:13 -07:00
Neville Mehta
39390d2a28 add support for marko widgets 2018-05-19 01:44:03 -07:00
Norbert de Langen
43279a3076
Merge branch 'master' into feature/more-components 2018-05-18 13:38:51 +02:00
Hypnosphi
7d831416a3 Fix lint 2018-05-18 03:11:38 +03:00
Hypnosphi
0c07633a72 Revert "batch bootstrap"
This reverts commit 5e29054
2018-05-18 03:08:22 +03:00
Norbert de Langen
5eec2c8689
FIX styling issue in storysource addon && CLEANUP && ADD emotion-theming 2018-05-15 23:52:57 +02:00
Norbert de Langen
75593740e9
REFACTOR to use emotion, see: https://github.com/paypal/glamorous/issues/419 2018-05-14 22:20:46 +02:00
Dependencies.io Bot
5e290544c2 batch bootstrap 2018-05-14 16:56:36 +00:00
Norbert de Langen
e0e77b678f
ADD 'jest-glamor-react' to get more meaningful snapshots 2018-05-11 17:39:29 +02:00
Norbert de Langen
4aa547b4e3
UPGRADE glamorous 2018-05-11 08:11:53 +02:00
Norbert de Langen
0fa6a51974
MOVE header to lib/component & REFACTOR to use glamorous && ADD glamorous-displayname babel-plugin 2018-05-11 01:25:53 +02:00
Hypnosphi
d25429a309 Re-generate lockfile 2018-05-08 01:17:40 +03:00
Neville Mehta
554f4f115d Merge branch 'master' of github.com:storybooks/storybook into addmarkosupport 2018-05-07 13:09:43 -07:00
Dependencies.io Bot
c41c2851cd batch bootstrap 2018-05-07 18:20:52 +00:00
Kliment
0ca9f06225
Merge branch 'master' into master 2018-05-07 07:56:42 +03:00
Neville Mehta
d8e0673d31 Merge branch 'master' of github.com:storybooks/storybook into addmarkosupport 2018-05-06 21:13:31 -07:00
klimentru1986
193a05318b update package.json jest config 2018-05-06 01:30:39 +03:00
klimentru1986
499d43fd89 yarn bootstrap --reset --core 2018-05-06 00:11:04 +03:00
Hypnosphi
100985bfdb withActions decorator 2018-05-02 20:31:53 +03:00
Hypnosphi
4a86624c78 Merge branch 'master' into html 2018-05-02 18:01:00 +03:00
Neville Mehta
04bdf98edb Merge branch 'master' of github.com:storybooks/storybook into addmarkosupport 2018-05-01 23:20:48 -07:00
Neville Mehta
de437016e8 Fix the import of external md files for marko 2018-05-01 23:14:49 -07:00
Hypnosphi
7a37aaa234 Use predictable placeholder image 2018-05-02 02:30:39 +03:00
Hypnosphi
02a95f5cb6 Channel-postmessage: send message to both windows 2018-05-01 22:35:13 +03:00
Neville Mehta
b0dd82ce4d update yarn 2018-05-01 12:00:54 -07:00
Neville Mehta
35b5e9be65
Merge branch 'master' into addmarkosupport 2018-05-01 10:57:31 -07:00
Hypnosphi
61f1291d3d Integrate changes from #3472 2018-05-01 19:56:39 +03:00
Filipp Riabchun
323c523d18
Merge pull request #3472 from Keraito/import-external-md
Fix the import of external md files
2018-05-01 19:09:01 +03:00
Neville Mehta
7a3459291c Merge branch 'master' of github.com:storybooks/storybook into addmarkosupport 2018-05-01 01:37:28 -07:00
Neville Mehta
d99b440758 review comments, use new showError framework 2018-05-01 01:32:43 -07:00
Dependencies.io Bot
4536fd7646 batch bootstrap 2018-04-30 20:42:30 +00:00
Filipp Riabchun
06e777cd11
Merge branch 'master' into import-external-md 2018-04-30 23:06:57 +03:00
Hypnosphi
91f846349d Update lockfile 2018-04-30 23:04:02 +03:00
Neville Mehta
d44022f96c fix app/marko to point to 4.0.0-alpha.4, remove stuff thats not needed, and some refactor 2018-04-29 18:37:18 -07:00
Neville Mehta
bb20d63db0 Resolved merge conflict 2018-04-28 16:32:12 -07:00
Hypnosphi
035cbe664c Merge remote-tracking branch 'origin/master' into feature/add-excluded-proptypes-to-with-info
# Conflicts:
#	examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
2018-04-27 03:06:13 +03:00
Keraito
d7c8fa7c71 Replace md- and html-loader with raw-loader for vue 2018-04-27 01:12:40 +02:00
Hypnosphi
b185ff88d5 Update test snapshots 2018-04-27 02:05:57 +03:00
Tom Coleman
0a959b404d somehow missed this first time 2018-04-26 12:12:33 +10:00
Tom Coleman
2ff42370ba Update to 0.8.3 2018-04-26 11:58:27 +10:00
Andy Orahoske
6286f129b2 Add core-js as dependency on info addon 2018-04-24 19:47:38 -04:00
Keraito
8cd3e944a9 Replace md- and html-loader with raw-loader for react 2018-04-24 17:55:14 +02:00
Keraito
f7cc050d57 Turn html into markdown when imported externally 2018-04-23 19:20:53 +02:00
Dependencies.io Bot
3dc136a029 batch bootstrap 2018-04-23 16:47:27 +00:00
Filipp Riabchun
58c15c0bdc
Merge pull request #3470 from storybooks/upgrade-redux
Upgrade redux to 4.0.0
2018-04-23 12:29:18 +03:00
Filipp Riabchun
3f602a0f80
Merge pull request #3457 from storybooks/error-nopreview-core
Refactor error and "no preview" views into core
2018-04-22 16:48:29 +03:00
Hypnosphi
d9669a4410 Merge remote-tracking branch 'origin/master' into error-nopreview-core
# Conflicts:
#	app/angular/package.json
2018-04-22 16:30:38 +03:00
Hypnosphi
f51711af45 Remove unused dev scripts 2018-04-22 16:14:12 +03:00
Hypnosphi
4419175695 Text knob: add escapeHTML option; use it by default in Vue, Angular, and Polymer 2018-04-22 02:58:20 +03:00