mirror of
https://github.com/strapi/strapi.git
synced 2025-10-17 11:08:14 +00:00
Resolve conflicts
This commit is contained in:
parent
d5c964f539
commit
e025ef3813
31
README.md
31
README.md
@ -19,24 +19,24 @@
|
||||
|
||||
<br>
|
||||
|
||||

|
||||
<p align="center"><img src="http://blog.strapi.io/content/images/2017/07/preview-readme-9.png" /></p>
|
||||
|
||||
<br>
|
||||
|
||||
## Quick start
|
||||
|
||||
We've been working on a major update to Strapi for several months now, rewriting the core framework and the administration panel. Performances has been increased, Developer eXperience has been improved and a brand new plugins
|
||||
ecosystem has been introduced. Both versions are available, we recommend v1 for production use.
|
||||
ecosystem has been introduced. **Both versions are available, we still recommend you to use v1 for production usage.**.
|
||||
|
||||
#### Alpha
|
||||
|
||||
The alpha has support for the latest version of Node.js (v8) and is going to be ready for production for the end of the year.
|
||||
The alpha has support for the latest version of Node.js (v8) and npm (v5).
|
||||
```bash
|
||||
npm install strapi@alpha -g
|
||||
```
|
||||
|
||||
#### Stable
|
||||
This is the stable version of Strapi (v1). However, the migration to v3 will not be easy due to many breaking changes.
|
||||
This is the production-ready version of Strapi (v1). You should also consider that the migration to v3 will not be easy due to many breaking changes.
|
||||
```bash
|
||||
npm install strapi -g
|
||||
```
|
||||
@ -45,23 +45,14 @@ Read the [Getting started](http://strapi.io/documentation#getting-started) page
|
||||
|
||||
## Features
|
||||
|
||||
- **Modern Admin Panel:** Elegant, entirely customizable and fully extensible admin panel.
|
||||
- **Secure by default:** Several security layers included: reusable policies, CSRF, CORS, P3P, Xframe, XSS, and more.
|
||||
- **Plugins Oriented:** Extensible plugins system included. Install auth system, content management, custom plugins, and more, in seconds.
|
||||
- **Blazing Fast:** Built on top of Node.js platform, Strapi delivers amazing performances. Offer the high speed to your API.
|
||||
- **Front-end Agnostic:** Use any front-end strategy: frameworks (React, Vue, Angular, etc.), third parties, mobile apps or even IoT.
|
||||
- **Modern Admin Panel:**
|
||||
Elegant, entirely customizable and fully extensible admin panel.
|
||||
- **Secure by default:** Reusable policies, CSRF, CORS, P3P, Xframe, XSS, and more.
|
||||
- **Plugins Oriented:** Install auth system, content management, custom plugins, and more, in seconds.
|
||||
- **Blazing Fast:** Built on top of Node.js, Strapi delivers amazing performances.
|
||||
- **Front-end Agnostic:** Use any front-end frameworks (React, Vue, Angular, etc.), mobile apps or even IoT.
|
||||
- **Powerful CLI:** Scaffold projects and APIs on the fly.
|
||||
- **SQL & NoSQL databases:** Work with Mongo as a main database but also supports Postgres, MySQL, etc.
|
||||
|
||||
## Should I use v3 or v1?
|
||||
We've been working on a major update to Strapi for several months now, rewriting the core framework and the administration panel. Performances has been increased, Developer eXperience has been improved and a brand new plugins
|
||||
ecosystem has been introduced.
|
||||
|
||||
The v3 is not ready for production use yet. However, if you're planning to build a new project, we recommend to start using the latest version available (v3). There will be minor changes and the migration time will be lower than migrating from v1 to v3.
|
||||
|
||||
For more information on the upcoming version, please take a look to our [ROADMAP](ROADMAP.md).
|
||||
|
||||

|
||||
- **SQL & NoSQL databases:** Work with Mongo as a main database, also supports Postgres, MySQL, etc.
|
||||
|
||||
## Philosophy ?
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user