Merge branch 'master' into patch-1

This commit is contained in:
Jim LAURIE 2018-04-18 16:41:20 +02:00 committed by GitHub
commit 2f09e58c2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 58 additions and 57 deletions

View File

@ -22,6 +22,7 @@
* [Deployment](guides/deployment.md)
* [File Upload](guides/upload.md)
* [Filters](guides/filters.md)
* [GraphQL](guides/graphql.md)
* [Internationalization](guides/i18n.md)
* [Models](guides/models.md)
* [Policies](guides/policies.md)

View File

@ -1,6 +1,6 @@
{
"private": true,
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"devDependencies": {
"assert": "~1.3.0",
"babel-eslint": "^6.1.2",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -29,8 +29,8 @@
},
"devDependencies": {
"sanitize.css": "^4.1.0",
"strapi-helper-plugin": "3.0.0-alpha.11.3",
"strapi-utils": "3.0.0-alpha.11.3"
"strapi-helper-plugin": "3.0.0-alpha.12",
"strapi-utils": "3.0.0-alpha.12"
},
"author": {
"name": "Strapi",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-bookshelf",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,8 +19,8 @@
"bookshelf": "^0.12.1",
"lodash": "^4.17.4",
"pluralize": "^6.0.0",
"strapi-knex": "3.0.0-alpha.11.3",
"strapi-utils": "3.0.0-alpha.11.3"
"strapi-knex": "3.0.0-alpha.12",
"strapi-utils": "3.0.0-alpha.12"
},
"strapi": {
"isHook": true,

View File

@ -1,6 +1,6 @@
{
"name": "strapi-ejs",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-admin",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate the default admin panel for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -15,7 +15,7 @@
"dependencies": {
"fs-extra": "^4.0.1",
"lodash": "^4.17.4",
"strapi-admin": "3.0.0-alpha.11.3"
"strapi-admin": "3.0.0-alpha.12"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -18,7 +18,7 @@
"get-installed-path": "^3.0.1",
"inquirer": "^4.0.2",
"lodash": "^4.17.4",
"strapi-utils": "3.0.0-alpha.11.3",
"strapi-utils": "3.0.0-alpha.12",
"uuid": "^3.1.0"
},
"scripts": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
@ -17,7 +17,7 @@
"fs-extra": "^4.0.0",
"lodash": "^4.17.4",
"reportback": "^2.0.1",
"strapi-utils": "3.0.0-alpha.11.3"
"strapi-utils": "3.0.0-alpha.12"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-helper-plugin",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Helper for Strapi plugins development",
"engines": {
"node": ">= 9.0.0",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-knex",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Knex hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Views hook to enable server-side rendering for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-mongoose",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"mongoose": "^5.0.4",
"mongoose-float": "^1.0.2",
"pluralize": "^6.0.0",
"strapi-utils": "3.0.0-alpha.11.3"
"strapi-utils": "3.0.0-alpha.12"
},
"strapi": {
"isHook": true

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-manager",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "A powerful UI to easily manage your data.",
"strapi": {
"name": "Content Manager",
@ -24,7 +24,7 @@
},
"devDependencies": {
"react-select": "^1.0.0-rc.5",
"strapi-helper-plugin": "3.0.0-alpha.11.3"
"strapi-helper-plugin": "3.0.0-alpha.12"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-type-builder",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Strapi plugin to create content type (API).",
"strapi": {
"name": "Content Type Builder",
@ -24,11 +24,11 @@
},
"dependencies": {
"pluralize": "^7.0.0",
"strapi-generate": "3.0.0-alpha.11.3",
"strapi-generate-api": "3.0.0-alpha.11.3"
"strapi-generate": "3.0.0-alpha.12",
"strapi-generate-api": "3.0.0-alpha.12"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.11.3"
"strapi-helper-plugin": "3.0.0-alpha.12"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-email",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Email",
@ -26,7 +26,7 @@
"sendmail": "^1.2.0"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.11.3"
"strapi-helper-plugin": "3.0.0-alpha.12"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-graphql",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "This is the description of the plugin.",
"strapi": {
"name": "graphql",
@ -28,7 +28,7 @@
"graphql-tools": "^2.23.1",
"graphql-type-json": "^0.2.0",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-alpha.11.3"
"strapi-utils": "3.0.0-alpha.12"
},
"author": {
"name": "A Strapi developer",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Strapi plugin to manage settings.",
"strapi": {
"name": "Settings Manager",
@ -25,7 +25,7 @@
"devDependencies": {
"flag-icon-css": "^2.8.0",
"react-select": "^1.0.0-rc.5",
"strapi-helper-plugin": "3.0.0-alpha.11.3"
"strapi-helper-plugin": "3.0.0-alpha.12"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-upload",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Files Upload",
@ -24,12 +24,12 @@
},
"dependencies": {
"react-copy-to-clipboard": "^5.0.1",
"strapi-upload-local": "3.0.0-alpha.11.3",
"strapi-upload-local": "3.0.0-alpha.12",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.11.3"
"strapi-helper-plugin": "3.0.0-alpha.12"
},
"author": {
"name": "A Strapi developer",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Roles & Permissions",
@ -32,7 +32,7 @@
"uuid": "^3.1.0"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.11.3"
"strapi-helper-plugin": "3.0.0-alpha.12"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-redis",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Redis hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -18,7 +18,7 @@
"ioredis": "^3.1.2",
"lodash": "^4.17.4",
"stack-trace": "0.0.10",
"strapi-utils": "3.0.0-alpha.11.3"
"strapi-utils": "3.0.0-alpha.12"
},
"strapi": {
"isHook": true

View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-aws-s3",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "AWS S3 provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-cloudinary",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Cloudinary provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-local",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Local provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-utils",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "Shared utilities for the Strapi packages",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi",
"version": "3.0.0-alpha.11.3",
"version": "3.0.0-alpha.12",
"description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
"homepage": "http://strapi.io",
"keywords": [
@ -55,14 +55,14 @@
"rimraf": "^2.6.2",
"semver": "^5.4.1",
"stack-trace": "0.0.10",
"strapi-generate": "3.0.0-alpha.11.3",
"strapi-generate-admin": "3.0.0-alpha.11.3",
"strapi-generate-api": "3.0.0-alpha.11.3",
"strapi-generate-new": "3.0.0-alpha.11.3",
"strapi-generate-plugin": "3.0.0-alpha.11.3",
"strapi-generate-policy": "3.0.0-alpha.11.3",
"strapi-generate-service": "3.0.0-alpha.11.3",
"strapi-utils": "3.0.0-alpha.11.3"
"strapi-generate": "3.0.0-alpha.12",
"strapi-generate-admin": "3.0.0-alpha.12",
"strapi-generate-api": "3.0.0-alpha.12",
"strapi-generate-new": "3.0.0-alpha.12",
"strapi-generate-plugin": "3.0.0-alpha.12",
"strapi-generate-policy": "3.0.0-alpha.12",
"strapi-generate-service": "3.0.0-alpha.12",
"strapi-utils": "3.0.0-alpha.12"
},
"author": {
"email": "hi@strapi.io",