Fix conflict

Author: lauriejim

.editorconfig

@@ -1,18 +1,22 @@
 <!-- ⚠️ If you do not respect this template your issue will be closed. -->
 
-<!-- ISSUE TEMPLATE -->
+<!-- =============================================================================== -->
+<!-- ⚠️ If you are not using the current Strapi release, you will be asked to update. -->
+<!-- Please see the wiki for guides on upgrading to the latest release. -->
+<!-- =============================================================================== -->
+
+<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->
 
 <!-- ⚠️ Before writing your issue make sure you are using:-->
-<!-- Node 9.x.x -->
-<!-- npm 5.x.x -->
-<!-- The latest version of Strapi. -->
+<!-- Node 10.x.x -->
+<!-- npm 6.x.x -->
 
 **Informations**
-- **Node.js version**:
-- **npm version**:
-- **Strapi version**:
-- **Database**:
-- **Operating system**:
+- **Node.js version**: 
+- **npm version**: 
+- **Strapi version**: <!-- Please make sure you are on the latest version -->
+- **Database**: 
+- **Operating system**: 
 
 
 **What is the current behavior?**
@@ -28,19 +32,3 @@
 
 
 **Suggested solutions**
-
-
-
-<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->
-
-
-
-<!-- FEATURE REQUEST TEMPLATE -->
-
-<!-- ⚠️ If you do not respect this template your issue will be closed. -->
-
-**What is the expected behavior?**
-
-
-
-<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->

.eslintignore

@@ -5,17 +5,24 @@ about: Create a report to help us improve 🤔.
 
 <!-- ⚠️ If you do not respect this template your issue will be closed. -->
 
+<!-- =============================================================================== -->
+<!-- ⚠️ If you are not using the current Strapi release, you will be asked to update. -->
+<!-- Please see the wiki for guides on upgrading to the latest release. -->
+<!-- =============================================================================== -->
+
+<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->
+
 <!-- ⚠️ Before writing your issue make sure you are using:-->
-<!-- Node 9.x.x -->
-<!-- npm 5.x.x -->
+<!-- Node 10.x.x -->
+<!-- npm 6.x.x -->
 <!-- The latest version of Strapi. -->
 
 **Informations**
-- **Node.js version**:
-- **npm version**:
-- **Strapi version**:
-- **Database**:
-- **Operating system**:
+- **Node.js version**: 
+- **npm version**: 
+- **Strapi version**: <!-- Please make sure you are on the latest version -->
+- **Database**: 
+- **Operating system**: 
 
 
 **What is the current behavior?**
@@ -31,7 +38,3 @@ about: Create a report to help us improve 🤔.
 
 
 **Suggested solutions**
-
-
-
-<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->

.eslintrc

@@ -5,8 +5,8 @@ about: Suggest an idea for this project 💡!
 
 <!-- ⚠️ If you do not respect this template your issue will be closed. -->
 
-**What is the expected behavior?**
+<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->
 
+**What is the expected behavior?**
 
 
-<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->

.gitattributes

@@ -21,11 +21,11 @@ Every user can send a feature request using the [issues](https://github.com/stra
 ## Repository Organization
 We made the choice to use a monorepo design such as [React](https://github.com/facebook/react/tree/master/packages), [Babel](https://github.com/babel/babel/tree/master/packages), [Meteor](https://github.com/meteor/meteor/tree/devel/packages) or [Ember](https://github.com/emberjs/ember.js/tree/master/packages) do. It allows the community to easily maintain the whole ecosystem up-to-date and consistent.
 
-The Babel team wrotes an excellent short post about [the pros and cons of the monorepo design](https://github.com/babel/babel/blob/master/doc/design/monorepo.md).
+The Babel team wrote an excellent short post about [the pros and cons of the monorepo design](https://github.com/babel/babel/blob/master/doc/design/monorepo.md).
 
-We will do our best to keep the master branch clean as possible, with tests passing all the times. However, it can happen that the master branch moves faster than the release cycle. To ensure to use the latest stable version, please refers to the [release on npm](https://www.npmjs.com/package/strapi).
+We will do our best to keep the master branch as clean as possible, with tests passing all the times. However, it can happen that the master branch moves faster than the release cycle. To ensure you have the latest stable version, please refer to the [release on npm](https://www.npmjs.com/package/strapi).
 
-If you send a pull request, please do it again the `master` branch. We are developing upcoming versions separately to ensure non-breaking changes from master to the latest stable major version.
+If you send a pull request, please do it against the `master` branch. We are developing upcoming versions separately to ensure non-breaking changes from master to the latest stable major version.
 
 ***
 
@@ -38,22 +38,22 @@ Then, please follow the instructions below:
 
 [Go to the repository](https://github.com/strapi/strapi) and fork it to your own GitHub account.
 
-#### 2. 💿 Clone the repository
+#### 2. 💿 Clone from your repository
 
 ```bash
-git clone [email protected]:strapi/strapi.git
+git clone [email protected]:YOUR_USERNAME/strapi.git
 ```
 
 #### 3. ⏳ Installation
- 
+
 Go to the root of the repository.
 ```bash
 cd strapi
 ```
 
 **Two setup are available... with or without the front-end builds.**
 
-Without the front-end builds, you won't be able to access to the administration panel via http://localhost:1337/admin, you'll have to run the administration separately and access it through http://localhost:4000/admin.
+Without the front-end builds, you won't be able to access the administration panel via http://localhost:1337/admin. You'll have to run the administration separately and access it through http://localhost:4000/admin.
 
 <br>
 

.github/ISSUE_TEMPLATE.md

@@ -80,16 +80,21 @@ strapi start
 
 Congratulations, you made it! Enjoy 🎉
 
-<br>
+### Try on Heroku
 
-You can also give it a try using Heroku! Be aware that one of the content type builder won't work due to the writing files restriction on the Heroku servers. 
+You can also give it a try using Heroku in one click!
 
 <a href="https://heroku.com/deploy?template=https://github.com/strapi/strapi-heroku-app">
   <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
 </a>
 
-<br>
+Be aware that one of the content type builder won't work due to the writing files restriction on the Heroku servers. If you do want to change content types, you need to follow these steps:
 
+1. Click the button above and deploy your app
+2. Clone that repo by using `heroku git:clone -a ` followed by your repo's name
+3. Go into the cloned projects' folder using `cd` followed by your repo's name
+4. Add the Heroku boilerplate as a remote by running `git remote add boilerplate https://github.com/strapi/strapi-heroku-app`
+5. Pull from this new origin by running `git pull boilerplate master`
 
 ## Features
 

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -12,10 +12,10 @@ The most advanced open-source Content Management Framework to build powerful API
 <!-- {p:.flex.justify-around} -->
 :::
 
-## v3@alpha.13 is available!
+## v3@alpha.14.2 is available!
 We've been working on a major update for Strapi during the past months, rewriting the core framework and the dashboard.
 
-This documentation is only related to Strapi v3@alpha.13 ([v1 documentation is still available](http://strapi.io/documentation/1.x.x)).
+This documentation is only related to Strapi v3@alpha.14.2 ([v1 documentation is still available](http://strapi.io/documentation/1.x.x)).
 
 **[Get Started](getting-started/installation.md)**<br />
 Learn how to install Strapi and start developing your API.

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -94,7 +94,7 @@ The controllers are defined in each `./api/**/controllers/` folders. Every JavaS
 
 ## Filters
 
-Filters are a handy way to request data according to generic parameters. It makes filtering, sorting and paginating easy and reusable (eg. `GET /user?_limit=30&name=John`).
+Filters are a handy way to request data according to generic parameters. It makes filtering, sorting and paginating easy and reusable (eg. `GET /users?_limit=30&name=John`).
 
 > Please refer to the [filters' guide](../guides/filters.md) for more informations.
 

.gitignore

@@ -169,13 +169,8 @@ You can access the config of the current environment through `strapi.config.curr
  - `connections` List of all available connections.
    - `default`
      - `connector` (string): Connector used by the current connection. Default value: `strapi-hook-mongoose`.
-     - `client` (string): Client used to store session. Default value: `cookie`.
-     - `key` (string): Cookie key name. Default value: `strapi.sid`
-     - `maxAge` (integer): Time in milliseconds before the session expire. Default value: `86400000`.
-     - `rolling` (boolean): Force a session identifier cookie to be set on every response. Default value: `false`.
-     - `signed` (boolean): httpOnly or not. Default value: `true`.
-     - `overwrite` (boolean): Can overwrite or not. Default value: `true`.
      - `settings` Useful for external session stores such as Redis.
+       - `client` (string): Database client to create the connection. Default value: `mongo`.
        - `host` (string): Database host name. Default value: `localhost`.
        - `port` (integer): Database port. Default value: `27017`.
        - `database` (string): Database name. Default value: `development`.
@@ -255,6 +250,33 @@ You can access the config of the current environment through `strapi.config.curr
 
 > Please refer to the [dynamic configurations section](#dynamic-configurations) to use global environment variable to configure the databases.
 
+#### MLab Example
+
+**Path —** `./config/environments/**/database.json`.
+```json
+{
+  "defaultConnection": "default",
+  "connections": {
+    "default": {
+      "connector": "strapi-hook-mongoose",
+      "settings": {
+        "client": "mongo",
+        "host": "ds123456.mlab.com",
+        "port": 12345,
+        "database": "mlab_db_name",
+        "username": "mlab_user_name",
+        "password": "mlab_pass"
+      },
+      "options": {
+        "authenticationDatabase": "mlab_db_name",
+        "ssl": false
+      }
+    }
+  }
+}
+```
+
+> Please note that you must give your MLab database name as the authenticationDatabase and your password can not contain the "@" symbol.
 
 
 
@@ -279,8 +301,6 @@ You can access the config of the current environment through `strapi.config.curr
  - `parser`
   - `enabled`(boolean): Enable or disable parser. Default value: `true`.
   - `multipart` (boolean): Enable or disable multipart bodies parsing. Default value: `true`.
- - `router`
-  - `prefix` (string): API url prefix (eg. `/v1`).
 
 ::: note
 The session doesn't work with `mongo` as a client. The package that we should use is broken for now.
@@ -341,10 +361,18 @@ The session doesn't work with `mongo` as a client. The package that we should us
 
  - `host` (string): Host name. Default value: `localhost`.
  - `port` (integer): Port on which the server should be running. Default value: `1337`.
- - `autoReload` (boolean): Enable or disabled server reload on files update. Default value: depends on the environment.
+ - `autoReload`
+   - `enabled` (boolean): Enable or disabled server reload on files update. Default value: depends on the environment.
+ - `emitErrors` (boolean): Enable errors to be emited to `koa` when they happen in order to attach custom logic or use error reporting services.
+ - `proxy`
+  - `enabled` (boolean): Enable proxy support such as Apache or Nginx. Default value: `false`.
+  - `ssl` (boolean): Enable proxy SSL support
+  - `host` (string): Host name your proxy service uses for Strapi.
+  - `port` (integer): Port that your proxy service accepts connections on.
  - [`cron`](https://en.wikipedia.org/wiki/Cron)
   - `enabled` (boolean): Enable or disable CRON tasks to schedule jobs at specific dates. Default value: `false`.
  - `admin`
+  - `autoOpen` (boolean): Enable or disabled administration opening on start (default: `true`)
   - `path` (string): Allow to change the URL to access the admin (default: `/admin`).
   - `build`
     - `host` (string): URL to access the admin panel (default: `http://localhost:1337/admin`).
@@ -353,6 +381,33 @@ The session doesn't work with `mongo` as a client. The package that we should us
         - `source` (string): Define the source mode (origin, host, custom).
         - `folder` (string): Indicate what the plugins folder in `host` source mode.
 
+#### Example
+
+**Path —** `./config/environments/**/server.json`.
+
+As an example using this configuration with Nginx your server would respond to `https://example.com:8443` instead of `http://localhost:1337`
+
+**Note:** you will need to configure Nginx or Apache as a proxy before configuring this example.
+
+```json
+{
+  "host": "localhost",
+  "port": 1337,
+  "proxy": {
+    "enabled": true,
+    "ssl": true,
+    "host": "example.com",
+    "port": 8443
+  },
+  "autoReload": {
+    "enabled": true
+  },
+  "cron": {
+    "enabled": true
+  }
+}
+```
+
 ***
 
 ## Dynamic configurations

.travis.yml

@@ -5,8 +5,13 @@ Installation is very easy and only takes a few seconds.
 ## Requirements
 
 Please make sure your computer/server meets the following requirements:
- - [Node.js](https://nodejs.org) >= 9: Node.js is a server platform which runs JavaScript. Installation guide [here](https://nodejs.org/en/download/).
- - [MongoDB](https://www.mongodb.com/) >= 2.6: MongoDB is a powerful document store. Installation guide [here](https://www.mongodb.com/download-center?j#community).
+ - [Node.js](https://nodejs.org) >= 10.x: Node.js is a server platform which runs JavaScript. Installation guide [here](https://nodejs.org/en/download/).
+ - [NPM](https://www.npmjs.com/) >= 6.x: NPM is the package manager for Javascript. Installation guide [here](https://nodejs.org/en/download/).
+*(Make sure the database that you are using meets the requirement.)*
+ - [MongoDB](https://www.mongodb.com/) >= 3.x: MongoDB is a powerful document store. Installation guide [here](https://www.mongodb.com/download-center?j#community).
+ - [MySQL](https://www.mysql.com/) >= 5.6: MySQL is an open-source relational database management system. Installation guide [here](https://dev.mysql.com/downloads/).
+ - [MariaDB](https://mariadb.org/) >= 10.1: MarialDB is a fork of MySQL and is guaranteed to stay open source. Installation guide [here](https://mariadb.org/download/).
+ - [PostgreSQL](https://www.postgresql.org/) >= 10: PostgreSQL is an open-source object-relational database management system. Installation guide [here](https://www.postgresql.org/download/).
 
 ## Setup
 

CONTRIBUTING.md

@@ -136,16 +136,16 @@ In order to do so, you'll need to allow access to other users (identified as 'Gu
 
 ### List entries (GET)
 
-To retrieve the list of products, use the `GET /your-content-type` route.
+To retrieve the list of products, use the `GET /products` route.
 
-Generated APIs provide a handy way to filter and order queries. In that way, ordering products by price is as easy as `GET http://localhost:1337/product?_sort=price:asc`. For more informations, read the [filters documentation](../guides/filters.md)
+Generated APIs provide a handy way to filter and order queries. In that way, ordering products by price is as easy as `GET http://localhost:1337/products?_sort=price:asc`. For more informations, read the [filters documentation](../guides/filters.md)
 
 Here is an example using jQuery.
 
 ```js
 $.ajax({
   type: 'GET',
-  url: 'http://localhost:1337/product?_sort=price:asc', // Order by price.
+  url: 'http://localhost:1337/products?_sort=price:asc', // Order by price.
   done: function(products) {
     console.log('Well done, here is the list of products: ', products);
   },
@@ -162,7 +162,7 @@ If you want to get a specific entry, add the `id` of the wanted product at the e
 ```js
 $.ajax({
   type: 'GET',
-  url: 'http://localhost:1337/product/123', // Where `123` is the `id` of the product.
+  url: 'http://localhost:1337/products/123', // Where `123` is the `id` of the product.
   done: function(product) {
     console.log('Well done, here is the product having the `id` 123: ', product);
   },
@@ -181,7 +181,7 @@ jQuery example:
 ```js
 $.ajax({
   type: 'POST',
-  url: 'http://localhost:1337/product',
+  url: 'http://localhost:1337/products',
   data: {
     name: 'Cheese cake',
     description: 'Chocolate cheese cake with ice cream',
@@ -205,7 +205,7 @@ jQuery example:
 ```js
 $.ajax({
   type: 'PUT',
-  url: 'http://localhost:1337/product/123', // Where `123` is the `id` of the product.
+  url: 'http://localhost:1337/products/123', // Where `123` is the `id` of the product.
   data: {
     description: 'This is the new description'
   },
@@ -227,7 +227,7 @@ jQuery example:
 ```js
 $.ajax({
   type: 'DELETE',
-  url: 'http://localhost:1337/product/123', // Where `123` is the `id` of the product.
+  url: 'http://localhost:1337/products/123', // Where `123` is the `id` of the product.
   done: function(product) {
     console.log('Congrats, your product has been successfully deleted: ', product);
   },