yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #703 from strapi/alpha.10.3

Browse Source 
Alpha.10.3
This commit is contained in:
Jim LAURIE 2018-03-01 11:54:47 +01:00 committed by GitHub
commit cf0b7dba22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

1
packages/strapi-admin/admin/src/assets/images/logo-t-shirt.svg Normal file
View File

@ -0,0 +1 @@
<svg width="24" height="17" xmlns="http://www.w3.org/2000/svg"><text transform="translate(-23 -9)" fill="#4B515A" fill-rule="evenodd" font-size="24" font-family="AppleColorEmoji, Apple Color Emoji"><tspan x="23" y="28">👕</tspan></text></svg>
Side by Side

After

Width:  |  Height:  |  Size: 245 B

3
packages/strapi-admin/admin/src/components/PluginCard/index.js
View File

@ -16,6 +16,7 @@ import InstallPluginPopup from 'components/InstallPluginPopup';
import Official from 'components/Official';
// import StarsContainer from 'components/StarsContainer';
import logoTShirt from 'assets/images/logo-t-shirt.svg';
import styles from './styles.scss';
import Screenshot from './screenshot.png';
@ -89,7 +90,7 @@ class PluginCard extends React.Component {
const pluginIcon = (
<div className={styles.frame}>
<span className={styles.helper} />
<img src={`${this.props.plugin.logo}`} alt="icon" />
<img src={`${this.props.plugin.id === 'support-us' ? logoTShirt : this.props.plugin.logo}`} alt="icon" />
</div>
);

6
packages/strapi-admin/package.json
View File

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

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

@ -1,6 +1,6 @@
{
"name": "strapi-bookshelf",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2",
"strapi-utils": "3.0.0-alpha.10.2"
"strapi-knex": "3.0.0-alpha.10.3",
"strapi-utils": "3.0.0-alpha.10.3"
},
"strapi": {
"isHook": true,
@ -55,4 +55,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-ejs",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -46,4 +46,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-admin",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2"
"strapi-admin": "3.0.0-alpha.10.3"
},
"author": {
"email": "hi@strapi.io",

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2",
"strapi-utils": "3.0.0-alpha.10.3",
"uuid": "^3.1.0"
},
"scripts": {
@ -48,4 +48,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -44,4 +44,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2"
"strapi-utils": "3.0.0-alpha.10.3"
},
"author": {
"name": "Strapi team",

2
packages/strapi-helper-plugin/package.json
View File

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

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

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

2
packages/strapi-middleware-views/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"description": "Views hook to enable server-side rendering 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.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2"
"strapi-utils": "3.0.0-alpha.10.3"
},
"strapi": {
"isHook": true

4
packages/strapi-plugin-content-manager/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-manager",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2"
"strapi-helper-plugin": "3.0.0-alpha.10.3"
},
"author": {
"name": "Strapi team",

8
packages/strapi-plugin-content-type-builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-type-builder",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2",
"strapi-generate-api": "3.0.0-alpha.10.2"
"strapi-generate": "3.0.0-alpha.10.3",
"strapi-generate-api": "3.0.0-alpha.10.3"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.10.2"
"strapi-helper-plugin": "3.0.0-alpha.10.3"
},
"author": {
"name": "Strapi team",

4
packages/strapi-plugin-email/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-email",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2"
"strapi-helper-plugin": "3.0.0-alpha.10.3"
},
"author": {
"name": "Strapi team",

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

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2"
"strapi-helper-plugin": "3.0.0-alpha.10.3"
},
"author": {
"name": "Strapi team",

4
packages/strapi-plugin-users-permissions/package.json
View File

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

10
packages/strapi-plugin-users-permissions/services/UsersPermissions.js
View File

@ -339,6 +339,16 @@ module.exports = {
return acc;
}, []);
// stringify mongoDB _id for add/remove matching
if (role._id ? '_id' : 'id' === '_id') {
role.users.reduce((acc, user) => {
const key = role._id ? '_id' : 'id';
user[key] = user[key].toString();
acc.push(user);
return acc;
}, []);
}
// Add user to this role.
_.differenceBy(body.users, role.users, role._id ? '_id' : 'id')
.filter(user => user.role !== `${root._id || root.id}`.toString())

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

@ -1,6 +1,6 @@
{
"name": "strapi-redis",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2"
"strapi-utils": "3.0.0-alpha.10.3"
},
"strapi": {
"isHook": true

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

@ -1,6 +1,6 @@
{
"name": "strapi-utils",
"version": "3.0.0-alpha.10.2",
"version": "3.0.0-alpha.10.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.10.2",
"version": "3.0.0-alpha.10.3",
"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.10.2",
"strapi-generate-admin": "3.0.0-alpha.10.2",
"strapi-generate-api": "3.0.0-alpha.10.2",
"strapi-generate-new": "3.0.0-alpha.10.2",
"strapi-generate-plugin": "3.0.0-alpha.10.2",
"strapi-generate-policy": "3.0.0-alpha.10.2",
"strapi-generate-service": "3.0.0-alpha.10.2",
"strapi-utils": "3.0.0-alpha.10.2"
"strapi-generate": "3.0.0-alpha.10.3",
"strapi-generate-admin": "3.0.0-alpha.10.3",
"strapi-generate-api": "3.0.0-alpha.10.3",
"strapi-generate-new": "3.0.0-alpha.10.3",
"strapi-generate-plugin": "3.0.0-alpha.10.3",
"strapi-generate-policy": "3.0.0-alpha.10.3",
"strapi-generate-service": "3.0.0-alpha.10.3",
"strapi-utils": "3.0.0-alpha.10.3"
},
"author": {
"email": "hi@strapi.io",