yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-21 23:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 120 Branches 490 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurélien Georget
8e2169f005 Fix SQL query where oneWay relationship is null 2019-01-24 11:09:45 +01:00
soupette
250adb1332 Merge branch 'master' of github.com:strapi/strapi into split-ctm-settings-view 2019-01-24 10:56:49 +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
Abdón Rodríguez Davila
13c54411a9
Fix avoid write files if production mode 2019-01-22 23:33:09 +01:00
Jesús Pérez
9542341ec7 Header X-Powered-By enabled by default in all environments 2019-01-22 19:08:09 +01:00
Jesús Pérez
b2a59ba4a4 Fix X-Powered-By header setup and panel support for it 2019-01-22 16:47:17 +01:00
Jim LAURIE
c168059a1f
Merge pull request #2670 from strapi/3.0.0-alpha.20 
3.0.0 alpha.20
 2019-01-22 16:29:10 +01:00
Jim LAURIE
25f21fae42 3.0.0-alpha.20 v3.0.0-alpha.20 2019-01-22 14:31:49 +01:00
Jim LAURIE
178f77db2b Add migration guide to alpha.20 2019-01-22 14:31:19 +01:00
Jim LAURIE
86d6ba62ac
Merge pull request #2380 from strapi/issue/2327 
Fix users CRUD mutations
 2019-01-22 13:52:22 +01:00
Jim LAURIE
f90255bb75
Merge branch 'master' into issue/2327 2019-01-22 13:52:13 +01:00
Aurélien Georget
4f2928339a Reset loaders instead of clearing cache 2019-01-22 13:47:44 +01:00
soupette
9b6440e952 Improve date formatting 2019-01-22 12:28:55 +01:00
Jim LAURIE
927d0182c3
Merge pull request #2669 from strapi/fix-update-user 
Fix update user email
 2019-01-22 12:17:28 +01:00
Jim LAURIE
e0670fb540
Merge branch 'master' into fix-update-user 2019-01-22 12:17:22 +01:00
Jim LAURIE
d2b8382324
Merge pull request #2661 from Sayegh7/master 
Add uploads folder to generated gitignore
 2019-01-22 12:17:00 +01:00
Aurélien Georget
2b37315f07 Fix where on relational fields 2019-01-22 12:16:46 +01:00
Jim LAURIE
b4968697a0 Fix update user email 2019-01-22 11:41:49 +01:00
Ahmed El Sayegh
6b74e2cc24
Merge branch 'master' into master 2019-01-22 12:36:37 +02:00
Jim LAURIE
6478e1f2b3
Merge pull request #2579 from pragone/lint_improvement 
Added comment to improve linting of generated service files
 2019-01-22 11:33:26 +01:00
Jim LAURIE
b5a150851b
Merge branch 'master' into lint_improvement 2019-01-22 11:33:15 +01:00
Ahmed El Sayegh
df7be9bf73 Merge branch 'master' of https://github.com/Sayegh7/strapi 2019-01-22 12:32:25 +02:00
Ahmed El Sayegh
54f70da366 Add gitkeep template and target 2019-01-22 12:31:49 +02:00
Ahmed El Sayegh
984654c725
Merge branch 'master' into master 2019-01-22 12:20:16 +02:00
Ahmed El Sayegh
bb585f4df2 Add gitkeep to public/uploads folder 2019-01-22 12:19:42 +02:00