yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,881 Commits 129 Branches 498 Tags
Commit Graph

6881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
4ce2da5dc0
Merge branch 'master' into master 2019-01-29 16:27:04 +01:00
Jesús Pérez
e9202bfe5e Default powered by for every evironment 2019-01-29 16:12:17 +01:00
Jim LAURIE
b54a15c024
Merge pull request #2702 from strapi/lauriejim-patch-1 
Hot fix database host
 2019-01-28 15:49:21 +01:00
Jim LAURIE
f365534c78
Hot fix database host 2019-01-28 15:47:38 +01:00
Jim LAURIE
77a8b5245c
Merge pull request #2698 from strapi/fix-database-prod-staging 
Fix database prod and staging template
 2019-01-28 12:21:26 +01:00
Jim LAURIE
7fe72a755e Fix conflict 2019-01-28 12:07:08 +01:00
Jim LAURIE
08f3e0ecc3 Apply PR feedback 2019-01-28 12:05:41 +01:00
Jim LAURIE
98717a1ccf
Merge pull request #2693 from strapi/fix-image-populate 
Fix image populate
 2019-01-28 11:57:16 +01:00
Jim LAURIE
26362366aa
Merge branch 'master' into fix-image-populate 2019-01-28 11:57:10 +01:00
Jim LAURIE
23dd047f42
Fix typo 2019-01-28 11:56:27 +01:00
Jim LAURIE
012b3c12f1
Merge pull request #2598 from Liroo/master 
[strapi new] cli option inline --dbsrv to enable +srv in mongo connection url
 2019-01-27 17:13:59 +01:00
Jim LAURIE
0002187cc8
Merge branch 'master' into master 2019-01-27 17:12:50 +01:00
Jim LAURIE
292447a4d2 Fix database prod and staging template 2019-01-27 16:55:55 +01:00
Jim LAURIE
eebfbed0e9
Merge pull request #2689 from adamsaparudin/patch-1 
Add _in array query example
 2019-01-26 18:54:29 +01:00
Jim LAURIE
9539182768
Change in order 2019-01-26 18:52:27 +01:00
Jim LAURIE
c0e808f82c Fix image populate 2019-01-25 17:24:21 +01:00
Adam Saparudin
e62ab72b3b
Add _in array query example 2019-01-24 23:43:53 +07:00
Jim LAURIE
ea787eb50a
Merge pull request #2682 from strapi/removeWarningLogs 
Remove Mongoose warning logs
 2019-01-24 12:16:19 +01:00
Jim LAURIE
ce7acb24db
Merge branch 'master' into removeWarningLogs 2019-01-24 12:16:11 +01:00
Jim LAURIE
57e0f3e343
Merge pull request #2687 from strapi/fix/graphql 
Fix SQL query where oneWay relationship is null
 2019-01-24 12:11:45 +01:00
Aurélien Georget
199ed431a8 Destructure where condition to make code more readable 2019-01-24 12:05:33 +01:00
Aurélien Georget
ce242dfd89 Fixes #2672 2019-01-24 11:56:21 +01:00
Aurélien Georget
2a62b9d962 Convert where parameters instead of adding complexity in SQL query 2019-01-24 11:52:53 +01:00
Aurélien Georget
8e2169f005 Fix SQL query where oneWay relationship is null 2019-01-24 11:09:45 +01:00
Aurélien Georget
ceda08980a Fix PR template typo 2019-01-23 17:03:30 +01:00
Aurélien Georget
2115124931 Remove Mongoose warning logs 2019-01-23 16:56:04 +01:00
Jim LAURIE
6f1014cc20
Merge pull request #2681 from strapi/3.0.0-alpha.21 
3.0.0 alpha.21
 2019-01-23 16:40:38 +01:00
Jim LAURIE
ee8c94f09f 3.0.0-alpha.21 v3.0.0-alpha.21 2019-01-23 16:27:46 +01:00
Jim LAURIE
5e37726946 Add migration to alpha.21 2019-01-23 16:27:05 +01:00
Jesús Pérez
48b6ac7368 Styling the new response setup in the admin 2019-01-23 16:15:04 +01:00
Jim LAURIE
4157f99af8
Merge pull request #2678 from strapi/fix-timestamp 
Fix get timestamp in the admin
 2019-01-23 15:50:36 +01:00
Jim LAURIE
5df95ad3b3
Merge branch 'master' into fix-timestamp 2019-01-23 15:50:30 +01:00
Jim LAURIE
9b8957bcf8
Merge pull request #2680 from strapi/funnel 
Complete funnel
 2019-01-23 15:47:21 +01:00
Jim LAURIE
3ec2ad2c54
Merge branch 'master' into funnel 2019-01-23 15:47:14 +01:00
Aurélien Georget
5f8b4ae667 Complete funnel 2019-01-23 15:33:30 +01:00
Jim LAURIE
0238257eec Fix get timestamp in the admin 2019-01-23 15:19:34 +01:00
Jesús Pérez
5ee76aca73 Allowing to change the header powered by from the admin 2019-01-23 14:35:10 +01:00
Jim LAURIE
6931d3dce0
Merge pull request #2609 from pragone/update_knex 
Updated knex
 2019-01-23 14:31:19 +01:00
Jim LAURIE
a38082a535
Merge branch 'master' into update_knex 2019-01-23 14:31:07 +01:00
Jesús Pérez
f4cfc17411 Minor improvement to avoid to repeat the default powered by header value 2019-01-23 11:21:44 +01:00
Jim LAURIE
89984e46b0
Merge pull request #2595 from sajjad-shirazy/patch-2 
In `production` GraphQL Playground doesn't load the schema
 2019-01-23 11:14:27 +01:00
Jim LAURIE
26051496c7
Merge branch 'master' into patch-2 2019-01-23 11:14:09 +01:00
Jim LAURIE
6347a4a869
Add new line 2019-01-23 11:14:00 +01:00
Jim LAURIE
30c180e4e2
Merge pull request #2629 from MartinMuzatko/patch-1 
Add note about docker to deployment documentation
 2019-01-23 11:12:14 +01:00
Jim LAURIE
2403ec3d76
Merge branch 'master' into patch-1 2019-01-23 11:12:06 +01:00
Jim LAURIE
e9db64cd89
Merge pull request #2651 from DivyanshBatham/patch-1 
Update controllers.md (Grammatical Mistake)
 2019-01-23 11:07:21 +01:00
Jim LAURIE
3549bc03f6
Merge branch 'master' into patch-1 2019-01-23 11:07:11 +01:00
Jim LAURIE
8bb1f95fed
Merge pull request #2649 from strapi/fix/2541 
Fix Infinite loading when clearing the name of an existing role
 2019-01-23 10:56:21 +01:00
Jim LAURIE
c5bd4f9aa7
Merge branch 'master' into fix/2541 2019-01-23 10:56:04 +01:00
Jim LAURIE
3c75b831f8
Merge pull request #2674 from abdonrd/patch-2 
Fix avoid write files if production mode
 2019-01-23 10:32:58 +01:00