yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 06:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,790 Commits 109 Branches 487 Tags
Commit Graph

346 Commits

Author SHA1 Message Date
Steven Raines
bec93f672f
updated arguments sent to role controller to (#5857) 
match the expected format

Signed-off-by: Steven Raines <stevenraines@gmail.com>
 2020-04-22 11:13:48 +02:00
Alexandre Bodin
94dbf10adc Merge branch 'master' into develop 2020-04-16 14:05:23 +02:00
Daniel
f56158b684 Fix email confirmation redirect which got broken in #5580 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-15 22:25:27 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Convly
f171029243 Change checkBadRequest's exception shape 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 14:33:55 +01:00
Convly
2d8e55838e Update path to contextBody attributes in schema.graphql.js@checkBadRequest() 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 12:19:44 +01:00
soupette
2e525a7f65 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-27 07:47:17 +01:00
Alexandre BODIN
9fdb650c6c
Fix rerouting of destroy route in user-perm (#5581) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 13:55:52 +01:00
soupette
38b7823b34 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-26 08:01:22 +01:00
Roel Beerens
2570e27238 feat: Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers. Made a slight adjustment to the emailConfirmation controller function in Auth.js to return a UsersPermissionsLoginPayload when using GraphQL 
Signed-off-by: Roel Beerens <roel@gravity.nl>
 2020-03-23 18:02:26 +01:00
Alexandre Bodin
72440af84b Merge branch 'develop' into features/media-lib 2020-03-23 17:28:21 +01:00
Derrick Mehaffy
8f7af83049
Remove extra console.log in users-permissions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-23 03:50:35 -07:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
Alexandre Bodin
bff34ad023 Fix missing lib in users-permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 09:59:33 +01:00
Alexandre Bodin
49b6a44078 Fix lint 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:40:13 +01:00
Alexandre Bodin
3ce852af61 User :: in policies prefix and update documentation accordingly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
0c6d39297f Add graphql tests for single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
dce6bd432c Merge branch 'develop' into features/single-types 2020-01-21 11:46:26 +01:00
Jim LAURIE
8027b135e1 fix: fix get role via graphql 
Find one role issue due to params sharing in the GraphQL schema.
fix #5013
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-01-20 17:00:20 +01:00
Alexandre Bodin
d1600dec21 Fix user-permissions bootstrap issue 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:14 +01:00
nurikabe
3c38fc33bf Remove soft hyphen (U+00AD) from reset password email subject line 2020-01-11 11:29:24 -05:00
Jim LAURIE
e5456da8eb
Merge branch 'master' into master 2019-12-23 11:04:29 +01:00
Alexandre Bodin
632bf537ec Login and register return simpler informations 2019-12-20 13:38:52 +01:00
Sulakin Vadim
406dec145e
Update bootstrap.js 2019-12-18 08:23:54 +03:00
Alexandre Bodin
0ba3d9d7de Merge branch 'develop' into features/dynamic-zones 2019-12-10 16:50:07 +01:00
Alexandre Bodin
03193acf4f Remove populate role on non existing relation breaking mongoose 2019-12-10 16:45:53 +01:00
Alexandre Bodin
2fa574b061 Fix isComponent on null attributes 2019-12-09 14:01:11 +01:00
Alexandre Bodin
c5d57b32fe Merge branch 'develop' into features/dynamic-zones 2019-12-09 11:48:46 +01:00
Sulakin Vadim
fc6ac8e231 add vk 2019-12-06 01:38:06 +03:00
Virginie Ky
c47985cf9b Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 15:57:06 +01:00
Virginie Ky
ef66c9ccb8 Icon from db 2019-11-25 17:08:30 +01:00
Virginie Ky
11ccb5e7f3 Dynamic zone edit view ui 2019-11-20 17:46:53 +01:00
Victor LAMBERT
cff8fd9041 Populate only role relation to authorize user 2019-11-16 01:05:21 +01:00
matthieuowlie
ef9de8815c Add POST route /auth/send-email-confirmation (#4270) 
* Add POST route /auth/send-email-confirmation to call sendEmailConfirmation function of plugin users-permissions

* Add documentation about /auth/send-email-confirmation POST route

* Added documentation in docs\3.0.0-beta.x\plugins\users-permissions about email confirmation function

* Update code example for send-email-confirmation function
 2019-11-13 18:45:23 +01:00
KalanyuZ
edbff44c82 Add GraphQL register/login (#3879) 
* Add GraphQL login

* Add GraphQL register

* Add graphql login/register/delete End2End test

* Update from requests

* Remove logging

* Update to beta.16

* Update

* Add error handling

* Util function

* Update
 2019-10-15 17:17:54 +02:00
Alexandre BODIN
c69e3fd042
Merge branch 'master' into fix/forgot-password-url 2019-10-15 12:17:00 +02:00
Alexandre BODIN
656343d059
Disable reload on jwt.json creation (#4246) 2019-10-14 10:49:19 +02:00
Jim LAURIE
9b49bee4b4 Fix #549 forgot password url 2019-10-09 17:37:16 +02:00
Alexandre BODIN
b3648ba4d9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-24 10:04:19 +02:00
Alexandre Bodin
bf7870de3b Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded 2019-09-18 17:29:09 +02:00
Natalia Tsvetkova
a4a26be4b3 Merge branch 'master' into feature/instagram_provider 2019-09-18 14:36:18 +02:00
Alexandre Bodin
6c2d413ba0 Fix user-permissions graphql permissions and update user 2019-09-18 12:07:45 +02:00
Natalia Tsvetkova
92f00de254 Merge branch 'master' into feature/instagram_provider 2019-09-09 14:59:21 +02:00
Alexandre Bodin
a22f2cefef Remove x-forwarded-host. 
- set security defaults for development mode that are standard
- refactor error messages to work without ctx.request.admin
- remove mask middleware and add a sanitization layer to the core-api to
hide private fileds
 2019-09-06 14:33:24 +02:00
Natalia Tsvetkova
6a3409891c Added instagram social auth provider 2019-09-06 09:19:23 +02:00
Alexandre Bodin
2a780ea10a Clear _id now that queries return an id everytime 2019-08-13 17:40:31 +02:00
Alexandre Bodin
3b47457f4f make boostrap functions async only 2019-08-12 15:35:40 +02:00
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre Bodin
48e45c5e01 Cleanup layout.js files 2019-07-23 13:45:08 +02:00
Derrick Mehaffy
2f44b7353b
PR Feedback for testing 2019-07-23 02:20:36 -07:00