9066 Commits

Author SHA1 Message Date
websocket98765
986fa1dd00
Merge pull request #3 from strapi/master
update master
2019-09-16 19:53:44 +00:00
Alexandre BODIN
f59b4a5c7b
Merge pull request #4008 from donmasakayan/graphql_policies_fix-v3
Graphql policies fix
2019-09-16 11:29:21 +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
e0fea833a7 Updated documentation so that GraphQL policies use correct 'policies' key instead of 'policy' 2019-09-15 15:51:04 +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
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +02:00
Alexandre BODIN
85dcf87f5a
Merge pull request #3988 from strapi/fix/3987
Fix buggy date field, and toggle field size
2019-09-13 15:05:36 +02:00
soupette
9ad9fafd6b Fixes #3987 #3954 2019-09-13 14:46:31 +02:00
Alexandre BODIN
8970159ffa
Merge pull request #3985 from strapi/fix/json-array-pg
Stringify json input for pg to support arrays
2019-09-13 11:27:10 +02:00
Alexandre BODIN
09a227c3d8
Merge branch 'master' into fix/json-array-pg 2019-09-13 10:56:28 +02:00
Alexandre BODIN
4cab3c0fa1
Merge pull request #3986 from strapi/fix/ctm-allow-group-updates
Allow group mainField and defaultSortBy to be id
2019-09-13 10:56:06 +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
cyril lopez
5ee755c3ca
Merge pull request #3960 from strapi/styled-components/email
Remove Sass in email plugin
2019-09-12 18:06:35 +02:00
cyril lopez
087226b5e4
Merge branch 'master' into styled-components/email 2019-09-12 17:41:05 +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
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
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
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
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
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