diff --git a/package.json b/package.json index 9d746ed174..0b444bdd43 100755 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/strapi-admin/admin/src/assets/images/logo-t-shirt.svg b/packages/strapi-admin/admin/src/assets/images/logo-t-shirt.svg new file mode 100644 index 0000000000..e8e8c55d03 --- /dev/null +++ b/packages/strapi-admin/admin/src/assets/images/logo-t-shirt.svg @@ -0,0 +1 @@ +👕 diff --git a/packages/strapi-admin/admin/src/components/PluginCard/index.js b/packages/strapi-admin/admin/src/components/PluginCard/index.js index 0e539914e7..d48067bec0 100644 --- a/packages/strapi-admin/admin/src/components/PluginCard/index.js +++ b/packages/strapi-admin/admin/src/components/PluginCard/index.js @@ -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 = (
- icon + icon
); diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 524362b5f1..03c677c123 100755 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -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", diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json index 6de0a15a7a..43db7cf6bc 100755 --- a/packages/strapi-bookshelf/package.json +++ b/packages/strapi-bookshelf/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json index 019e8e2897..8bfaf71af5 100755 --- a/packages/strapi-ejs/package.json +++ b/packages/strapi-ejs/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json index 88f7c908a1..338ebd7f09 100755 --- a/packages/strapi-generate-admin/package.json +++ b/packages/strapi-generate-admin/package.json @@ -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", diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index 178c5d18de..c130564fdc 100755 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index 41ba8dc5ee..bbd8e58903 100755 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index 2301efdc9a..f052661a9a 100755 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index 198f72864e..a915384754 100755 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index 6467082773..51f73700ec 100755 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index 492c8123cc..18ca30450a 100755 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index c40e9e65bc..fe2579b6d5 100755 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -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" -} \ No newline at end of file +} diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index b911acfcb4..9abb29876e 100755 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -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", diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index d2f7cfe0fc..c1944d94ea 100755 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -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", diff --git a/packages/strapi-knex/package.json b/packages/strapi-knex/package.json index 4706b40a82..50d9d3a6ba 100755 --- a/packages/strapi-knex/package.json +++ b/packages/strapi-knex/package.json @@ -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": [ diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json index b2a140e30c..ecf9cf2d43 100755 --- a/packages/strapi-middleware-views/package.json +++ b/packages/strapi-middleware-views/package.json @@ -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": [ diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json index 9bf0a22d8f..e12ad49fc7 100755 --- a/packages/strapi-mongoose/package.json +++ b/packages/strapi-mongoose/package.json @@ -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 diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 5721c95ab5..d8f1064775 100755 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -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", diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index 99f3eaa8a1..4f96894480 100755 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -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", diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index ba22024885..6c6a2ee6ab 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -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", diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index eb72c7ea67..6735a81214 100755 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -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", diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 05fdfe55f5..6d90a9efa6 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -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", diff --git a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js index b91687b320..19f49e7027 100644 --- a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js +++ b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js @@ -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()) diff --git a/packages/strapi-redis/package.json b/packages/strapi-redis/package.json index 6b883d9125..da772f786b 100755 --- a/packages/strapi-redis/package.json +++ b/packages/strapi-redis/package.json @@ -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 diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index 5352641858..bdbca00d98 100755 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -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": [ diff --git a/packages/strapi/package.json b/packages/strapi/package.json index 34b61aede4..4931f49ac7 100755 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -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",