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

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Jim LAURIE 2018-05-08 12:10:40 +02:00 committed by GitHub
commit a9f9b6f428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 243 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/3.x.x/en/configurations/configurations.md
View File

@ -196,7 +196,11 @@ Most of the application's configurations are defined by environment. It means th
"username": "fooUsername",
"password": "fooPwd"
},
"options": {}
"options": {
"authenticationDatabase": "",
"ssl": true,
"minimize": true
}
},
"postgres": {
"connector": "strapi-bookshelf",
@ -209,7 +213,9 @@ Most of the application's configurations are defined by environment. It means th
"database": "${process.env.PWD}",
"schema": "public"
},
"options": {}
"options": {
"debug": true
}
},
"mysql": {
"connector": "strapi-bookshelf",
@ -240,6 +246,9 @@ Most of the application's configurations are defined by environment. It means th
> Please refer to the [dynamic configurations section](#dynamic-configurations) to use global environment variable to configure the databases.
***
## Request

2
packages/strapi-admin/.npmignore
View File

@ -75,6 +75,8 @@ $RECYCLE.BIN/
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

1
packages/strapi-mongoose/lib/index.js
View File

@ -178,6 +178,7 @@ module.exports = function (strapi) {
});
collection.schema.set('timestamps', _.get(definition, 'options.timestamps') === true);
collection.schema.set('minimize', _.get(definition, 'options.minimize', false) === true);
collection.schema.options.toObject = collection.schema.options.toJSON = {
virtuals: true,

2
packages/strapi-plugin-content-manager/.npmignore
View File

@ -75,6 +75,8 @@ $RECYCLE.BIN/
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

2
packages/strapi-plugin-content-type-builder/.npmignore
View File

@ -75,6 +75,8 @@ $RECYCLE.BIN/
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

2
packages/strapi-plugin-email/.npmignore
View File

@ -75,6 +75,8 @@ $RECYCLE.BIN/
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

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

@ -19,8 +19,7 @@
"generate": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/plop --plopfile ./node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
"lint": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/eslint --ignore-path .gitignore --ignore-pattern '/admin/build/' --config ./node_modules/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json admin",
"prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
"test": "npm run lint",
"prepublishOnly": "npm run build"
"test": "npm run lint"
},
"dependencies": {
"sendmail": "^1.2.0"

2
packages/strapi-plugin-graphql/.npmignore
View File

@ -75,6 +75,8 @@ $RECYCLE.BIN/
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

2
packages/strapi-plugin-settings-manager/.npmignore
View File

@ -75,6 +75,8 @@ $RECYCLE.BIN/
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

103
packages/strapi-plugin-upload/.npmignore Normal file
View File

@ -0,0 +1,103 @@
############################
# OS X
############################
.DS_Store
.AppleDouble
.LSOverride
Icon
.Spotlight-V100
.Trashes
._*
############################
# Linux
############################
*~
############################
# Windows
############################
Thumbs.db
ehthumbs.db
Desktop.ini
$RECYCLE.BIN/
*.cab
*.msi
*.msm
*.msp
############################
# Packages
############################
*.7z
*.csv
*.dat
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.com
*.class
*.dll
*.exe
*.o
*.seed
*.so
*.swo
*.swp
*.swn
*.swm
*.out
*.pid
############################
# Logs and databases
############################
*.log
*.sql
############################
# Misc.
############################
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject
############################
# Node.js
############################
lib-cov
lcov.info
pids
logs
results
node_modules
.node_history
############################
# Tests
############################
test
testApp
coverage

2
packages/strapi-plugin-users-permissions/.npmignore
View File

@ -75,6 +75,8 @@ $RECYCLE.BIN/
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

3
packages/strapi-upload-aws-s3/.npmignore
View File

@ -76,6 +76,9 @@ $RECYCLE.BIN/
############################
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

104
packages/strapi-upload-cloudinary/.npmignore Normal file
View File

@ -0,0 +1,104 @@
############################
# OS X
############################
.DS_Store
.AppleDouble
.LSOverride
Icon
.Spotlight-V100
.Trashes
._*
############################
# Linux
############################
*~
############################
# Windows
############################
Thumbs.db
ehthumbs.db
Desktop.ini
$RECYCLE.BIN/
*.cab
*.msi
*.msm
*.msp
############################
# Packages
############################
*.7z
*.csv
*.dat
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.com
*.class
*.dll
*.exe
*.o
*.seed
*.so
*.swo
*.swp
*.swn
*.swm
*.out
*.pid
############################
# Logs and databases
############################
.tmp
*.log
*.sql
*.sqlite
############################
# Misc.
############################
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject
############################
# Node.js
############################
lib-cov
lcov.info
pids
logs
results
build
node_modules
.node_history
############################
# Tests
############################
test

3
packages/strapi-upload-local/.npmignore
View File

@ -76,6 +76,9 @@ $RECYCLE.BIN/
############################
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject

3
packages/strapi-upload-rackspace/.npmignore
View File

@ -76,6 +76,9 @@ $RECYCLE.BIN/
############################
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject