yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-12 15:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
soupette 2018-04-10 11:18:04 +02:00
commit 81109f558e
35 changed files with 109 additions and 85 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.11.2",
"version": "3.0.0-alpha.11.3",
"devDependencies": {
"assert": "~1.3.0",
"babel-eslint": "^6.1.2",

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

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

11
packages/strapi-bookshelf/lib/index.js
View File

@ -89,9 +89,16 @@ module.exports = function(strapi) {
tableName: definition.collectionName,
hasTimestamps: _.get(definition, 'options.timestamps') === true,
idAttribute: _.get(definition, 'options.idAttribute', 'id'),
associations: []
}, definition.options);
associations: [],
defaults: Object.keys(definition.attributes).reduce((acc, current) => {
if (definition.attributes[current].type && definition.attributes[current].default) {
acc[current] = definition.attributes[current].default;
}
return acc;
}, {})
}, definition.options);
if (_.isString(_.get(connection, 'options.pivot_prefix'))) {
loadedModel.toJSON = function(options = {}) {
const { shallow = false, omitPivot = false } = options;

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

@ -1,6 +1,6 @@
{
"name": "strapi-bookshelf",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"strapi-utils": "3.0.0-alpha.11.2"
"strapi-knex": "3.0.0-alpha.11.3",
"strapi-utils": "3.0.0-alpha.11.3"
},
"strapi": {
"isHook": true,

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

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

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.3",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"strapi-utils": "3.0.0-alpha.11.3",
"uuid": "^3.1.0"
},
"scripts": {

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

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

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

@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.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.11.2"
"strapi-utils": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.3",
"description": "Helper for Strapi plugins development",
"engines": {
"node": ">= 9.0.0",

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

@ -1,6 +1,6 @@
{
"name": "strapi-knex",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.3",
"description": "Knex hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -46,4 +46,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

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

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.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.11.2"
"strapi-utils": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.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.11.2"
"strapi-helper-plugin": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.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.11.2",
"strapi-generate-api": "3.0.0-alpha.11.2"
"strapi-generate": "3.0.0-alpha.11.3",
"strapi-generate-api": "3.0.0-alpha.11.3"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.11.2"
"strapi-helper-plugin": "3.0.0-alpha.11.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.11.2",
"version": "3.0.0-alpha.11.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.11.2"
"strapi-helper-plugin": "3.0.0-alpha.11.3"
},
"author": {
"name": "Strapi team",

2
packages/strapi-plugin-settings-manager/admin/src/translations/de.json
View File

@ -144,7 +144,7 @@
"popUpWarning.danger.ok.message": "Ich stimme zu",
"popUpWarning.databases.delete.message": "Bist du sicher, dass du diese Datenbank löschen möchtest?",
"popUpWarning.languages.delete.message": "Bist du sicher, dass du diese Sprache entfernen möchtest?",
"strapi.notification.info.settingsEqual": "Settings are equals",
"strapi.notification.info.settingsEqual": "Einstellungen sind gleich",
"strapi.notification.success.databaseDelete": "Die Datenbank wurde erfolgreich gelöscht.",
"strapi.notification.success.languageDelete": "Die Sprache wurde erfolgreich entfernt.",
"strapi.notification.success.languageAdd": "Die Sprache wurde erfolgreich hinzugefügt.",

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

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

44
packages/strapi-plugin-upload/admin/src/translations/de.json
View File

@ -1,35 +1,35 @@
{
"ConfigPage.title": "Upload - Settings",
"ConfigPage.description": "Configure the upload plugin",
"ConfigPage.title": "Hochladen - Einstellungen",
"ConfigPage.description": "Konfiguriere das Hochladen-Plugin",
"EditForm.Input.number.label": "Maximum size allowed (in MB)",
"EditForm.Input.select.label": "Providers",
"EditForm.Input.select.inputDescription": "Files can either be uploaded on your server or on external providers.",
"EditForm.Input.toggle.label": "Enable file upload",
"EditForm.Input.number.label": "Maximal zulässige Größe (in MB)",
"EditForm.Input.select.label": "Anbieter",
"EditForm.Input.select.inputDescription": "Dateien können entweder auf deinem Server oder bei einem externe Anbieter hochgeladen werden.",
"EditForm.Input.toggle.label": "Datei -hinzufügen aktivieren",
"EmptyLi.message": "There are no uploaded files",
"EmptyLi.message": "Es gibt keine hochgeladenen Dateien",
"EntriesNumber.number": "{number} file found",
"EntriesNumber.number.plural": "{number} files found",
"EntriesNumber.number": "{number} Datei gefunden",
"EntriesNumber.number.plural": "{number} Dateien gefunden",
"HomePage.title": "Upload",
"HomePage.description": "Discover all the uploaded files",
"HomePage.InputSearch.placeholder": "Search for a file...",
"HomePage.title": "Hochladen",
"HomePage.description": "Übersicht über alle hochgeladenen Dateien",
"HomePage.InputSearch.placeholder": "Suche nach einer Datei...",
"Li.linkCopied": "Link copied into the clipboard",
"Li.linkCopied": "Link in die Zwischenablage kopiert",
"ListHeader.type": "Type",
"ListHeader.type": "Art",
"ListHeader.hash": "Hash",
"ListHeader.name": "Name",
"ListHeader.updated": "Updated",
"ListHeader.size": "Size",
"ListHeader.related": "Related to",
"ListHeader.updated": "Aktualisiert",
"ListHeader.size": "Größe",
"ListHeader.related": "Verbunden mit",
"PluginInputFile.text": "Drag & drop your files into this area or {link} from a file to upload",
"PluginInputFile.link": "browse",
"PluginInputFile.text": "Ziehe eine Datei hierher oder {link} eine Datei zum hochladen aus",
"PluginInputFile.link": "wähle",
"notification.delete.success": "The file has been deleted",
"notification.dropFile.success": "Your file has been uploaded",
"notification.dropFiles.success": "{number} files have been uploaded"
"notification.delete.success": "Die Datei wurde gelöscht",
"notification.dropFile.success": "Ihre Datei wurde hochgeladen",
"notification.dropFiles.success": "{number} Dateien wurden hochgeladen"
}

8
packages/strapi-plugin-upload/config/routes.json
View File

@ -40,6 +40,14 @@
"policies": []
}
},
{
"method": "GET",
"path": "/files/:_id",
"handler": "Upload.findOne",
"config": {
"policies": []
}
},
{
"method": "GET",
"path": "/files/count",

9
packages/strapi-plugin-upload/controllers/Upload.js
View File

@ -123,6 +123,15 @@ module.exports = {
}));
},
findOne: async (ctx) => {
const data = await strapi.plugins['upload'].services.upload.fetch(ctx.params);
data.url = strapi.config.url + data.url;
// Send 200 `ok`
ctx.send(data);
},
count: async (ctx, next) => {
const data = await strapi.plugins['upload'].services.upload.count(ctx.query);

6
packages/strapi-plugin-upload/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-upload",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.3",
"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.2",
"strapi-upload-local": "3.0.0-alpha.11.3",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.11.2"
"strapi-helper-plugin": "3.0.0-alpha.11.3"
},
"author": {
"name": "A Strapi developer",

6
packages/strapi-plugin-users-permissions/admin/src/translations/de.json
View File

@ -55,9 +55,9 @@
"Controller.input.label": "{label} ",
"Controller.selectAll": "Alle auswählen",
"EditForm.inputSelect.label.role": "Default role for authenticated users",
"EditForm.inputSelect.description.role": "It will attach the new authenticated user to the selected role.",
"EditForm.inputSelect.subscriptions.label": "Manage subscriptions quotas",
"EditForm.inputSelect.label.role": "Standardrolle für authentifizierte Benutzer",
"EditForm.inputSelect.description.role": "Es wird den neuen authentifizierten Benutzer an die ausgewählte Rolle anhängen.",
"EditForm.inputSelect.subscriptions.label": "Abonnementkontingente verwalten",
"EditForm.inputSelect.subscriptions.description": "Lege die Anzahl an subscriptions pro Stunde und IP fest.",
"EditForm.inputSelect.durations.label": "Dauer",
"EditForm.inputSelect.durations.description": "Anzahl Stunden, während derer eine Registration unmöglich ist.",

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

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.3",
"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.2"
"strapi-helper-plugin": "3.0.0-alpha.11.3"
},
"author": {
"name": "Strapi team",

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

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

2
packages/strapi-upload-aws-s3/package.json
View File

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

4
packages/strapi-upload-cloudinary/package.json
View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-cloudinary",
"version": "3.0.0-alpha.11.2",
"version": "3.0.0-alpha.11.3",
"description": "Cloudinary provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-upload-local/package.json
View File

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

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

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