yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-31 04:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,077 Commits 116 Branches 487 Tags
Commit Graph

222 Commits

Author SHA1 Message Date
Victor LAMBERT
59aff0af3c Retrieve roles without populating users and permissions relations 2019-11-14 16:36:35 +01:00
Jim LAURIE
d844d15a77
Merge branch 'master' into master 2019-11-06 17:29:31 +01:00
Mateusz Ryszka
88dfdaad73 auto confirmation user with provider other than local 2019-11-06 09:56:31 +01:00
sven
47b7fab200 Fetch Github profile email if not found 
When a Github user does not have a public email on his profile the
GitHub OAuth API will have `email` set to `null`. When the registered
OAuth application in Github has permission for the user:email scope it
is possible to get the user email via the `user/email` API endpoint.

This is similar to the `passport-github2` package.
See https://github.com/cfsghost/passport-github/blob/master/lib/strategy.js
 2019-10-12 22:43:44 +02:00
sven
68cf8ab231 Fix return value type of providers.connect 
Inside controllers/Auth.js:156 the return value is expected to
be [user, error].

This commit makes sure that providers.connnect()
will always resolve or reject with [user, error]
 2019-10-12 22:35:39 +02:00
soupette
6f8b23d254 Fix conflicts 2019-09-27 16:26:09 +02:00
Natalia Tsvetkova
a4a26be4b3 Merge branch 'master' into feature/instagram_provider 2019-09-18 14:36: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
Natalia Tsvetkova
92f00de254 Merge branch 'master' into feature/instagram_provider 2019-09-09 14:59:21 +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
f757d4d952 Support relations inside of group creation 2019-07-29 08:15:18 +02:00
Alexandre Bodin
a62f73fe5f Merge branch 'develop' into feature/groups 2019-07-18 19:37:09 +02:00
Alexandre Bodin
da5d02fb7c Merge branch 'master' into develop 2019-07-18 19:28:52 +02:00
Alexandre Bodin
7e11acac32 Fix bugs mongo 2019-07-18 15:49:24 +02:00
Alexandre Bodin
5a21e2f87f Fix updateRole 2019-07-17 14:28:36 +02:00
Alexandre Bodin
ef9ce7d4fa simplify permission duplicate removal 2019-07-17 13:50:07 +02:00
Alexandre Bodin
87d9d85c08 Handle empty permissions in role update 2019-07-17 10:15:22 +02:00
Alexandre Bodin
2befa1cf48 Use primaryKey on delete queries 2019-07-16 23:27:34 +02:00
Alexandre Bodin
928c7f4776 fix create/update role 2019-07-16 20:52:31 +02:00
Alexandre Bodin
56c59c5ae1 Implement deleteMany in query.delete 2019-07-16 20:11:34 +02:00
Alexandre Bodin
ed6d35d51d Implement delete user 2019-07-16 17:23:40 +02:00
Alexandre Bodin
3e53d7c8c2 Fix user update and boolean values in DB 2019-07-16 17:23:39 +02:00
Alexandre Bodin
c4b7ae55e6 Fix username unique in users-permissions plugin and implement sql db unique option 2019-07-16 17:23:39 +02:00
Alexandre Bodin
1658b48aa0 Refactor users-permissions to use the new strapi.query 2019-07-16 17:23:38 +02:00
Jim LAURIE
de2604cf80
Fix var instead of const 2019-07-15 13:32:41 +02:00
Jim LAURIE
2b9e03f3de Fix Google auth 2019-07-12 19:46:09 +02:00
ta7sudan
7b3737c90c fix(strapi-plugin-users-permissions): fix when connecting to marketplace error cause app crash 2019-06-17 00:02:27 +08:00
Alexandre Bodin
4a21a75d53 Fix error not ignored getPlugins 2019-06-08 18:50:54 +02:00
Alexandre Bodin
9c2a90246b Fix Role CRUD with users 2019-05-14 12:42:03 +02:00
Alexandre Bodin
a41641bfe4 Add a queries interface to the plugins 2019-04-26 13:40:23 +02:00
Alexandre Bodin
eb7c4534f8 Exports schema.graphql in devmode, load extensions folder and run merge config and overwrites 2019-04-16 09:00:24 +02:00
Alexandre Bodin
9e9ff9907d Refactor strapi load 2019-04-16 08:50:22 +02:00
soupette
a2192c1dec Fix conflicts 2019-04-09 16:01:01 +02:00
soupette
e56e46e030 Split admin and users. 
Co-authored-by: lauriejim
 2019-04-09 12:09:03 +02:00
Alexandre Bodin
d2db6b633f Mongo + graphql v1 2019-03-21 09:07:36 +01:00
Jim LAURIE
c5f3eb67ce Fix loose permissions with Mongo 2019-03-21 09:07:02 +01:00
Kamal Bennani
5c7dd886aa No longer use convertParams 2019-03-21 09:07:02 +01:00
Kamal Bennani
17d8eb36c0 Adapt User plugin to the new API 2019-03-21 09:06:06 +01:00
Jim LAURIE
cca2ea98dc Fix user count per role on SQL database 2019-03-01 10:52:52 +01:00
Aurélien Georget
5f8b4ae667 Complete funnel 2019-01-23 15:33:30 +01:00
Jim LAURIE
f90255bb75
Merge branch 'master' into issue/2327 2019-01-22 13:52:13 +01:00
Jim LAURIE
4bffe2749c
Remove error log 
We will work on a complete logs tag plan in the future.
 2019-01-11 10:55:21 +01:00
Paolo Ragone
b6fc268297 Fixed bug following recommendation 2019-01-11 22:52:28 +13:00
Paolo Ragone
b3ebf8e736 Merge remote-tracking branch 'origin/master' into patch-1 2019-01-11 22:50:19 +13:00
Jim LAURIE
e41948de3f Add setting for production environment 2019-01-09 14:19:39 +01:00
Paolo Ragone
947dd2b502 Added missing semicolon 2018-12-26 12:11:12 +13:00
Paolo Ragone
382722b74c
Fix provider query building bug 
Fixes #2536
Does so by fixing the parameters to the query call
 2018-12-26 11:10:35 +13:00
Abdón Rodríguez Davila
df162c1387 Avoid write actions.json if not development environment 2018-12-19 19:42:10 +01:00