Alexandre BODIN
9cf90a9a67
Merge branch 'master' into fix/3874-bookshelf-unicode-fix
2019-09-16 23:10:56 +02:00
cyril lopez
7457673df0
Merge branch 'master' into features/media-preview
2019-09-16 16:37:38 +02:00
Don Masakayan
17c4244f14
Pass easier-to-understand options instead of arguments to Mutation.composeMutationResolver() and Query.composeQueryResolver()
2019-09-15 15:51:06 +08:00
Don Masakayan
8d3d79fd18
Simplified ctx.state.user fix
2019-09-15 15:51:05 +08:00
Don Masakayan
0bead70c2c
Fixed issue where all policies triggered by GraphQL Mutations and Queries had ctx.state.user as undefined
2019-09-15 15:51:04 +08:00
Don Masakayan
e0dd6dc602
Fixed issue where custom GraphQL Mutation resolvers never triggered policies
2019-09-15 15:51:03 +08:00
virginieky
5fc8600506
Merge branch 'master' into features/media-preview
2019-09-13 16:16:36 +02:00
Virginie Ky
1b53286c71
merge
2019-09-13 16:05:10 +02:00
Virginie Ky
4f9065f19e
last review apply
2019-09-13 16:04:15 +02:00
Alexandre Bodin
36e4e73ad3
v3.0.0-beta.16.3
2019-09-13 15:08:44 +02:00
soupette
9ad9fafd6b
Fixes #3987 #3954
2019-09-13 14:46:31 +02:00
Alexandre BODIN
09a227c3d8
Merge branch 'master' into fix/json-array-pg
2019-09-13 10:56:28 +02:00
Alexandre Bodin
852be46911
Stringify json input for pg to support arrays
2019-09-13 10:41:21 +02:00
Alexandre Bodin
ae6492dab2
Allow group mainField and defaultSortBy to be id
2019-09-13 10:36:48 +02:00
Alexandre BODIN
b11e9375c9
Merge branch 'master' into features/media-preview
2019-09-13 10:19:55 +02:00
cyril lopez
087226b5e4
Merge branch 'master' into styled-components/email
2019-09-12 17:41:05 +02:00
Alexandre Bodin
7207184648
v3.0.0-beta.16.2
2019-09-11 19:22:05 +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
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
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
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
f2b354feb7
Merge branch 'master' into fix/core-multi-origin
2019-09-10 16:27:06 +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
