Merge branch 'master' into subscribe-mod-actions

Conflicts:
	client/coral-admin/src/routes/Moderation/components/Moderation.js
	client/coral-admin/src/routes/Moderation/components/styles.css
	client/coral-admin/src/routes/Moderation/containers/Moderation.js
This commit is contained in:
Chi Vinh Le
2017-06-19 23:52:10 +07:00
24 changed files with 522 additions and 86 deletions
+9 -1
View File
@@ -104,7 +104,15 @@ input UsersQuery {
sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
}
# AssetsQuery allows teh ability to query assets by specific fields
input AssetsQuery {
# a search string to match against titles, authors, urls, etc.
value: String = ""
# Limit the number of results to be returned
limit: Int = 10
}
################################################################################
## Tags
################################################################################
@@ -635,7 +643,7 @@ type RootQuery {
comment(id: ID!): Comment
# All assets. Requires the `ADMIN` role.
assets: [Asset]
assets(query: AssetsQuery): [Asset]
# Find or create an asset by url, or just find with the ID.
asset(id: ID, url: String): Asset