9424 Commits

Author SHA1 Message Date
cyril lopez
087226b5e4
Merge branch 'master' into styled-components/email 2019-09-12 17:41:05 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Jim LAURIE
3a50178e46
Merge pull request #3907 from davidkartuzinski/docs/tutorial
Documentation Getting Started Tutorial
2019-09-12 11:37:43 +02:00
Alexandre Bodin
6ec284180a sanitize user model data 2019-09-12 10:50:52 +02:00
David Kartuzinski
e0e71a00cd
Merge branch 'master' into docs/tutorial 2019-09-12 10:17:02 +02:00
davidkartuzinski
75c1e93308 Added video, fixed a typo 2019-09-12 10:13:28 +02:00
Alexandre Bodin
e20d781383 Merge branch 'master' into chore/routing-x-forwarded 2019-09-12 09:59:11 +02:00
Alexandre BODIN
b4bb345d23
Merge pull request #3720 from daksamit/issue/3719
Update default configuration access in hook
2019-09-12 09:53:55 +02:00
Jim LAURIE
dcb333ac6b
Merge branch 'master' into issue/3719 2019-09-12 09:52:16 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
Alexandre BODIN
1d4985d8b4
Merge pull request #3963 from strapi/fix/image-multi
Fix image multi upload old relations deleting
2019-09-11 19:21:04 +02:00
soupette
2077e3d782 Fix PR feedback 2019-09-11 18:56:37 +02:00
Alexandre BODIN
bdea8bd887
Merge branch 'master' into fix/image-multi 2019-09-11 16:49:31 +02:00
Alexandre BODIN
0b046252be
Merge pull request #3964 from websocket98765/patch-2
Fix documentation typo
2019-09-11 16:49:22 +02:00
websocket98765
1bab694c67
Fix typo 2019-09-11 14:44:22 +00:00
Alexandre BODIN
f204c42b18
Merge pull request #3961 from rmaroun/mongodb4.0.x-using-mongoose5.7.0
Connect to mongo db 4.0.x using mongoose 5.7.0
2019-09-11 16:38:25 +02:00
Alexandre Bodin
2d65ebeade Fix multi image upload deleting old links 2019-09-11 16:07:30 +02:00
Ralph
1bae7943fa
Connect to mongo db 4.0.x using mongoose 5.7.0
Added support for connection setting useUnifiedTopology so it can be positioned via the database.json file in strapi project. By default it is positioned to false.
If this is not set and you are connecting to a mongo db v4.0.x using the beta-16.1 and higher version of the strapi-hook-mongoose you will get the following warning message when starting the strapi server:
DeprecationWarning: current Server Discovery and Monitoring engine is
deprecated, and will be removed in a future version. To use the new Server
Discover and Monitoring engine, pass option { useUnifiedTopology: true } to
the MongoClient constructor.
2019-09-11 15:37:42 +02:00
Alexandre Bodin
836920b4f8 Add images relation to restaurants example 2019-09-11 13:17:22 +02:00
soupette
4141ec03a8 Migrate plugin to styled compo 2019-09-11 11:19:30 +02:00
soupette
19a4ce038c Merge branch 'styled-components/upload' of github.com:strapi/strapi into styled-components/email 2019-09-11 11:17:53 +02:00
soupette
91d33163d2 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 11:17:24 +02:00
soupette
f08acf88f1 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 11:02:57 +02:00
soupette
ce2575151e Migrate plugin to styled compo 2019-09-11 11:00:40 +02:00
Alexandre BODIN
dc02ba67e3
Merge pull request #3950 from strapi/chore/update-documentation-plugin-groups
Chore/update documentation plugin groups
2019-09-11 10:54:58 +02:00
Alexandre BODIN
8299cff8aa
Merge branch 'master' into chore/update-documentation-plugin-groups 2019-09-11 10:54:51 +02:00
Alexandre BODIN
ae4bfb8233
Merge pull request #3924 from davidkartuzinski/docs/quickstart
Update Strapi Quickstart
2019-09-11 10:42:19 +02:00
Alexandre BODIN
230a7145af
Merge branch 'master' into docs/quickstart 2019-09-11 10:41:15 +02:00
Virginie Ky
c21f9272f6 media border 2019-09-11 10:36:27 +02:00
davidkartuzinski
3ec29bfa83 fixed some returns 2019-09-11 10:34:16 +02:00
davidkartuzinski
fa60a78bf1 Added new video of Quick Start 2019-09-11 10:19:48 +02:00
soupette
ff184ec200 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 10:19:22 +02:00
Alexandre BODIN
b3e7d27b62
Merge branch 'master' into chore/update-documentation-plugin-groups 2019-09-11 10:11:18 +02:00
Virginie Ky
395f82a128 PR feedbacks 2019-09-11 10:07:25 +02:00
jasongitmail
1b247554fe
Update InputNumberWithErrors to default to step="any" 2019-09-10 21:19:59 +00:00
cyril lopez
60a1e435b7
Merge pull request #3929 from strapi/front/auth-views
Move authentication in strapi-admin
2019-09-10 23:19:18 +02:00
jasongitmail
861d5d111a
Update InputNumber to default to step="any" 2019-09-10 21:17:03 +00:00
soupette
a8dae57806 Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 17:52:20 +02:00
soupette
535467be3c Fix PR feedback 2019-09-10 17:51:26 +02:00
soupette
93941e3d11 Delete useless container 2019-09-10 17:32:46 +02:00
Alexandre Bodin
32b8e4174b Fix json type and add groups 2019-09-10 16:54:50 +02:00
Alexandre Bodin
e07d83a89b Add richtext 2019-09-10 16:54:50 +02:00
Daniel Kvistgaard
e6e96dcc3a
Merge branch 'master' into bugfix/cloudinary-delete-resource-type 2019-09-10 16:52:44 +02:00
soupette
0289a7a3d3 Start removing sass in upload components 2019-09-10 16:34:43 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
Alexandre BODIN
a56ed83ed3
Merge pull request #3896 from binggg/patch-1
Add missing zh-Hans translations
2019-09-10 16:31:49 +02:00
Alexandre BODIN
86ee6a5170
Merge branch 'master' into patch-1 2019-09-10 16:31:42 +02:00
Alexandre BODIN
7e9adb789f
Merge branch 'master' into eslint-update 2019-09-10 16:29:46 +02:00
Alexandre BODIN
0964555be7
Merge pull request #3949 from strapi/fix/core-multi-origin
Allow multiple origins to be provided to the cors middleware
2019-09-10 16:27:14 +02:00
Alexandre BODIN
f2b354feb7
Merge branch 'master' into fix/core-multi-origin 2019-09-10 16:27:06 +02:00