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

10620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
9d72d7373e Fix left menu link on safari 2019-12-11 11:13:53 +01:00
soupette
87c4de9183 Fix injected compos from ctb in ctm 2019-12-11 10:57:10 +01:00
Alexandre BODIN
793d2dbfe9
Merge pull request #4702 from strapi/dynamic-zone/cleanup 
Dynamic zone/cleanup
 2019-12-11 10:40:44 +01:00
soupette
92ecb3eccd Fix leftmenu count span 2019-12-11 10:31:19 +01:00
Alexandre Bodin
a503c20353 Cleanup strapi-utils 2019-12-11 10:22:47 +01:00
soupette
9dc685ced5 Made some fixes for safari 2019-12-10 17:27:34 +01:00
Alexandre Bodin
bdd0a08ecb Prevent creation of special keys 2019-12-10 17:24:55 +01:00
Alexandre Bodin
5b01448dac Return __contentType field in morph related fields 2019-12-10 17:24:55 +01:00
Alexandre Bodin
b5cceb8760 Cleanup graphql and use model uids 2019-12-10 17:24:55 +01:00
Alexandre Bodin
9b5bc9c367 Fix manyWay deep filtering 2019-12-10 17:24:25 +01:00
Alexandre Bodin
0ba3d9d7de Merge branch 'develop' into features/dynamic-zones 2019-12-10 16:50:07 +01:00
Alexandre Bodin
e7444474f0 Merge branch 'master' into develop 2019-12-10 16:49:54 +01:00
Alexandre BODIN
f822a4d279
Merge pull request #4697 from strapi/fix/administrator-no-role-relation 
Remove populate role on non existing relation breaking mongoose
 2019-12-10 16:49:24 +01:00
Alexandre Bodin
03193acf4f Remove populate role on non existing relation breaking mongoose 2019-12-10 16:45:53 +01:00
soupette
98519d4f97 Remove commented code 2019-12-10 16:31:54 +01:00
soupette
875173cd00 Fix baseline 2019-12-10 15:54:36 +01:00
soupette
465fbea87f Fix icons edition 2019-12-10 14:26:12 +01:00
Alexandre Bodin
3446b7f577 wip 2019-12-10 14:21:20 +01:00
Alexandre Bodin
7c3f781081 Merge branch 'develop' into features/dynamic-zones 2019-12-10 13:51:00 +01:00
Alexandre Bodin
93ea08cc96 Merge branch 'master' into develop 2019-12-10 13:50:45 +01:00
Alexandre BODIN
b3f0eed9bf
Merge pull request #4696 from CKGrafico/patch-1 
Fix environment typo
 2019-12-10 13:49:40 +01:00
Quique Fdez Guerra
deb011dee1
Fix environment typo 2019-12-10 12:46:56 +01:00
soupette
15c6ec86d2 Update en trads 2019-12-10 12:27:17 +01:00
soupette
56826e4d3b Clean translations files 2019-12-10 12:19:56 +01:00
Olli Rautiainen
f2d53bf078 change admin UI's default language to english 2019-12-10 12:49:07 +02:00
soupette
14b28843a0 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-10 11:28:04 +01:00
soupette
923aa6ceac Fix icon color 2019-12-10 11:26:18 +01:00
soupette
0e83b1ad1d Fix administrators and design 2019-12-10 11:11:55 +01:00
soupette
d9f75cb39c Change injected components api and fix prod mod 2019-12-09 23:10:05 +01:00
soupette
4136019d5f Fix line background for dz 2019-12-09 22:39:50 +01:00
soupette
034070cc4c Clean models 2019-12-09 19:10:27 +01:00
soupette
51d7a317bb Clean code 2019-12-09 18:53:15 +01:00
soupette
207ddb54a0 Fix prod mode 2019-12-09 18:33:43 +01:00
soupette
ce22ca993c Fix links to the ctm 2019-12-09 18:18:55 +01:00
soupette
456e36c1ce Fix input file 2019-12-09 18:09:48 +01:00
soupette
959d45febf Add warning before delete 2019-12-09 17:47:13 +01:00
soupette
d1d97e1751 Fix components baseline 2019-12-09 17:33:50 +01:00
soupette
fdc5f069bf Fix baseline 2019-12-09 17:13:16 +01:00
Alexandre BODIN
8c3b5c2eaf
Merge pull request #4688 from strapi/docs/dynamic-zones 
Update documentation with dynamic zone feature
 2019-12-09 16:40:09 +01:00
Jim LAURIE
679a928674 Fix typo 2019-12-09 16:38:41 +01:00
Jim LAURIE
bd628be155 Replace group by compo 2019-12-09 16:36:35 +01:00
Alexandre Bodin
63edb61336 Fix component name 2019-12-09 16:18:58 +01:00
Alexandre Bodin
de3c9e440d Update documentation of api endpoints and queries 2019-12-09 14:54:16 +01:00
Alexandre Bodin
fc36055ff6 Add configurable as a valid api option 2019-12-09 14:53:30 +01:00
Alexandre BODIN
cf54c91fc1
Merge pull request #4687 from strapi/docs-typo 
Fix typo draft guide
 2019-12-09 14:40:35 +01:00
Jim LAURIE
c0d6b304b0 Fix typo draft guide 2019-12-09 14:33:43 +01:00
soupette
aa6d83669f Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-09 14:06:29 +01:00
soupette
87869a18b4 Fix ui bugs 2019-12-09 14:06:18 +01:00
Alexandre Bodin
2fa574b061 Fix isComponent on null attributes 2019-12-09 14:01:11 +01:00
cyril lopez
be8d74bc89
Merge pull request #4686 from strapi/ctm-ui 
DZ CTM ui fixes
 2019-12-09 11:55:01 +01:00