yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 21:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:strapi/strapi into alpha.4

Browse Source
This commit is contained in:
Aurélien Georget 2017-01-23 11:22:23 +01:00
commit 206d673822
17 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,4 +1,4 @@
{
"lerna": "2.0.0-beta.30",
"version": "3.0.0-alpha.2"
"version": "3.0.0-alpha.3"
}

4
packages/strapi-bookshelf/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-bookshelf",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"bookshelf": "~0.10.0",
"lodash": "^4.16.5",
"pluralize": "~3.1.0",
"strapi-utils": "^3.0.0-alpha.2"
"strapi-utils": "^3.0.0-alpha.3"
},
"strapi": {
"isHook": true,

2
packages/strapi-ejs/package.json
View File

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

4
packages/strapi-generate-admin/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-admin",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "Generate the default admin panel for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -15,7 +15,7 @@
"dependencies": {
"fs-extra": "~0.30.0",
"lodash": "^4.16.5",
"strapi-utils": "^3.0.0-alpha.2"
"strapi-utils": "^3.0.0-alpha.3"
},
"scripts": {
"prepublish": "cd files/admin && npm run setup"

2
packages/strapi-generate-api/package.json
View File

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

2
packages/strapi-generate-controller/package.json
View File

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

6
packages/strapi-generate-migrations/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-migrations",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "Generate migration files for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -23,8 +23,8 @@
"knex": "^0.12.6",
"lodash": "^4.16.5",
"pluralize": "^3.0.0",
"strapi-bookshelf": "^3.0.0-alpha.2",
"strapi-utils": "^3.0.0-alpha.2"
"strapi-bookshelf": "^3.0.0-alpha.3",
"strapi-utils": "^3.0.0-alpha.3"
},
"scripts": {
"prepublish": "npm prune"

2
packages/strapi-generate-model/package.json
View File

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

4
packages/strapi-generate-new/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -16,7 +16,7 @@
"enpeem": "^2.2.0",
"fs-extra": "~1.0.0",
"lodash": "^4.16.5",
"strapi-utils": "^3.0.0-alpha.2"
"strapi-utils": "^3.0.0-alpha.3"
},
"scripts": {
"prepublish": "npm prune"

2
packages/strapi-generate-policy/package.json
View File

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

2
packages/strapi-generate-service/package.json
View File

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

4
packages/strapi-generate/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
@ -17,7 +17,7 @@
"fs-extra": "~1.0.0",
"lodash": "^4.16.5",
"reportback": "^2.0.1",
"strapi-utils": "^3.0.0-alpha.2"
"strapi-utils": "^3.0.0-alpha.3"
},
"scripts": {
"prepublish": "npm prune"

2
packages/strapi-knex/package.json
View File

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

4
packages/strapi-mongoose/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-mongoose",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"mongoose-double": "0.0.1",
"mongoose-float": "^1.0.2",
"pluralize": "~3.1.0",
"strapi-utils": "^3.0.0-alpha.2"
"strapi-utils": "^3.0.0-alpha.3"
},
"strapi": {
"isHook": true

2
packages/strapi-plugin-settings-manager/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "0.0.0",
"version": "3.0.0-alpha.3",
"description": "Strapi Plugin - Settings Manager",
"engines": {
"node": ">= 7.0.0",

2
packages/strapi-utils/package.json
View File

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

18
packages/strapi/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "Build powerful back-end with no effort",
"homepage": "http://strapi.io",
"keywords": [
@ -61,14 +61,14 @@
"lodash": "^4.16.5",
"node-schedule": "^1.2.0",
"socket.io": "^1.5.1",
"strapi-generate": "^3.0.0-alpha.2",
"strapi-generate-admin": "^3.0.0-alpha.2",
"strapi-generate-api": "^3.0.0-alpha.2",
"strapi-generate-new": "^3.0.0-alpha.2",
"strapi-generate-policy": "^3.0.0-alpha.2",
"strapi-generate-service": "^3.0.0-alpha.2",
"strapi-mongoose": "^3.0.0-alpha.2",
"strapi-utils": "^3.0.0-alpha.2"
"strapi-generate": "^3.0.0-alpha.3",
"strapi-generate-admin": "^3.0.0-alpha.3",
"strapi-generate-api": "^3.0.0-alpha.3",
"strapi-generate-new": "^3.0.0-alpha.3",
"strapi-generate-policy": "^3.0.0-alpha.3",
"strapi-generate-service": "^3.0.0-alpha.3",
"strapi-mongoose": "^3.0.0-alpha.3",
"strapi-utils": "^3.0.0-alpha.3"
},
"scripts": {
"prepublish": "cd ./node_modules/koa-joi-router && sed -i.bu 's/await-busboy/co-busboy/' joi-router.js && npm install co-busboy"