yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,275 Commits 127 Branches 497 Tags
Commit Graph

247 Commits

Author SHA1 Message Date
Jim LAURIE
fc4cef9926 fix: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-05-22 10:34:38 +02:00
Jim LAURIE
16c304d710 Merge branch 'master' of github.com:strapi/strapi into jwtconfig 2020-05-22 10:22:14 +02:00
trick0
04337262cb Merge branch 'master' into master 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 18:33:44 +02:00
David Thomas
ba6c0b4ba2
Add Twitch auth provider (#6171) 
* Add Twitch auth provider

Signed-off-by: David Thomas <dev@synth3.tk>

* Remove unneeded label exclusion

Signed-off-by: David Thomas <dev@synth3.tk>
 2020-05-12 16:48:18 +02:00
Sulakin Vadim
30ba717525
fix vk providers (#5783) 2020-05-12 14:04:52 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833) 
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-08 13:50:00 +02:00
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00
Alexandre Bodin
4d5af2c95d Make password input optional while editing 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-05 19:05:43 +02:00
Alexandre Bodin
d7327d4395 remove overwritting env var witohut passing by the config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:39 +02:00
Walter Cossu
f1745c0956 Merge branch 'master' of https://github.com/trick0/strapi 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-04-24 10:47:29 +02:00
Walter Cossu
90e0d75230 added countSearch method to user service 2020-04-24 10:30:37 +02:00
trick0
371e3e0d28
Merge branch 'master' into master 2020-04-24 10:26:37 +02:00
Pierre Noël
134fba1229 rename DEFAULT_PERMISSIONS 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 15:19:12 +02:00
Pierre Noël
ddc5bb5ac3 fix missing permissions at startup 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 15:19:11 +02:00
Walter Cossu
c01bda9fff added user count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-04-17 18:00:03 +02:00
Matt
86321355c7 Added support for full jwt configuration with jwt.json config file 
Signed-off-by: Matt <kapakapa197@gmail.com>
 2020-04-12 14:23:43 +02: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
9c96b180fe Merge branch 'develop' into features/single-types 2020-01-22 10:39:42 +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
Thomas Baxter
37dbd955e2 feat(purest): upgrading purest to 3.x 2020-01-08 12:55:16 -05:00
Jim LAURIE
e5456da8eb
Merge branch 'master' into master 2019-12-23 11:04:29 +01:00
Abdón Rodríguez Davila
4620546d4c
Add populate option to the fetch user service 2019-12-19 18:58:46 +01:00
Sulakin Vadim
a858c66158
Merge pull request #4 from sulakin/Adding-a-VK-Provider 
add vk
 2019-12-06 01:45:26 +03:00
Sulakin Vadim
fc6ac8e231 add vk 2019-12-06 01:38:06 +03:00
Cowboy
b6ee350ac0 Fix no response when get user permission role with internal network 2019-12-02 14:58:57 +08:00
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