yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-29 03:50:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 114 Branches 486 Tags
Commit Graph

972 Commits

Author SHA1 Message Date
Jim LAURIE
460c092897
Merge branch 'master' into patch-1 2018-11-21 17:39:42 +01:00
Jim LAURIE
ef0f40701f
Merge branch 'master' into fix/css-container-fluid 2018-11-21 11:56:19 +01:00
Kamal Bennani Bouchiba
6482a6ec84
Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute 2018-11-20 19:34:46 +01:00
soupette
bba6f9d85f Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-20 18:46:31 +01:00
Jesús Pérez
e03fd96e1a Add missing Twitter provider redirect URI configuration 2018-11-20 16:55:20 +01:00
Abdón Rodríguez Davila
7a9ed040e2
Update grant-koa version 2018-11-20 16:53:49 +01:00
Kamal Bennani
511ca55461
fix 1st level deep filter 2018-11-19 00:10:48 +01:00
ByoungYong Kim
fa2c6f37aa
Merge branch 'master' into fix/reattempt-1851 2018-11-17 20:27:08 +01:00
Kamal Bennani
da5ca2a125
Link the strapi-utils dependecy to the users-permissions module in the setup step 2018-11-17 13:50:50 +01:00
Jim LAURIE
19ec6242f9
Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute 2018-11-16 17:38:27 +01:00
Alberto Maturano
8fcbb1978f refactor: Fix misuse of map method 
`map` should create a new Array so a `return` is expected inside the
callback param. `forEach` is the corrent method to use for just iterate
over array elements.
 2018-11-15 15:51:23 -06:00
soupette
d9ee893c8f Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-14 18:20:40 +01:00
Dimitri Nicolas
e18bf9198b Change containerFluid child margin for better grid alignement 2018-11-13 17:21:31 +01:00
Jim LAURIE
8fcf2ed8ae 3.0.0-alpha.14.5 2018-11-13 14:50:07 +01:00
Sidharth Vinod
e3d4708aaa
Update username for Google Auth to fix #2285 2018-11-11 00:26:53 +05:30
Jim LAURIE
61dd06c742
Merge branch 'master' into fix/1317 2018-11-08 18:37:45 +01:00
soupette
2a5f0c95d2 Fix conflict 2018-11-08 17:54:45 +01:00
Jim LAURIE
d677fa89ff
Merge branch 'master' into fix/#1787 2018-11-08 15:11:35 +01:00
Jim LAURIE
66a1e0c291
Merge branch 'master' into feature/2108_handle_redirect_after_password_reset 2018-11-08 11:28:44 +01:00
aDeve
0674002553 code review : syntax 2018-11-07 19:29:37 +01:00
Aurelsicoko
f5eda8df3c Improve permissions policy to avoid security breach with GraphQL 2018-11-06 18:58:40 +01:00
aDeve
d07edb0c5b fix error : add _.get to prevent it 2018-11-05 13:34:45 +01:00
dimitrinicolas
f168da8acc Fix responsive admin headers 2018-11-04 12:47:55 +01:00
dimitrinicolas
3d4d4c0525 Update FR translations 2018-11-04 12:28:04 +01:00
Leo
03803780bf Fix a missing translation 2018-11-03 16:56:21 +08:00
Leo
b160fdf79e Translations final fix 2018-11-03 15:03:31 +08:00
Leo
6dc594217c Translations for ZH completed 2018-11-03 14:30:22 +08:00
aDeve
429973f814 code review : remove longline, and invers logic condition 2018-11-02 11:47:04 +01:00
aDeve
f39e917ab1 fix #2108 : handle redirect after reset password 2018-10-31 17:36:00 +01:00
Jim LAURIE
02d935188d Fix test launch 2018-10-31 17:20:09 +01:00
Kamal Bennani
b9ad12f920
Add missing strapi-utils in the user-permissions package 2018-10-28 23:44:43 +01:00
Kamal Bennani
957368b8b2
Add a support of deep filter in bookshelf 2018-10-28 23:44:38 +01:00
Kamal Bennani
0ed9b7643a
Merge where and relation payload 2018-10-28 23:42:22 +01:00
Kamal Bennani
5bdb5c25e0
use stage functions from the relation file 2018-10-28 23:42:22 +01:00
Kamal Bennani
ce534cf568
Take into account user model 2018-10-28 23:42:21 +01:00
Kamal Bennani
f8d844a48a
Update user-permissions query logic for both bookshelf/mongoose 2018-10-28 23:42:18 +01:00
entwicklerfr
dfca24c908 FIX Creating a user in AdminUI does not properly set provider type to local 2018-10-28 00:47:09 +02:00
Jim LAURIE
9900ffe3b4
Merge branch 'master' into njb/add-me-graphql-query 2018-10-26 11:35:16 +02:00
Jim LAURIE
01a2442e7d 3.0.0-alpha.14.4.0 2018-10-25 17:18:26 +02:00
Jim LAURIE
379331f822 3.0.0-alpha.14.4 2018-10-25 16:41:07 +02:00
Jim LAURIE
32b7db465d
Merge branch 'master' into japanese_localization 2018-10-25 13:54:50 +02:00
Benjamin Devaublanc
0383c4a6ba Check if user exists before testing user.confirmed 2018-10-23 18:49:49 +02:00
Benjamin Devaublanc
a468f82da0 Fix error 500 when user trying to signin with bad credentials 2018-10-23 13:17:27 +02:00
Jim LAURIE
b79d763dc5
Merge branch 'master' into fix/sso-not-working-in-the-wild 2018-10-22 19:36:29 +02:00
cyril lopez
3e67bd6e08 Remove fs extra and use shelljs in tests 2018-10-19 18:58:11 +02:00
Nick Bolles
e09879223c
Merge branch 'master' into njb/add-me-graphql-query 2018-10-19 10:14:01 -05:00
Jim LAURIE
e42e532f1a
Merge branch 'master' into revert-1928-master 2018-10-18 10:41:38 +02:00
NickBolles
b23bbff6a1 Use the UserPermissionsMeRole 2018-10-15 11:03:00 -05:00
NickBolles
fc8931bb39 Add a special return type for the me graphql query 
This helps avoid returning roles and permissions that the user doesn't have access to.
 2018-10-14 21:14:02 -05:00
NickBolles
df9f6d6aee add graphql query for the current user 2018-10-09 21:05:13 -05:00