72 Commits

Author SHA1 Message Date
Norbert de Langen
e8c8f33f97
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/links/package.json
#	addons/storyshots/package.json
#	examples/cra-kitchen-sink/.storybook/addons.js
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
#	yarn.lock
2017-11-15 19:40:55 +01:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00
hypnos
8c8b35a2d2 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
#	yarn.lock
2017-11-11 03:24:39 +03:00
hypnos
0c4ef51fc5 Update React to 16.1.0 2017-11-10 19:58:38 +03:00
Michael Shilman
0be4efcec8 v3.2.15 2017-11-10 11:39:27 +09:00
Michael Shilman
1a6082a4ad v3.3.0-alpha.3 2017-11-07 12:56:56 +09:00
Michael Shilman
f15eaa6a68 v3.2.14 2017-11-01 16:21:34 +09: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
336c0a5fbb
Merge branch 'master' into dd/changelo 2017-10-30 10:54:05 -04:00
Dependencies.io Bot
352dab5f33 Update graphiql from 0.11.9 to 0.11.10 in addons/graphql 2017-10-29 00:07:15 +00:00
Daniel Duan
a4dff5fdd9 #1557 getting rid of old change logs 2017-10-28 19:20:35 -04:00
Dependencies.io Bot
9e6fc22b7b Update graphiql from 0.11.6 to 0.11.9 in addons/graphql 2017-10-26 16:22:10 +00:00
hypnos
0b949998f7 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-10-23 22:58:02 +03:00
Dependencies.io Bot
9fc41460b3 Update graphiql from 0.11.5 to 0.11.6 in addons/graphql 2017-10-23 16:21:20 +00:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
Norbert de Langen
8f45f500ad Update README.md 2017-10-23 15:54:13 +02:00
Michael Shilman
a701365e70 v3.2.13 2017-10-20 21:44:34 +02:00
hypnos
f07cb15973 Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-05 02:42:23 +03:00
Dependencies.io Bot
88fc4cf578 Update graphql from 0.11.6 to 0.11.7 in addons/graphql 2017-10-04 21:42:57 +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
Michael Shilman
70825cb2dc resolve conflicts merging master into release/3.3 2017-10-02 20:20:10 +02:00
hypnos
2e8240d176 Fix/suppress current eslint warnings.
Raise `import/no-unresolved` and `import/extensions` to error level
everywhere except `docs`
2017-10-02 01:40:46 +03:00
Filipp Riabchun
a306d2bd1b Merge branch 'master' into release/3.3 2017-09-30 15:35:05 -07:00
hypnos
cb98495438 Fix merge artifact 2017-10-01 01:26:51 +03:00
Filipp Riabchun
d43a38b692 Merge branch 'master' into graphql-0.11.6-3.0.0-addons--graphql 2017-09-30 15:23:59 -07: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
Dependencies.io Bot
ccaf965bd4 Update graphql from 0.7.2 to 0.11.6 in addons/graphql 2017-09-30 20:48:59 +00:00
Dependencies.io Bot
261be27010 Update graphiql from 0.7.8 to 0.11.5 in addons/graphql 2017-09-30 20:47:06 +00:00
Filipp Riabchun
f152c0dcb6 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 06:21:30 -07:00
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
hypnos
2f53feb64a Use yarn workspaces on master 2017-09-29 23:00:47 +03:00
Michael Shilman
748e5959ec v3.2.10 2017-09-22 22:42:13 +01:00
hypnos
824bbd6a6d Replace the deprecated prepublish script with prepare 2017-09-08 03:19:39 +03:00
Michael Shilman
94723262d9 v3.3.0-alpha.0 2017-09-06 13:46:17 -07:00
Norbert de Langen
7ab74c6a34 LINTING 2017-09-06 20:57:31 +02:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Michael Shilman
8e03aacb68 v3.2.0 2017-07-31 07:12:08 -07:00
Michael Shilman
0188ace87f v3.2.0-alpha.10 2017-07-27 01:06:54 -07:00
Norbert de Langen
c11c189d7e UPDATE everything (including eslint 4) 2017-07-25 11:20:08 +02:00
Michael Shilman
d8f22cdb85 v3.1.6 2017-06-26 16:32:38 +10:00
Michael Shilman
b20e6f5091 Remove package-lock.json 2017-06-23 01:03:45 +10:00
Michael Shilman
a620cfed2a v3.1.5 2017-06-22 16:36:43 +10:00
Michael Shilman
e5041fa06a Add package-lock.json
Per discussion with @tmeasday 😉
2017-06-22 11:17:16 +10:00
Michael Shilman
c289d15bc7 v3.1.2 2017-06-09 23:53:03 +12:00
Michael Shilman
ea616369eb v3.1.1 2017-06-09 23:31:52 +12:00
Michael Shilman
56052112c3 v3.1.0 2017-06-09 22:52:20 +12:00
James Hush
4b534e9a94 Fix bug in addons/graphql in reIndentQuery 2017-06-06 14:24:19 -07:00
Norbert de Langen
28a4b32323 CHANGE all package.jsons so they are uniformly sorted 2017-06-06 17:46:55 +02:00