yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-31 04:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,947 Commits 113 Branches 491 Tags
Commit Graph

8947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
cd634fc038
Merge branch 'master' into patch-1 2019-07-15 18:47:51 +02:00
Virginie Ky
752786a01e unit test fix 2019-07-15 18:18:09 +02:00
Virginie Ky
4701ea2681 Attributes creation 2019-07-15 17:32:50 +02:00
soupette
20b2cf8fb4 Handle group field reorder 2019-07-15 17:30:52 +02:00
Alexandre Bodin
1720445986 v3.0.0-beta.13 v3.0.0-beta.13 2019-07-15 17:07:07 +02:00
Alexandre BODIN
97dcb6df54
Merge branch 'master' into patch-1 2019-07-15 17:05:08 +02:00
Alexandre Bodin
1eecb4bbf6 Fix gitignore not created on strapi-new 2019-07-15 17:00:49 +02:00
Virginie Ky
3b1a7c5789 Attributes 2019-07-15 15:00:05 +02:00
soupette
a209b3c3ad Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-15 14:48:47 +02:00
soupette
fa8f2a499e Display repeatable field, collapse logic and onChange 2019-07-15 14:41:43 +02:00
Jim LAURIE
de2604cf80
Fix var instead of const 2019-07-15 13:32:41 +02:00
soupette
d2896a1a77 Created GroupCollapse component 2019-07-15 13:00:31 +02:00
Abdón Rodríguez Davila
f796bb736c Update engines configuration from create-strapi-app plugin 2019-07-15 11:19:06 +02:00
Abdón Rodríguez Davila
231757acb6 Update engines configuration from documentation plugin 2019-07-15 11:17:14 +02:00
Abdón Rodríguez Davila
857cd6111a Update engines configuration from all files 2019-07-15 11:16:38 +02:00
Abdón Rodríguez Davila
2017b62c03
Update engines configuration 2019-07-15 11:05:42 +02:00
Alexandre Bodin
b087cbab34 v3.0.0-beta.12 v3.0.0-beta.12 2019-07-15 10:24:28 +02:00
Alexandre Bodin
63a6452830 Merge branch 'develop' into feature/groups 2019-07-15 10:21:22 +02:00
Alexandre BODIN
b49e5a56fc
Merge pull request #3612 from strapi/feature/group-cm-mongoose 
CRUD Group mongoose
 2019-07-15 09:47:16 +02:00
Alexandre Bodin
8d872daf77 call entry updateOne with correct params 2019-07-15 09:26:03 +02:00
soupette
b15b608d07 Display non repeatable group 2019-07-13 10:04:25 +02:00
Jim LAURIE
2b9e03f3de Fix Google auth 2019-07-12 19:46:09 +02:00
soupette
cd22b5fac8 Init groups 2019-07-12 18:38:29 +02:00
Virginie Ky
e432a2d639 Add attributes 2019-07-12 18:34:12 +02:00
Alexandre Bodin
4056dc017f Delete groups 2019-07-12 18:07:34 +02:00
Alexandre Bodin
78380aa220 Implement create and updates for groups in a CT 2019-07-12 17:54:42 +02:00
soupette
40b4298f76 Handle edit 2019-07-12 15:44:23 +02:00
soupette
8662bce3a2 Display fields 2019-07-12 15:39:18 +02:00
Alexandre BODIN
3cfeb645c1
Merge pull request #3609 from bntnam/enhancement/update-documentation-admin-customization 
Update customize-admin in beta documentation
 2019-07-12 15:06:01 +02:00
Alexandre BODIN
2239fd2f13
Merge branch 'master' into enhancement/update-documentation-admin-customization 2019-07-12 15:05:38 +02:00
virginieky
7dbd0d7dc2
Merge pull request #3598 from strapi/ctm/repeatable-list-view 
Content Manager List view updated
 2019-07-12 14:53:46 +02:00
soupette
02493109f5 Change layout data 2019-07-12 14:15:56 +02:00
soupette
d0ee52fdcc Merge branch 'ctm/repeatable-list-view' of github.com:strapi/strapi into ctm/repeatable-list-view 2019-07-12 14:12:24 +02:00
soupette
431b0c30c7 Fix PR feedback 2019-07-12 14:12:07 +02:00
Alexandre Bodin
dc8045778b Merge branch 'master' into feature/groups 2019-07-12 11:25:26 +02:00
Alexandre BODIN
da96c297f8
Merge pull request #3610 from strapi/lauriejim-patch-1 
Fix plugin route object
 2019-07-12 10:30:49 +02:00
Jim LAURIE
1f166000aa
Fix plugin route object 2019-07-12 10:26:43 +02:00
soupette
8508b0c310 Add option to disable blue box 2019-07-12 09:30:32 +02:00
bntnam
1f7b019145 Update new change based on suggestion 2019-07-12 08:02:25 +02:00
bntnam
d9124d9e72 Update customize-admin in beta documentation 2019-07-11 23:18:19 +02:00
Alexandre BODIN
717d982cd7
Merge pull request #3607 from strapi/fix/relation-update-promises-order 
Force relationnal updates to be done before main model update
 2019-07-11 19:16:51 +02:00
Alexandre BODIN
8a0a396272
Merge pull request #3605 from strapi/feature/group-ctm 
CRUD  Groups in core-api's bookshelf queries
 2019-07-11 18:45:52 +02:00
cyril lopez
eeeb1d5ce6
Merge branch 'develop' into ctm/repeatable-list-view 2019-07-11 18:18:57 +02:00
soupette
7b7fe93875 Fix helper plugin 2019-07-11 18:13:09 +02:00
Alexandre Bodin
83d762bb53 Force relationnal updates to be done before main model update 2019-07-11 18:08:50 +02:00
virginieky
10a39aa95e
Merge pull request #3582 from strapi/ctm/repeatable-setting-view 
Setting View
 2019-07-11 17:34:35 +02:00
soupette
5acb46c54a Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-list-view 2019-07-11 17:20:12 +02:00
soupette
950168b8bf Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-11 17:13:35 +02:00
soupette
e0d975d22d Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-setting-view 2019-07-11 17:11:11 +02:00
soupette
63d94579e8 Fix PR feedback 2019-07-11 17:10:15 +02:00