yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-06 13:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,408 Commits 105 Branches 501 Tags
Commit Graph

11408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
8298ea3160
Merge pull request #4703 from strapi/docs-guide-api-token 
Guide API token
 2019-12-17 15:15:42 +01:00
Alexandre BODIN
bb13df4705
Merge branch 'master' into docs-guide-api-token 2019-12-17 15:15:27 +01:00
Jim LAURIE
c79106bff8 Fix typo 2019-12-17 15:14:17 +01:00
Alexandre Bodin
09629c11e8 v3.0.0-beta.18 v3.0.0-beta.18 2019-12-17 14:55:58 +01:00
Alexandre BODIN
8d0c6848ba
Merge pull request #4740 from strapi/develop 
Beta 18
 2019-12-17 14:53:54 +01:00
Alexandre Bodin
4c01f46e0d Fix modelKey must be modelName to fix search 2019-12-17 14:05:15 +01:00
Alexandre BODIN
7aae0b8bc2
Merge pull request #4739 from strapi/fix/ctm-edit 
Fix ctm wrong usage of useGlobalContext
 2019-12-17 13:49:47 +01:00
soupette
37fab0fd90 Fix edit/delete 2019-12-17 13:37:48 +01:00
Alexandre Bodin
7381acad58 Allow private field and collectionName with - 2019-12-17 13:17:38 +01:00
Alexandre BODIN
6ea37525e9
Merge pull request #4738 from strapi/fix/ctm-edit-visible 
Fix ctm hidden fields
 2019-12-17 12:45:04 +01:00
Alexandre Bodin
6aab5568f8 Fix ctm hidden fields 2019-12-17 12:33:56 +01:00
Jim LAURIE
81cf5c4ecd Apply PR feedback - typo 2019-12-17 11:55:13 +01:00
Alexandre BODIN
953b1d1469
Merge pull request #4736 from strapi/enhance/plugins 
Change the PluginHeader in all plugins
 2019-12-17 11:27:55 +01:00
Alexandre Bodin
1166d80332 Init webhook runner and store 2019-12-17 11:24:14 +01:00
soupette
c04ba4b987 Update buffet 2019-12-17 11:02:40 +01:00
soupette
af6ec6db03 Add some built-in js object names in ct reserved names 
Fixes #4554
 2019-12-17 10:52:50 +01:00
soupette
22d877a43c Merge branch 'enhance/plugins' of github.com:strapi/strapi into enhance/plugins 2019-12-17 10:35:33 +01:00
Alexandre Bodin
77d136de33 Init event hub and add isEnabled 2019-12-17 10:35:04 +01:00
soupette
3dc23d9ffc Fix PR feedback 2019-12-17 10:20:30 +01:00
soupette
9f28c6b8c2 Fix conflicts 2019-12-17 10:20:03 +01:00
Alexandre BODIN
fd403a15aa
Merge pull request #4724 from strapi/clean-assets 
Clean assets in plugins
 2019-12-17 10:15:52 +01:00
Alexandre BODIN
e35a0ea95a
Merge branch 'develop' into enhance/plugins 2019-12-17 10:06:53 +01:00
Alexandre BODIN
a9ff593b73
Merge branch 'develop' into clean-assets 2019-12-17 09:12:22 +01:00
Alexandre Bodin
cfe625f90e Add polymorphic relation to bare populates 2019-12-17 09:11:49 +01:00
Virginie Ky
3d570a41f5 pr review apply 2019-12-17 00:12:50 +01:00
Virginie Ky
7b28ebe3b5 EmptyList 2019-12-16 23:54:32 +01:00
Virginie Ky
9c89c5f182 PR review apply 2019-12-16 21:53:30 +01:00
Virginie Ky
3226e0c59e PR review apply 2019-12-16 21:53:16 +01:00
Alexandre Bodin
e19726e72e Add policies to webhook routes 2019-12-16 18:39:10 +01:00
soupette
5c2893a6dd Remove useless test 2019-12-16 17:53:42 +01:00
soupette
f442786fa8 Merge branch 'develop' of github.com:strapi/strapi into enhance/plugins 2019-12-16 17:52:04 +01:00
soupette
a27e1db638 Add header in admin containers 2019-12-16 17:50:35 +01:00
soupette
9e64bc095a Fix NotFound compo 2019-12-16 17:38:19 +01:00
soupette
e302b210b3 Remove coming soon page 2019-12-16 17:36:30 +01:00
soupette
326f543f48 Fix baseline and migrate to buffetjs header 2019-12-16 17:33:06 +01:00
soupette
69c637d27b Add plugin header from buffet to users plugin hp 2019-12-16 16:54:45 +01:00
soupette
58f9ac440a Add header from buffet in documentation plugin 2019-12-16 16:44:25 +01:00
soupette
bffffe4bb0 Change header in upload and email plugins 2019-12-16 16:31:04 +01:00
cyril lopez
8d8cc0ffbc
Merge branch 'develop' into clean-assets 2019-12-16 15:58:29 +01:00
soupette
bcd9db9987 Migrate upload plugin header to buffet s one 2019-12-16 15:56:42 +01:00
soupette
d6045876a7 Change plugin header in plugin upload 2019-12-16 15:47:44 +01:00
soupette
7bc4d87e36 Fixes #4629 2019-12-16 15:06:51 +01:00
Alexandre Bodin
f8d8b76fad Merge branch 'master' into develop 2019-12-16 15:06:12 +01:00
Alexandre BODIN
76df41f967
Merge pull request #4726 from strapi/docs-update-qs-compo 
Tutorial update for compo
 2019-12-16 14:38:27 +01:00
Alexandre BODIN
6e2b6f4864
Merge branch 'develop' into docs-update-qs-compo 2019-12-16 14:38:20 +01:00
Alexandre BODIN
358b8be5e2
Merge pull request #4733 from franciskone/patch-1 
Update configurations.md
 2019-12-16 14:33:30 +01:00
Alexandre Bodin
90db5092b4 populate bare associations to avoid circular populating 2019-12-16 14:10:20 +01:00
soupette
dbc988f914 Fix PR feedback 2019-12-16 11:54:47 +01:00
cyril lopez
4c1cb3b7e8
Merge branch 'develop' into clean-assets 2019-12-16 11:49:32 +01:00
Alexandre BODIN
e09624e5ef
Merge pull request #4712 from strapi/chore/dynamic-zone-tests 
CTM dynamic zone tests
 2019-12-16 09:08:00 +01:00