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

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
d901b54c2e Support dynamic zones in documentation plugin 2019-12-02 12:00:07 +01:00
Virginie Ky
7de89613d9 Merge branch 'cm-ui-fixes' of github.com:strapi/strapi into cm-ui-fixes 2019-12-02 11:49:43 +01:00
soupette
7b2164ce6c Add regex for attributes name 2019-12-02 10:53:09 +01:00
Cowboy
b6ee350ac0 Fix no response when get user permission role with internal network 2019-12-02 14:58:57 +08:00
Alexandre Bodin
cf6ecbff4f v3.0.0-beta.17.8 v3.0.0-beta.17.8 2019-12-01 23:20:50 +01:00
Alexandre BODIN
c198c26668
Merge pull request #4636 from strapi/fix/plugin-name 
Validate plugin name
 2019-12-01 23:19:29 +01:00
Alexandre Bodin
1500b4f49a Valid plugin name 2019-12-01 23:05:58 +01:00
Virginie Ky
dfc9288a1e some many UI fixes 2019-11-29 20:16:33 +01:00
Aurélien Georget
773b89bc79 Add parameter to identify Docker projects 2019-11-29 18:10:32 +01:00
Jim LAURIE
8199f2d59c v3.0.0-beta.17.7 2019-11-29 17:36:51 +01:00
Jim LAURIE
f32b804061
Merge pull request #4624 from strapi/fix/secu 
Hotfix mongo aggregate policy verifications
v3.0.0-beta.17.7 		2019-11-29 17:33:50 +01:00
soupette
bf401dfc1f Add logic for keeping the header display for components 2019-11-29 16:32:12 +01:00
soupette
ce19cd558a Created UpperFirst component 2019-11-29 16:19:35 +01:00
soupette
cc88f62a29 Add routing for adding attributes to created compo, not working when creating a sub one on the fly 2019-11-29 16:04:42 +01:00
Aurélien Georget
2ad2a94697 Catch event to avoid crashes 2019-11-29 16:02:17 +01:00
soupette
13bb647da8 Update modal header so it displays the path to the field 2019-11-29 15:34:48 +01:00
Virginie Ky
945906a819 Apply review ip 2019-11-29 15:14:21 +01:00
soupette
2d2332090f Add collapse to MultipleMenu 2019-11-29 13:31:33 +01:00
soupette
d9238dbc3b Fix select component design 2019-11-29 12:38:44 +01:00
soupette
9c175c2f6d Add logic to remove components that include components in their attribute since we cannott have a 2 nested level of nested compos 2019-11-29 10:05:39 +01:00
soupette
2e33038d9d Init modal header UX 2019-11-29 09:14:31 +01:00
soupette
4d1dd0d083 Created utils for relations 2019-11-29 07:53:23 +01:00
soupette
789e67fe11 Fix dz non unique values 2019-11-29 07:03:33 +01:00
soupette
9377256cd0 Fix conflicts 2019-11-29 06:54:17 +01:00
soupette
83be102ba6 Fix dz components 2019-11-29 06:47:32 +01:00
cyril lopez
46c32055cf
Merge pull request #4592 from strapi/front/dynamic-zones-ctm-ui 
Front/dynamic zones ctm ui
 2019-11-29 06:43:58 +01:00
cyril lopez
b78bef7445
Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 22:49:18 +01:00
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
Alexandre Bodin
7a3b64016c Hotfix mongo aggregate policy verifications 2019-11-28 18:33:02 +01:00
Alexandre BODIN
cc5b863c35
Merge pull request #4622 from strapi/dynamic-zone/graphql-support 
Support dynamic zones in graphql
 2019-11-28 18:18:22 +01:00
soupette
a203d85918 Add logic to know if wheter or not we can add a component into another component 2019-11-28 17:40:51 +01:00
Alexandre Bodin
53d02ea443 Support empty dynamic zone 2019-11-28 17:34:27 +01:00
Alexandre Bodin
e4226344ee simplify code 2019-11-28 17:34:27 +01:00
Alexandre Bodin
db08e93cc7 Support dynamic zones in graphql 2019-11-28 17:34:26 +01:00
Alexandre Bodin
05cfd05c10 Merge branch 'develop' into features/dynamic-zones 2019-11-28 17:33:58 +01:00
Alexandre Bodin
ce53715714 Merge branch 'master' into develop 2019-11-28 17:33:40 +01:00
Jim LAURIE
f36a5cf096
Merge pull request #4584 from sulakin/admin-russian-translation 
Update Russian translation for admin panel
 2019-11-28 16:51:32 +01:00
Jim LAURIE
c7d20d0358
Merge branch 'master' into admin-russian-translation 2019-11-28 16:51:15 +01:00
soupette
248ebc372b Created util to retrieve all nested components 2019-11-28 16:48:51 +01:00
Aurélien Georget
1400764e73 Apply events to DZ and components 2019-11-28 16:37:38 +01:00
soupette
ff6e2484dd Handle edit component attribute 2019-11-28 16:34:24 +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
Jim LAURIE
54cd208221
Remove search engine for index.html page 2019-11-28 16:26:23 +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
soupette
0c67107294 Fix icons loading and add react-fontawesome lib 2019-11-28 15:52:24 +01:00