yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 19:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,960 Commits 121 Branches 507 Tags
Commit Graph

1461 Commits

Author SHA1 Message Date
cyril lopez
d1e1c404e3
Merge branch 'develop' into update/plugin-generators 2019-10-15 07:42:04 +02:00
soupette
6ea77b69e5 Merge branch 'master' of github.com:strapi/strapi into develop 2019-10-15 07:40:55 +02:00
Alexandre BODIN
656343d059
Disable reload on jwt.json creation (#4246) 2019-10-14 10:49:19 +02: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
Virginie Ky
c53f3672b1 merge 2019-10-11 15:16:51 +02:00
Virginie Ky
5b32e32758 Some UI fixes 2019-10-11 14:59:41 +02:00
soupette
f09422d524 Merge branch 'master' of github.com:strapi/strapi into develop 2019-10-11 13:03:14 +02:00
cyril lopez
d1a6da5710
Merge branch 'master' into de-fix-and-removed-spaces 2019-10-10 08:33:46 +02:00
soupette
beef6e5510 Fix conflicts 2019-10-10 06:34:31 +02:00
Jim LAURIE
9b49bee4b4 Fix #549 forgot password url 2019-10-09 17:37:16 +02:00
soupette
a288198306 Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb 2019-10-08 12:34:48 +02:00
soupette
e4f9f808e4 Update modals 2019-10-08 11:23:35 +02:00
Virginie Ky
22b8ab0bff Users permissions search list overflow 2019-10-08 10:38:08 +02:00
Virginie Ky
ee65a6a05a users permissions plugins responsive UI 2019-10-08 10:21:27 +02:00
Virginie Ky
6cae06b63c Users permissions edit page responsive ip 2019-10-08 09:50:15 +02:00
soupette
b214765287 Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb 2019-10-08 09:39:10 +02:00
soupette
75abb17f0f Fix conflicts 2019-10-08 09:17:47 +02:00
Virginie Ky
42257b3af4 Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb 2019-10-07 13:54:31 +02:00
Virginie Ky
d4bc0c1683 Users permissions edit view policies fix 2019-10-07 13:42:39 +02:00
Ivo Bathke
5877ff93d0 fixed typo in de.json and removed unneccesary whitespace in model generator 2019-10-04 17:48:45 +02:00
Alexandre BODIN
cf58f742ef
Merge branch 'master' into patch-1 2019-10-04 14:41:08 +02:00
Alexandre Bodin
2d04d25097 v3.0.0-beta.16.8 2019-10-04 11:57:46 +02:00
soupette
2e7e7def33 Fix context in Edipage and children 2019-10-03 12:58:20 +02:00
soupette
743545606b Remove useless lifecycle in App and update its suffixURL 2019-10-03 11:54:23 +02:00
soupette
590ef49ec1 Fix HomePage contexts and update context api 2019-10-03 11:48:24 +02:00
soupette
5c42e43d4f Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb 2019-10-03 11:09:48 +02:00
Alexandre Bodin
dbd621e6d8 v3.0.0-beta.16.7 2019-10-01 12:15:48 +02:00
soupette
6f8b23d254 Fix conflicts 2019-09-27 16:26:09 +02:00
Alexandre Bodin
6305bee43b v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
Jim LAURIE
8ebd7cc548 Fix conflict 2019-09-24 18:01:59 +02:00
Alexandre BODIN
b3648ba4d9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-24 10:04:19 +02:00
Jim LAURIE
088653a9b9 Review the auth email template doc 2019-09-23 16:59:20 +02:00
Alexandre BODIN
d5700feefb
Merge branch 'master' into patch-1 2019-09-20 09:37:36 +02:00
Virginie Ky
2c67635b38 InputSearch as a func component 2019-09-19 16:37:26 +02:00
Virginie Ky
0f26597a92 InputSearch func component 2019-09-19 14:49:18 +02:00
Virginie Ky
1a1809006b Search refacto ip 2019-09-19 10:13:03 +02:00
Virginie Ky
c06b0d9031 components refacto ip 2019-09-18 17:39:54 +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
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-18 13:27:39 +02:00
Alexandre Bodin
c9a3bfc763 Clean code styling 2019-09-18 13:26:56 +02:00
Alexandre Bodin
9eaabb1d58 Add tests on graphql upload and user perm graphql 2019-09-18 12:07:59 +02:00
Alexandre Bodin
6c2d413ba0 Fix user-permissions graphql permissions and update user 2019-09-18 12:07:45 +02:00
Virginie Ky
b5a18e27bc EditForm refacto 2019-09-17 18:48:28 +02:00
Virginie Ky
28426555b6 users permissions plugin refacto ip 2019-09-17 17:36:03 +02:00
Virginie Ky
88a11cef3c node-sass removed 2019-09-17 16:20:45 +02:00
Virginie Ky
a6b57689fb styled components migration 2019-09-17 15:24:22 +02:00
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +02:00