6553 Commits

Author SHA1 Message Date
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
soupette
4141ec03a8 Migrate plugin to styled compo 2019-09-11 11:19:30 +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
ce2575151e Migrate plugin to styled compo 2019-09-11 11:00:40 +02:00
Virginie Ky
c21f9272f6 media border 2019-09-11 10:36:27 +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
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 2019-09-10 16:33:22 +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
f2b354feb7
Merge branch 'master' into fix/core-multi-origin 2019-09-10 16:27:06 +02:00
Daniel Kvistgaard
96345d9f38 Merge remote-tracking branch 'upstream/master' into bugfix/cloudinary-delete-resource-type 2019-09-10 16:04:02 +02:00
Alexandre Bodin
522014cf3d Allow multiple origins to be provided to the cors middleware, array or coma separated 2019-09-10 15:46:07 +02:00
Alexandre Bodin
c23c2583ab Make sure the relation update is done in a transaction with simple default create and update 2019-09-10 14:47:18 +02:00
Alexandre Bodin
5a4b24a636 Fix permission deletion deleting only on role permission on controller delete 2019-09-10 14:47:18 +02:00
soupette
61a22c3a9b Fixes #3677 2019-09-10 12:33:21 +02:00
soupette
55ea54608d Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 12:19:54 +02:00
soupette
869cde8f19 Fix rerender issue in the admin 2019-09-10 12:14:07 +02:00
Alexandre Bodin
25bf0e4ca8 Use kind when provided on morph relation 2019-09-10 11:05:57 +02:00
soupette
c5fd30e314 Fix WYSIWYG preview 2019-09-10 10:39:57 +02:00
soupette
1e26065d95 Clean code and fix tests 2019-09-10 10:37:02 +02:00
赵兵
a462fab945 Merge remote-tracking branch 'upstream/master' into patch-1 2019-09-10 16:14:38 +08:00
soupette
b7b8e368a2 Fixes #3942 2019-09-10 09:06:26 +02:00
Peter Zhao
b3a6ad4f23
Add zh-Hans translations of new feature 2019-09-10 14:29:03 +08:00
websocket98765
71b2993f33
Fix typo in en.json
Fixs `Make you sure you understand` to `Make sure you understand`.
2019-09-09 22:29:02 +00:00
sheva
2462958aff Updating bookshelf after merge v.3.0.0-beta.16 2019-09-09 22:16:01 +02:00
sheva
23b4b91fe3 Merge branch 'master' into fix/3874-bookshelf-unicode-fix
# Conflicts:
#	packages/strapi/lib/core-api/queries/bookshelf.js
2019-09-09 21:29:53 +02:00
soupette
b3bc4a0941 Remove willSecure and didGetSecured data hooks 2019-09-09 18:44:41 +02:00
Alexandre BODIN
32d3df8fbb
Merge branch 'master' into front/qa 2019-09-09 17:46:59 +02:00
soupette
76560a1c9c Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-09 17:29:47 +02:00
Virginie Ky
01045a5a1b content manager update field infos on editview UI fix 2019-09-09 17:23:56 +02:00
soupette
8485657342 Move global data to the app container and update plugins 2019-09-09 17:12:01 +02:00
Virginie Ky
a60f1d1ba0 qa fixes 2019-09-09 16:56:46 +02:00
Alexandre BODIN
67478ffdd7
Merge branch 'master' into eslint-update 2019-09-09 16:51:51 +02:00
Abdón Rodríguez Davila
d4b72a958c Merge branch 'master' into eslint-update
# Conflicts:
#	yarn.lock
2019-09-09 16:45:56 +02:00
soupette
22bf28431f Use global props instead of admin s ones 2019-09-09 16:45:25 +02:00
Alexandre BODIN
1a9f4e8e59
Merge branch 'master' into bugfix/cli-creating-extra-model-folder 2019-09-09 16:45:15 +02:00
soupette
e1b0f07655 Global single request 2019-09-09 16:06:54 +02:00
Abdón Rodríguez Davila
315399527a Fix missed lint error 2019-09-09 15:32:02 +02:00