yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-29 03:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 116 Branches 491 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexandre Bodin
7f7b03acfc Ignore groups if no group attributes 2019-07-11 16:57:13 +02:00
soupette
8309f527f9 Display external links 2019-07-11 16:53:00 +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
soupette
38ca54f8a9 Display plugin heeader and handle delete 2019-07-11 15:33:49 +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
soupette
d3ea25e700 Init Edit view 2019-07-11 11:35:18 +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
39edb955d6 Merge branch 'ctm/repeatable-list-view' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-11 09:38:37 +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
eae70f6ea2 Fix date filter 2019-07-10 17:48:29 +02:00
soupette
02d4984da9 Handle add filter 2019-07-10 17:40:40 +02:00
Alexandre BODIN
7dd3195d13
Merge pull request #3597 from strapi/fix/updateKoaRateLimit 
Update koa2-ratelimit to latest version
 2019-07-10 17:36:28 +02:00
Derrick Mehaffy
004c5f3bd3 Testing updating Koa2-Ratelimit to latest 2019-07-10 08:12:48 -07:00
soupette
3ebf82c5a1 Display filters 2019-07-10 17:07:19 +02:00
Alexandre Bodin
f0829f6f7c Merge branch 'master' into feature/groups 2019-07-10 15:18:14 +02:00
Louis Augry
08e2f47800
Merge branch 'master' into fix-documentation-typo 2019-07-10 15:11:52 +02:00
Alexandre Bodin
3a94c7ea90 v3.0.0-beta.11 v3.0.0-beta.11 2019-07-10 15:09:03 +02:00
Alexandre BODIN
66028c78ad
Merge pull request #3594 from strapi/chore/allow-node-12 
Allow node 12 now that it is supported
 2019-07-10 15:04:59 +02:00
Alexandre Bodin
cbf0d21c08 Update requirements 2019-07-10 14:28:52 +02:00
soupette
6949e293ea Handle Remove filter 2019-07-10 12:20:25 +02:00
soupette
0b62ad9d52 Fix filters 2019-07-10 11:12:30 +02:00
Alexandre Bodin
aaf7e826c3 Merge branch 'master' into feature/groups 2019-07-10 11:01:44 +02:00
Alexandre Bodin
23fdc37b0f Allow node >= 10 2019-07-10 10:35:56 +02:00