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

Merge branch 'master' into enhance/input-json

Browse Source
This commit is contained in:
Jim LAURIE 2018-06-23 15:53:06 +02:00 committed by GitHub
commit 6af4a38986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -68,7 +68,7 @@ Halfway between a CMS and a framework, Strapi takes advantages of both worlds. A
## Support
For more information on the upcoming version, please take a look to our [ROADMAP](ROADMAP.md).
For more information on the upcoming version, please take a look to our [ROADMAP](https://github.com/strapi/strapi/projects).
### Community support
@ -86,7 +86,7 @@ For general help using Strapi, please refer to [the official Strapi documentatio
### Migration
Follow our [migration guides](https://strapi.io/documentation/migration/migration-guide.html) on the website to keep your Strapi projects updated.
Follow our [migration guides](https://github.com/strapi/strapi/wiki) on the wiki to keep your Strapi projects updated.
## License

109
ROADMAP.md
View File

@ -1,109 +0,0 @@
# Strapi Roadmap
***This is a living document, it describes what features we should implement in priority.***
This document could be influenced by the community feedback, security issues, stability, future needs, etc.
# Origins and purposes
Strapi is a project supported by a company called Strapi Solutions. The purpose of Strapi is to provide a powerful way to manage your content across devices through an API. Strapi does not intend to be a MVC framework. Strapi will stay a free and open-source backend project with an user interface to easily manage content.
Strapi aims to be a Content Management Framework. It lets developers hack and quickly develop custom business logic while keeping an administration interface to see what's is going on in the application. Strapi has been designed to build scalable moderns apps using a service-oriented architecture. Strapi will fit with any web project that requires an API.
For more details, [please read our blog](http://blog.strapi.io).
# ETA (v3)
### α alpha
**Expected release date: 20/12/2016**
**Note:** This version will not be ready for production use. However, we will publish it on npm to allow the community to test it and give us feedback.
`strapi@alpha.1`
* ~~Rewrite the entire project with ES6.~~
* ~~Move to Koa2. [(see current status)](https://github.com/strapi/strapi/issues/41).~~
* ~~Use Mongo as main database.~~
* ~~Use Joi as validation layer.~~
* ~~Load plugins.~~
* ~~Load external hooks.~~
* ~~Build dashboard layout using React.~~
* ~~Dynamic configuration values.~~
* ~~Handle internationalization (i18n).~~
[`strapi@alpha.2`](https://github.com/strapi/strapi/pull/176)
* ~~Ignore `node_modules` and `admin` folders when auto-reload is enabled.~~
* ~~Apply defaults configurations values on `strapi.config.hooks.xxx`.~~
* ~~Handle errors with Boom.~~
* ~~Allow CLI to generate an API into another API.~~
* ~~Use ESLint instead of xo.~~
* ~~Update databases configurations to allow different connectors.~~
`strapi@alpha.3`
_Reorganize the mono-repository. The rule to follow is to only have hooks without which Strapi cannot start or the CLI is unusable._
- ~~Move `strapi-settings-manager` to the main repository~~
- ~~Better handling for 404~~
- ~~Update the generated API's files with async/await pattern~~
`strapi@alpha.4`:
- ~~Improve `strapi-bookshelf` and `strapi-mongoose` adapters.~~
- ~~Improve the way we are injecting plugins into the dashboard.~~
- ~~Create plugin helper to share utils between plugins (`strapi-helper-plugin`).~~
- ~~Prototype the plugins queries process to be able to use different ORMs.~~
- ~~Prototype the CLI to create, install and uninstall plugins.~~
- ~~Ensure that we are compatible with Node 8.~~
`strapi@alpha.5`:
- ~~[Plugin] Settings Manager~~.
- ~~Update layout design~~.
- ~~Create a draft of the guidelines to follow of how to create a plugin~~.
- ~~Initialize the `docs` folder~~.
- ~~Synchronize the ORM adapters to set the same properties in the AST~~.
- ~~Rewrite the Strapi core to improve performances and startup time~~.
- ~~Freeze (make immutable) the AST~~.
- ~~Remove global variable `strapi` and use the module pattern instead~~.
- ~~Use Bootstrap v4@alpha.6~~.
- ~~Use i18n in the notifications messages~~.
- ~~Remove old/deprecated folders (test, website)~~.
- ~~Use Pino as logger~~.
`strapi@alpha.6` *(expected release date: 21/09/2017)*:
- ~~[Admin] Reduce number of steps to be able to contribute~~.
- ~~[Admin] Reduce bundle size by sharing commons dependencies~~.
- ~~[Admin] Update `strapi-helper-plugin` and `strapi-admin` dependencies to the latest version~~.
- ~~[Plugin] Content Manager~~.
- ~~[Plugin] Content Type Builder~~.
- ~~[Plugin] Finalize the query process to be able to use different ORMs~~.
- ~~[Plugin] Execute `bootstrap` function before mounting~~.
- ~~[Plugin] Execute `requirement` function to allow or not rendering~~.
- ~~[Framework] Support filters parameters~~.
- ~~Write new documentation~~.
`strapi@alpha.7` *(expected release date: 24/11/2017)*:
- ~~[Admin] Define push area into the plugins~~.
- ~~[Admin] Harmonise sharing components between plugins~~.
- ~~[Admin] `List plugins` page~~.
- ~~[Admin] Use latest available version of Bootstrap~~.
- ~~[Plugin] Email~~.
- ~~[Plugin] Users & groups (with full authentication process)~~.
- ~~Improve generated APIs (especially the relation part)~~.
`strapi@alpha.8` *(expected release date: 22/12/2017)*:
- ~~[Admin] Install plugins directly from the interface~~.
- ~~Ask database settings during the project creation~~.
- ~~Ping database before generating the project~~.
- ~~Allow associations between app's models and plugins' models~~.
`strapi@alpha.9` *(expected release date: 12/01/2018)*:
- ~~[Plugin] Analytics (homepage only)~~.
- ~~[Plugin - Users & Permissions] Integrate providers authentication, email templates and advanced settings~~.
`strapi@alpha.10` *(expected release date: 15/02/2018)*:
- ~~[Framework] New core API to manage settings in database~~.
- ~~[Admin] Refactor the Input component to make it more extensible~~.
`strapi@alpha.11` *(expected release date: 09/03/2018)*:
- ~~[Plugin] Upload~~.
Please read our blog to be aware of the roadmap updates:
- [Roadmap Update #1 - File Upload, Rich Text Editor, GraphQL](https://blog.strapi.io/roadmap-update-1-upload-rich-text-editor-graphql/)

4
docs/3.x.x/en/guides/models.md
View File

@ -334,10 +334,10 @@ module.exports = {
### Polymorphic
Refer to the [polymorphic concept](../concepts/concepts.md#polymorphic) for more informations.
The polymorphic relationships are the solution when you don't know which kind of model will be associated to your entry. A common use case is an `Image` model that can be associated to many others kind of models (Article, Product, User, etc).
Refer to the [upload plugin](./upload.md) polymorphic implementation for more informations.
#### Single vs Many
Let's stay with our `Image` model which might belongs to **a single `Article` or `Product` entry**.

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

@ -69,9 +69,9 @@ module.exports = function (strapi) {
connectOptions.authSource = authenticationDatabase;
}
connectOptions.ssl = Boolean(ssl);
connectOptions.ssl = ssl === true || ssl === 'true';
options.debug = Boolean(debug);
options.debug = debug === true || debug === 'true';
instance.connect(uri || `mongodb://${host}:${port}/${database}`, connectOptions);