Norbert de Langen
f20d8603b1
Merge branch 'master' into release/3.3
...
# Conflicts:
# addons/comments/src/manager/components/CommentItem/index.js
# addons/comments/src/manager/containers/CommentsPanel/dataStore.js
# addons/comments/src/manager/containers/CommentsPanel/index.js
# addons/info/src/components/PropTable.js
# lib/cli/bin/generate.js
# lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
# lib/ui/src/modules/ui/components/addon_panel/index.test.js
# scripts/test.js
2017-11-03 00:43:42 +01:00
hypnos
9856f319da
Fix apps
2017-11-02 04:56:40 +03:00
hypnos
735497714c
Upgrade eslint-config-airbnb and make it pass
2017-11-02 04:40:48 +03:00
Michael Shilman
f15eaa6a68
v3.2.14
2017-11-01 16:21:34 +09:00
hypnos
5362da6137
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# app/react/src/server/index.js
# app/vue/src/server/index.js
2017-11-01 05:10:22 +03:00
Filipp Riabchun
7d07c40688
Merge branch 'master' into derekstavis-patch-2
2017-11-01 05:02:12 +03:00
hypnos
73a8026801
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# addons/knobs/package.json
# examples/cra-kitchen-sink/package.json
# yarn.lock
2017-11-01 05:00:41 +03:00
Dependencies.io Bot
288e9aa305
Update babel-preset-react-app from 3.0.3 to 3.1.0 in app/react
2017-10-31 23:37:46 +00:00
Filipp Riabchun
e98afd942c
Merge branch 'master' into derekstavis-patch-2
2017-11-01 02:32:25 +03:00
Filipp Riabchun
61a8ed026b
Merge branch 'master' into release/3.3
2017-11-01 01:37:42 +03:00
Norbert de Langen
83e719131b
Update README.md
2017-10-31 23:28:48 +01:00
Norbert de Langen
effe2ee84b
Merge branch 'master' into release/3.3
...
# Conflicts:
# app/react-native/readme.md
# examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
# examples/cra-kitchen-sink/src/stories/index.js
# examples/crna-kitchen-sink/package.json
# integration/__image_snapshots__/cra-kitchen-sink-snap.png
# integration/__image_snapshots__/vue-kitchen-sink-snap.png
# yarn.lock
2017-10-31 23:26:48 +01:00
Daniel Duan
b3427bccbb
Merge branch 'master' into patch-2
2017-10-27 21:50:33 -04:00
Dependencies.io Bot
c94d7e3bae
Update glamorous from 4.10.0 to 4.11.0 in app/react
2017-10-27 16:25:55 +00:00
Norbert de Langen
0ad2674382
Merge branch 'master' into patch-2
2017-10-25 07:34:23 +02:00
Norbert de Langen
462ea1cc4a
Merge branch 'master' into release/3.3
2017-10-24 23:25:18 +02:00
Dependencies.io Bot
be4f7854d0
Update chalk from 2.2.0 to 2.3.0 in app/react
2017-10-24 16:27:47 +00:00
Derek W. Stavis
d67d2c7f69
Avoid logging an object on compilation errors
...
In certain configurations Storybook might log the whole Webpack
build object when warnings or errors are thrown. This was caused
by a `logger.error` call inside the `index.js` catch. This fixes by logging
the error only when it's an instance of an error.
2017-10-24 11:27:59 -02:00
Norbert de Langen
254e52f8f2
Merge branch 'master' into release/3.3
2017-10-23 16:42:06 +02:00
gkrafsig
171da12dd4
Updating to new favicon
2017-10-22 20:42:55 -04:00
hypnos
059835eb2d
Merge remote-tracking branch 'origin/master' into release/3.3
2017-10-22 22:51:34 +03:00
Dependencies.io Bot
37974df512
Update autoprefixer from 7.1.5 to 7.1.6 in app/react
2017-10-22 16:27:13 +00:00
Dependencies.io Bot
711c15e196
Update glamorous from 4.9.7 to 4.10.0 in app/react
2017-10-21 12:44:42 +00:00
Michael Shilman
a701365e70
v3.2.13
2017-10-20 21:44:34 +02:00
Dependencies.io Bot
9a559a16ec
Update chalk from 2.1.0 to 2.2.0 in app/react
2017-10-18 16:36:01 +00:00
hypnos
fba550318d
Merge remote-tracking branches 'remotes/origin/babel-preset-env-1.6.1-27.0.0', 'remotes/origin/babel-preset-env-1.6.1-27.0.0-app--react', 'remotes/origin/babel-preset-env-1.6.1-27.0.0-app--react-native' and 'remotes/origin/babel-preset-env-1.6.1-27.1.0' into update-deps
2017-10-18 01:00:52 +03:00
Dependencies.io Bot
4d1c260ac4
Update webpack from 3.7.1 to 3.8.1 in app/react
2017-10-17 16:40:42 +00:00
Dependencies.io Bot
143c905503
Update babel-preset-env from 1.6.0 to 1.6.1 in app/react
2017-10-17 16:38:36 +00:00
hypnos
26bbc69282
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# yarn.lock
2017-10-17 03:27:19 +03: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
Dependencies.io Bot
0a97d5254f
Update webpack-hot-middleware from 2.19.1 to 2.20.0 in app/react
2017-10-16 16:29:09 +00:00
Dependencies.io Bot
496863195f
Update postcss-loader from 2.0.7 to 2.0.8 in app/react
2017-10-14 16:34:37 +00:00
Dependencies.io Bot
7bd276b2d2
Update webpack from 3.6.0 to 3.7.1 in app/react
2017-10-12 23:50:20 +02:00
Filipp Riabchun
334d4a9a36
Merge branch 'master' into postcss-loader-2.0.7-21.0.0-app--react
2017-10-12 00:04:13 +02:00
Dependencies.io Bot
d397a1617e
Update postcss-loader from 2.0.6 to 2.0.7 in app/react
2017-10-11 16:28:48 +00:00
Dependencies.io Bot
d834ade12b
Update express from 4.16.1 to 4.16.2 in app/react
2017-10-11 16:27:04 +00:00
Dependencies.io Bot
7c4cbc4732
Update autoprefixer from 7.1.4 to 7.1.5 in app/react
2017-10-09 22:28:55 +00:00
Dependencies.io Bot
5ba492a974
Update react-modal from 2.3.3 to 2.4.1 in app/react
2017-10-06 16:24:23 +00:00
hypnos
f07cb15973
Merge remote-tracking branch 'origin/master' into release/3.3
2017-10-05 02:42:23 +03:00
Filipp Riabchun
854fb24a4e
Merge branch 'master' into url-loader-0.6.2-9.0.0-app--react
2017-10-04 15:39:06 -07:00
Dependencies.io Bot
75f71aea27
Update url-loader from 0.5.9 to 0.6.2 in app/react
2017-10-04 21:54:04 +00:00
Dependencies.io Bot
f81e36865e
Update react-modal from 2.3.2 to 2.3.3 in app/react
2017-10-04 21:52:31 +00:00
Michael Shilman
b577ddd543
v3.3.0-alpha.2
2017-10-03 22:10:15 +02:00
Michael Shilman
3f97c6f175
v3.2.12
2017-10-03 00:29:46 +02:00
Michael Shilman
5030ee196c
v3.3.0-alpha.1
2017-10-02 20:57:35 +02: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
Filipp Riabchun
f152c0dcb6
Merge branch 'master' into ndelangen/upgrade-react
2017-09-30 06:21:30 -07:00
Filipp Riabchun
38df1ed32b
Merge branch 'master' into release/3.3
2017-09-30 03:18:59 -07:00
Norbert de Langen
ebd2f8b632
Merge branch 'master' into yarn-master
2017-09-30 11:17:03 +02:00
