yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 18:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,524 Commits 121 Branches 507 Tags
Commit Graph

8524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
3b1a7c5789 Attributes 2019-07-15 15:00:05 +02:00
Jim LAURIE
de2604cf80
Fix var instead of const 2019-07-15 13:32:41 +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
Jim LAURIE
2b9e03f3de Fix Google auth 2019-07-12 19:46:09 +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
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
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
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
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
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
Alexandre Bodin
7f7b03acfc Ignore groups if no group attributes 2019-07-11 16:57:13 +02:00
Alexandre Bodin
21d0e5abe1 remove graphql schema in getstarted example 2019-07-11 16:07:08 +02:00
Alexandre Bodin
a39f43ae02 Handle Delete and 404 2019-07-11 16:00:33 +02:00
Alexandre Bodin
33538be96a Update single and clean delete old groups 2019-07-11 13:52:21 +02:00
Alexandre Bodin
8f642c0201 Update repeatables 2019-07-11 13:52:21 +02:00
Alexandre Bodin
1b63c72706 Init update 2019-07-11 13:52:21 +02:00
Alexandre Bodin
1b130f7a7b Init group inserts 2019-07-11 13:52:21 +02:00
Alexandre Bodin
5eba276f0c Merge branch 'master' into feature/groups 2019-07-11 10:14:50 +02:00
Alexandre BODIN
7e45ef91fc
Merge pull request #3590 from msimmer/fix-3467 
Fix strapi-generate-api removing underscores in field name
 2019-07-11 10:02:39 +02:00
Alexandre BODIN
4353f8c6dd
Merge branch 'master' into fix-3467 2019-07-11 09:59:35 +02:00
Alexandre BODIN
fa9cbbfc06
Merge pull request #3584 from nurikabe/patch-4 
Improve upload documentation wording
 2019-07-11 09:54:12 +02:00
Alexandre BODIN
7a85350695
Merge branch 'master' into patch-4 2019-07-11 09:53:40 +02:00
soupette
0ff430abb6 Fix date filter 2019-07-11 09:30:24 +02:00
Alexandre BODIN
c667102ccb
Merge pull request #3572 from LouisAugry/fix-documentation-typo 
Improve documentation
 2019-07-10 18:17:10 +02:00
Alexandre BODIN
2d13dcf0f1
Merge branch 'master' into fix-documentation-typo 2019-07-10 18:16:48 +02:00
Alexandre Bodin
24c7c3f106 Merge branch 'master' into feature/groups 2019-07-10 18:05:43 +02:00
cyril lopez
c21f900aec
Merge pull request #3568 from strapi/front/repeatable-fieldslist 
CTB - GroupPage - List group attributes and delete attribute
 2019-07-10 17:56:38 +02:00
soupette
02d4984da9 Handle add filter 2019-07-10 17:40:40 +02:00