Skip to content

Commit

Permalink
Merge branch 'master' into admin-ui-improve-onchange
Browse files Browse the repository at this point in the history
  • Loading branch information
timleslie authored Feb 27, 2020
2 parents 6bb28a5 + cd7bfc9 commit 18f7492
Show file tree
Hide file tree
Showing 148 changed files with 1,348 additions and 676 deletions.
5 changes: 0 additions & 5 deletions .changeset/curly-pets-care.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/few-cameras-end.md

This file was deleted.

39 changes: 0 additions & 39 deletions .changeset/gold-tools-wash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/good-plants-buy.md

This file was deleted.

12 changes: 0 additions & 12 deletions .changeset/green-spies-argue.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hip-bags-jump.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/late-mayflies-dream.md

This file was deleted.

19 changes: 0 additions & 19 deletions .changeset/light-mirrors-train.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/light-planets-breathe.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/loud-monkeys-return.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/modern-cats-trade.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/orange-bikes-float.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/pretty-planets-accept.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/shiny-hounds-ring.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silly-meals-thank.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silver-peaches-care.md

This file was deleted.

43 changes: 0 additions & 43 deletions .changeset/small-queens-do.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/strong-apricots-drum.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/strong-dots-exist.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/ten-rivers-love.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/young-trains-fail.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>
<br>

[![Build Status](https://img.shields.io/circleci/project/github/keystonejs/keystone/master.svg)](https://circleci.com/gh/emotion-js/emotion)
[![Build Status](https://img.shields.io/circleci/project/github/keystonejs/keystone/master.svg)](https://circleci.com/gh/keystonejs/keystone)
[![slack](https://keystone-community.now.sh//badge.svg)](https://keystone-community.now.sh/)
[![Supported by Thinkmill](https://thinkmill.github.io/badge/heart.svg)](http://thinkmill.com.au/?utm_source=github&utm_medium=badge&utm_campaign=react-select)

Expand Down
21 changes: 21 additions & 0 deletions demo-projects/blog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# keystone_demo_blog

## 5.2.1

### Patch Changes

- [`d8a7b8a2`](https://github.com/keystonejs/keystone/commit/d8a7b8a23b4c3e1545d101a92323be165ad362e2) [#2395](https://github.com/keystonejs/keystone/pull/2395) Thanks [@timleslie](https://github.com/timleslie)! - Upgraded all `@emotion.*` dependencies.

* [`535ea6a9`](https://github.com/keystonejs/keystone/commit/535ea6a93d74eced46a8e5711a2e6aafa0dca95b) [#2390](https://github.com/keystonejs/keystone/pull/2390) Thanks [@Vultraz](https://github.com/Vultraz)! - Update `cross-env` dependency to 7.0.0.

- [`d89b7bf7`](https://github.com/keystonejs/keystone/commit/d89b7bf7da85436c7c3a94543370fa5d377f6b33) [#2089](https://github.com/keystonejs/keystone/pull/2089) Thanks [@Vultraz](https://github.com/Vultraz)! - Updated Blog demo to use Apollo hooks.

- Updated dependencies [[`0c9d3125`](https://github.com/keystonejs/keystone/commit/0c9d3125d9b4bb37047a6c6ed61796e52fba8b17), [`7ce804a8`](https://github.com/keystonejs/keystone/commit/7ce804a877300709375e5bc14206080ab15aec54), [`d8a7b8a2`](https://github.com/keystonejs/keystone/commit/d8a7b8a23b4c3e1545d101a92323be165ad362e2), [`5c6ee24c`](https://github.com/keystonejs/keystone/commit/5c6ee24ceea951d7add79af55ef5a408edd8b763), [`9a388f01`](https://github.com/keystonejs/keystone/commit/9a388f01e388272d56f81af2247d8030e0f2c972), [`6b1ea0ec`](https://github.com/keystonejs/keystone/commit/6b1ea0ec1b536b5c9098105f5e77c0cd5feaf6b0), [`7c552a14`](https://github.com/keystonejs/keystone/commit/7c552a14078843710b7f225a88d1cd2024514981), [`b30d1361`](https://github.com/keystonejs/keystone/commit/b30d13612c54c0a3f0ebc2fc9c777954d4c4727f), [`bd4096ee`](https://github.com/keystonejs/keystone/commit/bd4096ee86f7790c76db23090b38f880e5aa7ecc), [`fd94849b`](https://github.com/keystonejs/keystone/commit/fd94849bccaf13426d2f7bcc2cd82fe81da7be7e), [`b14a513e`](https://github.com/keystonejs/keystone/commit/b14a513e3c52e3f41bd4341b7b7faea2b9f8f2e9), [`5e8c6df3`](https://github.com/keystonejs/keystone/commit/5e8c6df3e7c8bee4c76ca4d5be38cd6aff198bd8), [`1b3ee45e`](https://github.com/keystonejs/keystone/commit/1b3ee45e9ec6e52329b208c73e5a3597aea69799), [`dcdd8ed9`](https://github.com/keystonejs/keystone/commit/dcdd8ed9142cf3328a7af80bc167ef93c7669b09), [`3abc5883`](https://github.com/keystonejs/keystone/commit/3abc58831e0f9b5871569a3fa6b21be7dc269cf3), [`8bdbb114`](https://github.com/keystonejs/keystone/commit/8bdbb114f6b2864693ae6e534df6fe8ee8345a60), [`4313b645`](https://github.com/keystonejs/keystone/commit/4313b64554b1cc64e64245706b00c0510a5dd0b4), [`362efbc2`](https://github.com/keystonejs/keystone/commit/362efbc2e054fa48aedb515c54b5a64757832be9), [`c059b63c`](https://github.com/keystonejs/keystone/commit/c059b63c6ebdbb60ac4095d1efd791d598b2756c)]:
- @keystonejs/app-admin-ui@5.9.0
- @keystonejs/keystone@5.6.0
- @arch-ui/layout@0.2.9
- @arch-ui/typography@0.0.13
- @keystonejs/fields-markdown@5.1.1
- @keystonejs/fields-wysiwyg-tinymce@5.1.1
- @keystonejs/fields@6.3.1
- @keystonejs/oembed-adapters@5.1.1
- @keystonejs/app-graphql@5.1.1

## 5.2.0

### Minor Changes
Expand Down
20 changes: 10 additions & 10 deletions demo-projects/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@keystonejs/demo-project-blog",
"description": "An example KeystoneJS project showcasing a Blogging Site.",
"private": true,
"version": "5.2.0",
"version": "5.2.1",
"author": "The KeystoneJS Development Team",
"license": "MIT",
"engines": {
Expand All @@ -16,22 +16,22 @@
"dependencies": {
"@apollo/react-hooks": "^3.1.3",
"@apollo/react-ssr": "^3.1.3",
"@arch-ui/layout": "^0.2.8",
"@arch-ui/typography": "^0.0.12",
"@arch-ui/layout": "^0.2.9",
"@arch-ui/typography": "^0.0.13",
"@emotion/core": "^10.0.27",
"@emotion/styled": "^10.0.27",
"@keystonejs/adapter-mongoose": "^5.2.0",
"@keystonejs/app-admin-ui": "^5.8.0",
"@keystonejs/app-graphql": "^5.1.0",
"@keystonejs/app-admin-ui": "^5.9.0",
"@keystonejs/app-graphql": "^5.1.1",
"@keystonejs/app-next": "^5.1.0",
"@keystonejs/app-static": "^5.1.0",
"@keystonejs/auth-password": "^5.1.0",
"@keystonejs/fields": "^6.3.0",
"@keystonejs/fields-markdown": "^5.1.0",
"@keystonejs/fields-wysiwyg-tinymce": "^5.1.0",
"@keystonejs/fields": "^6.3.1",
"@keystonejs/fields-markdown": "^5.1.1",
"@keystonejs/fields-wysiwyg-tinymce": "^5.1.1",
"@keystonejs/file-adapters": "^5.5.0",
"@keystonejs/keystone": "^5.5.0",
"@keystonejs/oembed-adapters": "^5.1.0",
"@keystonejs/keystone": "^5.6.0",
"@keystonejs/oembed-adapters": "^5.1.1",
"apollo-boost": "^0.4.7",
"apollo-client": "^2.6.8",
"apollo-upload-client": "^12.1.0",
Expand Down
15 changes: 15 additions & 0 deletions demo-projects/meetup/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# @keystonejs/demo-project-meetup

## 5.1.1

### Patch Changes

- [`d8a7b8a2`](https://github.com/keystonejs/keystone/commit/d8a7b8a23b4c3e1545d101a92323be165ad362e2) [#2395](https://github.com/keystonejs/keystone/pull/2395) Thanks [@timleslie](https://github.com/timleslie)! - Upgraded all `@emotion.*` dependencies.

* [`535ea6a9`](https://github.com/keystonejs/keystone/commit/535ea6a93d74eced46a8e5711a2e6aafa0dca95b) [#2390](https://github.com/keystonejs/keystone/pull/2390) Thanks [@Vultraz](https://github.com/Vultraz)! - Update `cross-env` dependency to 7.0.0.

* Updated dependencies [[`0c9d3125`](https://github.com/keystonejs/keystone/commit/0c9d3125d9b4bb37047a6c6ed61796e52fba8b17), [`7ce804a8`](https://github.com/keystonejs/keystone/commit/7ce804a877300709375e5bc14206080ab15aec54), [`d8a7b8a2`](https://github.com/keystonejs/keystone/commit/d8a7b8a23b4c3e1545d101a92323be165ad362e2), [`5c6ee24c`](https://github.com/keystonejs/keystone/commit/5c6ee24ceea951d7add79af55ef5a408edd8b763), [`9a388f01`](https://github.com/keystonejs/keystone/commit/9a388f01e388272d56f81af2247d8030e0f2c972), [`6b1ea0ec`](https://github.com/keystonejs/keystone/commit/6b1ea0ec1b536b5c9098105f5e77c0cd5feaf6b0), [`7c552a14`](https://github.com/keystonejs/keystone/commit/7c552a14078843710b7f225a88d1cd2024514981), [`b30d1361`](https://github.com/keystonejs/keystone/commit/b30d13612c54c0a3f0ebc2fc9c777954d4c4727f), [`bd4096ee`](https://github.com/keystonejs/keystone/commit/bd4096ee86f7790c76db23090b38f880e5aa7ecc), [`fd94849b`](https://github.com/keystonejs/keystone/commit/fd94849bccaf13426d2f7bcc2cd82fe81da7be7e), [`b14a513e`](https://github.com/keystonejs/keystone/commit/b14a513e3c52e3f41bd4341b7b7faea2b9f8f2e9), [`5e8c6df3`](https://github.com/keystonejs/keystone/commit/5e8c6df3e7c8bee4c76ca4d5be38cd6aff198bd8), [`1b3ee45e`](https://github.com/keystonejs/keystone/commit/1b3ee45e9ec6e52329b208c73e5a3597aea69799), [`dcdd8ed9`](https://github.com/keystonejs/keystone/commit/dcdd8ed9142cf3328a7af80bc167ef93c7669b09), [`3abc5883`](https://github.com/keystonejs/keystone/commit/3abc58831e0f9b5871569a3fa6b21be7dc269cf3), [`8bdbb114`](https://github.com/keystonejs/keystone/commit/8bdbb114f6b2864693ae6e534df6fe8ee8345a60), [`4313b645`](https://github.com/keystonejs/keystone/commit/4313b64554b1cc64e64245706b00c0510a5dd0b4), [`362efbc2`](https://github.com/keystonejs/keystone/commit/362efbc2e054fa48aedb515c54b5a64757832be9), [`c059b63c`](https://github.com/keystonejs/keystone/commit/c059b63c6ebdbb60ac4095d1efd791d598b2756c)]:
- @keystonejs/app-admin-ui@5.9.0
- @keystonejs/keystone@5.6.0
- @keystonejs/fields-wysiwyg-tinymce@5.1.1
- @keystonejs/fields@6.3.1
- @keystonejs/app-graphql@5.1.1

## 5.1.0

### Minor Changes
Expand Down
12 changes: 6 additions & 6 deletions demo-projects/meetup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@keystonejs/demo-project-meetup",
"description": "An example KeystoneJS project showcasing a Meetup Site.",
"private": true,
"version": "5.1.0",
"version": "5.1.1",
"author": "The KeystoneJS Development Team",
"license": "MIT",
"engines": {
Expand All @@ -16,15 +16,15 @@
"dependencies": {
"@emotion/core": "^10.0.27",
"@keystonejs/adapter-mongoose": "^5.2.0",
"@keystonejs/app-admin-ui": "^5.8.0",
"@keystonejs/app-graphql": "^5.1.0",
"@keystonejs/app-admin-ui": "^5.9.0",
"@keystonejs/app-graphql": "^5.1.1",
"@keystonejs/app-next": "^5.1.0",
"@keystonejs/auth-password": "^5.1.0",
"@keystonejs/email": "^5.1.0",
"@keystonejs/fields": "^6.3.0",
"@keystonejs/fields-wysiwyg-tinymce": "^5.1.0",
"@keystonejs/fields": "^6.3.1",
"@keystonejs/fields-wysiwyg-tinymce": "^5.1.1",
"@keystonejs/file-adapters": "^5.5.0",
"@keystonejs/keystone": "^5.5.0",
"@keystonejs/keystone": "^5.6.0",
"@keystonejs/session": "^5.1.0",
"apollo-boost": "^0.4.7",
"apollo-client": "^2.6.8",
Expand Down
12 changes: 12 additions & 0 deletions demo-projects/todo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @keystonejs/demo-project-todo

## 5.1.1

### Patch Changes

- [`535ea6a9`](https://github.com/keystonejs/keystone/commit/535ea6a93d74eced46a8e5711a2e6aafa0dca95b) [#2390](https://github.com/keystonejs/keystone/pull/2390) Thanks [@Vultraz](https://github.com/Vultraz)! - Update `cross-env` dependency to 7.0.0.

- Updated dependencies [[`0c9d3125`](https://github.com/keystonejs/keystone/commit/0c9d3125d9b4bb37047a6c6ed61796e52fba8b17), [`7ce804a8`](https://github.com/keystonejs/keystone/commit/7ce804a877300709375e5bc14206080ab15aec54), [`d8a7b8a2`](https://github.com/keystonejs/keystone/commit/d8a7b8a23b4c3e1545d101a92323be165ad362e2), [`5c6ee24c`](https://github.com/keystonejs/keystone/commit/5c6ee24ceea951d7add79af55ef5a408edd8b763), [`9a388f01`](https://github.com/keystonejs/keystone/commit/9a388f01e388272d56f81af2247d8030e0f2c972), [`6b1ea0ec`](https://github.com/keystonejs/keystone/commit/6b1ea0ec1b536b5c9098105f5e77c0cd5feaf6b0), [`7c552a14`](https://github.com/keystonejs/keystone/commit/7c552a14078843710b7f225a88d1cd2024514981), [`b30d1361`](https://github.com/keystonejs/keystone/commit/b30d13612c54c0a3f0ebc2fc9c777954d4c4727f), [`bd4096ee`](https://github.com/keystonejs/keystone/commit/bd4096ee86f7790c76db23090b38f880e5aa7ecc), [`fd94849b`](https://github.com/keystonejs/keystone/commit/fd94849bccaf13426d2f7bcc2cd82fe81da7be7e), [`5e8c6df3`](https://github.com/keystonejs/keystone/commit/5e8c6df3e7c8bee4c76ca4d5be38cd6aff198bd8), [`1b3ee45e`](https://github.com/keystonejs/keystone/commit/1b3ee45e9ec6e52329b208c73e5a3597aea69799), [`dcdd8ed9`](https://github.com/keystonejs/keystone/commit/dcdd8ed9142cf3328a7af80bc167ef93c7669b09), [`3abc5883`](https://github.com/keystonejs/keystone/commit/3abc58831e0f9b5871569a3fa6b21be7dc269cf3), [`8bdbb114`](https://github.com/keystonejs/keystone/commit/8bdbb114f6b2864693ae6e534df6fe8ee8345a60), [`4313b645`](https://github.com/keystonejs/keystone/commit/4313b64554b1cc64e64245706b00c0510a5dd0b4), [`362efbc2`](https://github.com/keystonejs/keystone/commit/362efbc2e054fa48aedb515c54b5a64757832be9), [`c059b63c`](https://github.com/keystonejs/keystone/commit/c059b63c6ebdbb60ac4095d1efd791d598b2756c)]:
- @keystonejs/app-admin-ui@5.9.0
- @keystonejs/keystone@5.6.0
- @keystonejs/fields@6.3.1
- @keystonejs/app-graphql@5.1.1

## 5.1.0

### Minor Changes
Expand Down
10 changes: 5 additions & 5 deletions demo-projects/todo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@keystonejs/demo-project-todo",
"description": "An example KeystoneJS project showcasing a simple Todo List.",
"private": true,
"version": "5.1.0",
"version": "5.1.1",
"author": "The KeystoneJS Development Team",
"license": "MIT",
"engines": {
Expand All @@ -15,11 +15,11 @@
},
"dependencies": {
"@keystonejs/adapter-mongoose": "^5.2.0",
"@keystonejs/app-admin-ui": "^5.8.0",
"@keystonejs/app-graphql": "^5.1.0",
"@keystonejs/app-admin-ui": "^5.9.0",
"@keystonejs/app-graphql": "^5.1.1",
"@keystonejs/app-static": "^5.1.0",
"@keystonejs/fields": "^6.3.0",
"@keystonejs/keystone": "^5.5.0",
"@keystonejs/fields": "^6.3.1",
"@keystonejs/keystone": "^5.6.0",
"cross-env": "^7.0.0"
}
}
Loading

0 comments on commit 18f7492

Please sign in to comment.