yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-26 01:35:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 121 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
4942fdaea2
Merge branch 'master' into fix/join-multi-database 2019-04-18 17:59:55 +02:00
Jim LAURIE
4589e9b10c
Merge pull request #3157 from strapi/fix/issue-3155-re-populate 
Fix missing populate in graphql queries
 2019-04-18 17:59:43 +02:00
soupette
8fb7608226 Use build for ctb upload us but not stm 2019-04-18 17:50:23 +02:00
Jim LAURIE
a17b30a872
Merge branch 'master' into fix/issue-3155-re-populate 2019-04-18 17:26:46 +02:00
Jim LAURIE
b3ca89b405
Merge pull request #3158 from strapi/fix/issue-3156-one-to-many-deleted 
Fix one to many update
 2019-04-18 17:24:33 +02:00
Alexandre Bodin
d4a7868edf Handle extensions controllers and services 2019-04-18 17:11:20 +02:00
Alexandre Bodin
187700e1c9 Handle different databases names standards 2019-04-18 16:01:31 +02:00
soupette
862288d3d9 Run build in dev mode 2019-04-18 14:59:49 +02:00
Alexandre Bodin
49d5491ff9 Fix one to many update 2019-04-18 12:03:50 +02:00
Alexandre Bodin
9103e3a2fa Fix missing populate in graphql queries 2019-04-18 12:03:40 +02:00
Jim LAURIE
def65ba152
Merge pull request #3141 from strapi/fix/limit-100 
Set the fetch limit to 100 by default and add a default param
 2019-04-18 11:12:23 +02:00
Jim LAURIE
c44818e072
Merge branch 'master' into fix/limit-100 2019-04-18 10:03:55 +02:00
soupette
06eeca0f65 Build upload 2019-04-18 01:10:38 +02:00
soupette
f14ad13481 Build users-permissions plugin 2019-04-18 00:32:21 +02:00
Jim LAURIE
ae943d7492
Merge branch 'master' into fix/join-multi-database 2019-04-17 18:30:41 +02:00
Jim LAURIE
a5322a1e32
Merge pull request #3151 from strapi/fix/graphql-loaders-merging 
Fix issue with graphql loaders
 2019-04-17 18:28:31 +02:00
Alexandre Bodin
e5e5058cb4 update lerna 2019-04-17 18:05:47 +02:00
Jim LAURIE
4aef7eb4df
Merge branch 'master' into fix/graphql-loaders-merging 2019-04-17 17:56:07 +02:00
Jim LAURIE
34baf02602
Merge pull request #3152 from strapi/fix/relation-column 
Fix column name for many to many relations
 2019-04-17 17:55:45 +02:00
Alexandre Bodin
f7d868caeb Cleanup strapi new 2019-04-17 17:13:17 +02:00
Jim LAURIE
84f951e2a5
Fix connection name 2019-04-17 17:05:25 +02:00
Alexandre Bodin
99e6dc31aa Fix issue with graphql loaders 2019-04-17 16:27:25 +02:00
Jim LAURIE
0ad1c523d3 Fix #3144 column name for many to many relations 2019-04-17 16:10:38 +02:00
Jim LAURIE
99477c4b80 Fix #3147 join multi database 2019-04-17 15:13:05 +02:00
soupette
fb11c9a466 Use cdn for flags 2019-04-17 14:18:26 +02:00
soupette
554fc7654a Clean files 2019-04-17 11:45:55 +02:00
soupette
507357f878 Fix wrong import 2019-04-17 11:21:46 +02:00
soupette
c539dbce35 Fix build helper plugin 2019-04-17 11:18:40 +02:00
soupette
579aa7705a Remove router context 2019-04-16 18:47:58 +02:00
soupette
88e3a7d1d6 Load upload 2019-04-16 18:23:26 +02:00
soupette
6d31833a58 Load stm 2019-04-16 18:16:44 +02:00
Alexandre Bodin
59dc3eea36 Fix tests 2019-04-16 18:05:12 +02:00
soupette
d6e8ff0807 Load doc 2019-04-16 18:05:12 +02:00
soupette
c7b7fddaba Load ctb 2019-04-16 18:03:50 +02:00
soupette
a9886f3105 Load ctm 2019-04-16 17:48:17 +02:00
Alexandre Bodin
e2869f0b7e Set the fetch limit to 100 by default and add a default param 2019-04-16 17:25:27 +02:00
soupette
61f115fbee Load users and email 2019-04-16 16:55:53 +02:00
Thomas Meerpohl
0ec5ed42ed Fixed #3136 2019-04-16 15:47:16 +02:00
Jim LAURIE
b0f2b9b857
Merge pull request #3138 from strapi/3.0.0-alpha.26 
3.0.0 alpha.26
 2019-04-16 12:57:24 +02:00
soupette
e1d619065b Update peerdependencies and fix duplicate modules 2019-04-16 12:54:16 +02:00
Pavel Voronin
999c49ad3f
mistype correction 2019-04-16 13:28:37 +03:00
soupette
751a794ca8 Change imports with helper plugin 2019-04-16 11:53:29 +02:00
Jim LAURIE
9405b84f54 Review some change log structure v3.0.0-alpha.26 2019-04-16 11:46:01 +02:00
Jim LAURIE
28e7c70f61 Add migration guide alpha.25 to alpha.26 2019-04-16 11:38:59 +02:00
Jim LAURIE
fd87e6353e 3.0.0-alpha.26 2019-04-16 11:13:14 +02:00
soupette
b68a04d0fc Add rollup to strapi-helper-plugin 2019-04-16 09:38:15 +02:00
Alexandre Bodin
3cc3b626e2 Fix admin model related issues 2019-04-16 09:35:13 +02:00
Alexandre Bodin
eb9e53028e Add yarn lock 2019-04-16 09:05:47 +02:00
Alexandre Bodin
5af9e477a9 Update strapi-plugin-documentation paths 2019-04-16 09:05:46 +02:00
Alexandre Bodin
710e3ab52f Save plugins models in extensions folder 2019-04-16 09:05:46 +02:00