yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-18 04:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 122 Branches 495 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
3c4b411430 Add delete test 2019-12-13 10:43:40 +01:00
Alexandre Bodin
b62d664b60 Add edition tests 2019-12-13 10:43:39 +01:00
Alexandre Bodin
472ec83506 List test 2019-12-13 10:43:39 +01:00
Alexandre Bodin
721ad15633 Init dz tests 2019-12-13 10:43:38 +01:00
Virginie Ky
a2a0efeb4e ListView UI 2019-12-13 01:20:02 +01:00
Virginie Ky
f6dc09503b Custom ListRow 2019-12-13 01:10:15 +01:00
Alexandre Bodin
4d4d9c351d Change csp config 2019-12-12 19:13:48 +01:00
Alexandre BODIN
417cbb218d
Merge pull request #4716 from strapi/features/dynamic-zones 
Add dynamic zones feature
 2019-12-12 18:14:44 +01:00
Alexandre Bodin
4734d63308 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into features/dynamic-zones 2019-12-12 17:45:57 +01:00
Alexandre Bodin
2b101f8f05 Allow empty dz component list 2019-12-12 17:45:49 +01:00
Alexandre BODIN
146756fe89
Merge pull request #4717 from strapi/fix/json-data 
Fix json input
 2019-12-12 17:40:10 +01:00
soupette
13150e5bc6 Fix json input 2019-12-12 17:32:16 +01:00
Virginie Ky
4998ab15ce ListView 2019-12-12 17:11:28 +01:00
Alexandre BODIN
e3ced837a0
Merge pull request #4690 from strapi/front/dz-post-data 
CTB: Dynamic zones and nested components support
 2019-12-12 17:08:51 +01:00
soupette
c9089a4ad2 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-12 17:05:11 +01:00
Alexandre BODIN
b22bef8992
Merge pull request #4685 from strapi/dynamic-zone/migration-guide 
Init migration guide
 2019-12-12 16:46:58 +01:00
soupette
9adfe0c424 Remove useless compo and ct and update buffet version 2019-12-12 16:42:50 +01:00
cyril lopez
6985a78851
Merge pull request #4715 from strapi/ctb/events 
Ctb/events
 2019-12-12 16:39:14 +01:00
soupette
6c62e7c481 Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctb/events 2019-12-12 16:37:23 +01:00
cyril lopez
24cf1fe230
Merge pull request #4714 from strapi/fix/#4707 
Fixes admin host in development
 2019-12-12 16:36:48 +01:00
soupette
a01112df00 Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctb/events 2019-12-12 16:13:45 +01:00
soupette
0dad035b94 Remove add another field button when editing a dz 2019-12-12 16:13:19 +01:00
soupette
b43400417e Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctb/events 2019-12-12 16:09:21 +01:00
soupette
630f15a7d6 Add events to ctb 2019-12-12 16:09:03 +01:00
Aurélien Georget
3eb579978c Add icon with component name animation in the ctm 2019-12-12 16:07:18 +01:00
Alexandre Bodin
46ec41356f Do not run bookshelf populate on non existing model 2019-12-12 15:45:47 +01:00
soupette
33288b0bd4 Fix getInjectedComponents and ctm events from ctb 2019-12-12 15:02:06 +01:00
soupette
858959b7d2 Add doc 2019-12-12 14:48:59 +01:00
soupette
7564cc031a Fixes #4707 2019-12-12 14:32:37 +01:00
Alexandre Bodin
942f9fb943 Add migration example for content type compo references 2019-12-12 14:11:01 +01:00
Alexandre Bodin
e643a8cbce Init migration guide 2019-12-12 14:11:01 +01:00
Alexandre Bodin
bc418b9b90 Merge branch 'develop' into features/dynamic-zones 2019-12-12 14:08:28 +01:00
Alexandre Bodin
eb78c029f1 Merge branch 'master' into develop 2019-12-12 14:08:08 +01:00
Alexandre BODIN
2ac9b25d10
Merge pull request #4705 from strapi/chore/upgrade-mongoose 
Upgrade mongoose version
 2019-12-12 14:07:21 +01:00
Alexandre BODIN
882cb73b87
Merge pull request #4694 from 0LL1/admin-ui-language-fix 
Change admin UI's default language to English if browser's preferred language is not found
 2019-12-12 14:05:38 +01:00
cyril lopez
cd29648fd9
Merge branch 'master' into admin-ui-language-fix 2019-12-12 12:51:18 +01:00
soupette
421cee19af Fix design 2019-12-12 12:27:10 +01:00
soupette
3ed415963c Fix PR feedback 2019-12-11 17:49:12 +01:00
soupette
d0952e5188 Fix ctb button link for components 2019-12-11 17:43:28 +01:00
soupette
ee9af6c0d3 Fix select description 2019-12-11 17:37:31 +01:00
soupette
fc1cbbd753 Fix dz errors on change compo 2019-12-11 17:13:23 +01:00
Alexandre Bodin
243ed2939b Upgrade mongoose version 2019-12-11 17:03:53 +01:00
soupette
e991f6ec7c Fix min equal 2019-12-11 16:56:51 +01:00
soupette
1efde575ad Fix conflicts 2019-12-11 16:53:45 +01:00
soupette
e29bd761e4 Fix CTM dz min max validations 2019-12-11 16:52:35 +01:00
Alexandre Bodin
c8dbacbba4 Fix mongo ref need an id instead of an object 2019-12-11 16:38:57 +01:00
cyril lopez
4ad9fdef52
Merge pull request #4704 from strapi/admin/webpack-config 
Admin/webpack config
 2019-12-11 15:27:29 +01:00
Alexandre BODIN
ae98466076
Merge pull request #4698 from strapi/dynamic-zone/graphql-model-uid 
graphql use model uid
 2019-12-11 15:27:01 +01:00
soupette
0cf28d89a6 Remove image-webpack-loader dep 2019-12-11 14:34:04 +01:00
soupette
d9cc5c7276 Merge branch 'front/dz-post-data' of github.com:strapi/strapi into admin/webpack-config 2019-12-11 14:30:37 +01:00