yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 13:45:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,860 Commits 116 Branches 489 Tags
Commit Graph

10860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
bcd9db9987 Migrate upload plugin header to buffet s one 2019-12-16 15:56:42 +01:00
soupette
d6045876a7 Change plugin header in plugin upload 2019-12-16 15:47:44 +01:00
soupette
7bc4d87e36 Fixes #4629 2019-12-16 15:06:51 +01:00
Alexandre Bodin
f8d8b76fad Merge branch 'master' into develop 2019-12-16 15:06:12 +01:00
Alexandre BODIN
76df41f967
Merge pull request #4726 from strapi/docs-update-qs-compo 
Tutorial update for compo
 2019-12-16 14:38:27 +01:00
Alexandre BODIN
6e2b6f4864
Merge branch 'develop' into docs-update-qs-compo 2019-12-16 14:38:20 +01:00
Alexandre BODIN
358b8be5e2
Merge pull request #4733 from franciskone/patch-1 
Update configurations.md
 2019-12-16 14:33:30 +01:00
Alexandre Bodin
90db5092b4 populate bare associations to avoid circular populating 2019-12-16 14:10:20 +01:00
soupette
dbc988f914 Fix PR feedback 2019-12-16 11:54:47 +01:00
cyril lopez
4c1cb3b7e8
Merge branch 'develop' into clean-assets 2019-12-16 11:49:32 +01:00
Alexandre BODIN
e09624e5ef
Merge pull request #4712 from strapi/chore/dynamic-zone-tests 
CTM dynamic zone tests
 2019-12-16 09:08:00 +01:00
Francesco Cappelli
9435fd703c
Update configurations.md 
added a typo fix
 2019-12-15 22:57:26 +00:00
unknown
db412a4d3b translations 2019-12-15 17:57:16 +01:00
Jim LAURIE
f5800121ae
Merge branch 'develop' into docs-update-qs-compo 2019-12-13 23:48:15 +01:00
Jim LAURIE
40a9fb7d3d Update type 2019-12-13 23:46:09 +01:00
Jim LAURIE
98c3e4b7cf Update all tuto images 2019-12-13 23:15:57 +01:00
cyril lopez
8b4c247ccc
Merge branch 'develop' into clean-assets 2019-12-13 18:13:50 +01:00
soupette
28986d26cc Fixes #4429 2019-12-13 18:11:34 +01:00
soupette
0511a54209 Remove useless assets in plugins 2019-12-13 16:15:25 +01:00
soupette
2aaf29edda Clean assets 2019-12-13 15:52:23 +01:00
Jesús Rubio
8b30105588 Fix plugin upload UI description 2019-12-13 15:37:07 +01:00
Alexandre BODIN
426bb27659
Merge branch 'develop' into chore/dynamic-zone-tests 2019-12-13 12:12:40 +01:00
Alexandre Bodin
6120c645e3 Fix fk name too long 2019-12-13 11:50:14 +01:00
Alexandre Bodin
4dbbf5722b Add a warning about file names 2019-12-13 11:30:12 +01:00
Alexandre Bodin
d75d46b044 Add with media tests 2019-12-13 11:14:40 +01:00
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
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
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