yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 21:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 118 Branches 489 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
9bdfeba62d 3.0.0-alpha.26.1 v3.0.0-alpha.26.1 2019-04-22 15:25:24 +02:00
Jim LAURIE
a57d4db2f1
Merge pull request #3121 from strapi/heroku-strapi-project-updates 
Added a paragraph about developing with Strapi and Heroku
 2019-04-22 15:19:46 +02:00
Jim LAURIE
d06123a677
Merge branch 'master' into heroku-strapi-project-updates 2019-04-22 15:19:36 +02:00
Alexandre Bodin
0ba139307c Handle many to many correctly 2019-04-19 17:32:43 +02:00
Alexandre Bodin
50b371b853 Merge branch 'beta' into tech/core-api 2019-04-19 08:26:13 +02:00
soupette
ff31c75c47 Add watch mode to rollup 2019-04-19 00:14:50 +02:00
soupette
a7aef8b243 Prefix entire stm scss with stm until migrating to styled-compo. 2019-04-18 23:42:08 +02:00
soupette
b84c0954fc load plugins build 2019-04-18 20:47:57 +02:00
soupette
5dd8106aa0 Move css import to admin and build ctm 2019-04-18 19:54:21 +02:00
Alexandre Bodin
0d72faaddc Merge branch 'master' into beta 2019-04-18 18:47:48 +02:00
Jim LAURIE
6c68e852bb
Merge pull request #3148 from strapi/fix/join-multi-database 
Fix join multi database
 2019-04-18 18:31:52 +02:00
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