yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,041 Commits 122 Branches 507 Tags
Commit Graph

10041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
a2e6427749 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 19:24:10 +01:00
Virginie Ky
3067bf5e1c design review 2019-11-28 19:23:10 +01:00
Aurélien Georget
1400764e73 Apply events to DZ and components 2019-11-28 16:37:38 +01:00
Aurélien Georget
c60975f983 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 16:31:07 +01:00
Aurélien Georget
26dbbddaf1 Remove useless events and add new events 2019-11-28 16:30:49 +01:00
Virginie Ky
d83cbb4539 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 15:59:45 +01:00
Aurélien Georget
8ca8d9bbc9 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 15:58:23 +01:00
Aurélien Georget
367b1a0d1f Apply events to improve the products 2019-11-28 15:57:39 +01:00
Virginie Ky
c47985cf9b Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 15:57:06 +01:00
Virginie Ky
6baa56d9a1 PR review apply 2019-11-28 15:11:57 +01:00
Virginie Ky
0d8eda80bd fortawesome dep 2019-11-28 14:15:04 +01:00
Alexandre BODIN
a553f08007
Merge pull request #4610 from strapi/dynamic-zone/mongo-fix-morph-relations 
Dynamic zone/mongo fix morph relations
 2019-11-27 16:09:25 +01:00
Alexandre Bodin
c2a0829811 Fix remove and add morph relation 2019-11-27 15:30:38 +01:00
Alexandre Bodin
24e5aceb44 Fix image being unlinked from entity on entity creation 2019-11-27 15:30:37 +01:00
Alexandre Bodin
713f848f9e Merge branch 'develop' into features/dynamic-zones 2019-11-27 15:30:10 +01:00
Alexandre Bodin
55b7dd620e Remove hook-knex 2019-11-27 15:30:03 +01:00
Alexandre Bodin
63abfc6db9 Merge branch 'develop' into features/dynamic-zones 2019-11-27 15:28:33 +01:00
Alexandre Bodin
49985eca53 Merge branch 'master' into develop 2019-11-27 15:28:06 +01:00
Alexandre BODIN
17c47bafc1
Merge pull request #4599 from strapi/fix-4559 
Fix lowercase email in forgot password function
 2019-11-27 15:25:42 +01:00
Alexandre BODIN
8376793a9a
Merge branch 'master' into fix-4559 2019-11-27 15:25:26 +01:00
Alexandre BODIN
afa0f50a23
Merge pull request #4601 from strapi/dynamic-zone/mongoose-support 
Dynamic zone/mongoose support
 2019-11-27 15:23:00 +01:00
Alexandre BODIN
15f8026cce
Merge pull request #4603 from strapi/dynamic-zone/self-referencing-creation 
Allow self referencing content type creation
 2019-11-27 15:20:54 +01:00
Jim LAURIE
d3746702ff
Merge pull request #4585 from dearprakash/patch-1 
Update link to pm2 guide
 2019-11-27 11:48:56 +01:00
Jim LAURIE
ad6f613631
Merge branch 'master' into patch-1 2019-11-27 11:48:25 +01:00
Virginie Ky
27bbef0ea2 ListView schema retrieve 2019-11-27 10:36:49 +01:00
Virginie Ky
da82c145e8 Input File errors and ui 2019-11-27 10:28:28 +01:00
Alexandre Bodin
68534fb4cd Allow self referencing content type creation 2019-11-26 19:06:10 +01:00
Alexandre Bodin
3a0df72b4a Fix hasPK & getPK 2019-11-26 18:19:52 +01:00
Alexandre Bodin
6804bd34b4 Fix not found content type in content manager routes 2019-11-26 17:18:43 +01:00
Alexandre Bodin
62237bcd08 Mongoose fix populate and support dynamic zone populate 2019-11-26 17:01:58 +01:00
Virginie Ky
8ea2b3bb1d PR review apply 2019-11-26 16:55:21 +01:00
Virginie Ky
587e4450b7 PR review apply 2019-11-26 16:24:53 +01:00
Virginie Ky
683dc4b199 Dynamic zone UI fix and review apply 2019-11-26 16:15:59 +01:00
Jim LAURIE
3fe87ffcc7 Fix #4559 lowercase the email in the forgot password function 2019-11-26 16:03:06 +01:00
Jim LAURIE
ee76396920
Merge pull request #4571 from strapi/docs-custom-data-guide 
Add data response customization
 2019-11-26 11:58:44 +01:00
Jim LAURIE
07fb1e5337
Merge branch 'master' into docs-custom-data-guide 2019-11-26 11:58:35 +01:00
Jim LAURIE
64aa3690d4
Merge pull request #4575 from strapi/docs-fixes 
Some documentation update
 2019-11-26 11:58:01 +01:00
Jim LAURIE
39ff488f95
Merge branch 'master' into docs-fixes 2019-11-26 11:57:54 +01:00
Jim LAURIE
5ec938ad93 Remove unnessecary comment 2019-11-26 11:50:39 +01:00
Alexandre Bodin
06cf8440f1 Support delete 2019-11-26 11:31:54 +01:00
Jim LAURIE
6ab7d7528c
Fix typo feedback from Derrick 2019-11-26 11:24:29 +01:00
Alexandre Bodin
50e35f1026 Support updates 2019-11-26 11:24:00 +01:00
Jim LAURIE
bb3eef9eaf Merge branch 'docs-custom-data-guide' of github.com:strapi/strapi into docs-custom-data-guide 2019-11-26 11:21:35 +01:00
Jim LAURIE
8c3e71b479 Typo 2019-11-26 11:21:19 +01:00
Jim LAURIE
813cd835cb
Merge branch 'master' into docs-custom-data-guide 2019-11-26 11:19:48 +01:00
Jim LAURIE
f884e39fbf Fix typo 2019-11-26 11:18:39 +01:00
Jim LAURIE
93e411f162
Merge pull request #4579 from strapi/docs-custom-admin-guide 
Add guide to customize admin and plugin
 2019-11-26 11:07:49 +01:00
Jim LAURIE
ebe1a30271
Merge branch 'master' into docs-custom-admin-guide 2019-11-26 11:07:42 +01:00
Virginie Ky
ce3ada140d Unit tests fixes 2019-11-26 10:39:26 +01:00
Alexandre Bodin
f82b05dc94 Support creation 2019-11-26 09:53:18 +01:00