yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 02:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,892 Commits 115 Branches 488 Tags
Commit Graph

1295 Commits

Author SHA1 Message Date
Jim LAURIE
03c1e04d87 Revert filter PR 2018-12-04 17:05:03 +01:00
soupette
66e45eb896 Change cypress test folder name 2018-12-03 12:06:09 +01:00
soupette
43e02ffb3d Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-12-03 11:24:03 +01:00
Jim LAURIE
f2ec28907e
Merge branch 'master' into master 2018-11-29 11:45:42 +01:00
Jim LAURIE
c126b94325
Merge branch 'master' into fixNodeVersions 2018-11-29 11:21:55 +01:00
Jim LAURIE
fb03d4f18c 3.0.0-alpha.15 2018-11-28 14:55:41 +01:00
DMehaffy
ecb6baaea5 Update all the packages and generated json 2018-11-28 00:14:12 -07:00
soupette
d60b5c5b34 Fix conflicts 2018-11-27 20:22:41 +01:00
Aurélien Georget
b0aaae9f12 Resolve conflicts 2018-11-27 18:48:37 +01:00
Jim LAURIE
00d6284552 Fix fetch user mongoose 2018-11-27 16:44:20 +01:00
Aurélien Georget
540e1bccf8 Allow private attribute into input definition 2018-11-27 14:59:28 +01:00
Aurélien Georget
9e0faf9b5c Fix deleteUser mutation for Mongoose and Bookshelf 2018-11-27 14:54:34 +01:00
soupette
685c39f0cf Fix PR feedback 2018-11-27 14:13:07 +01:00
Aurélien Georget
143f92a338 Follow generated GraphQL input to return data 2018-11-26 18:32:35 +01:00
soupette
4ddceb3123 Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-26 16:15:38 +01:00
soupette
80adfdfde8 Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-22 19:45:31 +01:00
soupette
d98db6415b Add cypress in monorepo and split by package 2018-11-22 19:19:04 +01:00
Jim LAURIE
693ea6ed93
Merge branch 'master' into fix/reattempt-1851 2018-11-22 18:18:20 +01:00
Jim LAURIE
7e00be7057
Merge branch 'master' into master 2018-11-22 12:57:16 +01:00
Jim LAURIE
63cfa2e60b
Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute 2018-11-22 12:17:43 +01:00
Aurelsicoko
402d1fb4b6 Map result to retrieve data from loaders 2018-11-21 19:37:19 +01:00
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
Aurelsicoko
4320614721 Merge branch 'master' of github.com:strapi/strapi into issue/2228 2018-11-20 16:31:26 +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
Aurelsicoko
3d7dacef70 Apply options on Mongoose instance 2018-11-16 15:53:00 +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