yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-10 15:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,206 Commits 107 Branches 503 Tags
Commit Graph

13206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
e105592943 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 14:48:44 +01:00
Jim LAURIE
26dfc9ae1b docs: fix conflicts 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-20 14:48:03 +01:00
Jim LAURIE
7cb4cb2b74 docs: udpate some wording 2020-02-20 14:43:07 +01:00
HichamELBSI
265494803a Fix PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 14:28:37 +01:00
soupette
074d30ccfb Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 13:49:19 +01:00
soupette
1a4ca1fcec Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-20 13:44:21 +01:00
soupette
cefd6c37a1 Fix menu hooks call 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 12:51:22 +01:00
soupette
ad2af42291 Fix stepper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 12:42:19 +01:00
cyril lopez
244e3186cb
Merge pull request #5264 from strapi/features/media-lib-upload 
Features/media lib upload
 2020-02-20 12:05:28 +01:00
Alexandre BODIN
3298cb4690
Merge branch 'master' into docs-self-data 2020-02-20 12:02:03 +01:00
HichamELBSI
cc6a35551b Add single type navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 11:53:57 +01:00
HichamELBSI
7baf54ddf7 Fix content manager initializer updates 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 11:53:57 +01:00
soupette
a63ae8a6e2 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 11:47:51 +01:00
Alexandre Bodin
c1ac8b0106 Add apiId to get content type 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-20 11:44:35 +01:00
Alexandre BODIN
38da84e5b9
Merge pull request #5276 from strapi/template-pr 
Delete labels from the PR body
 2020-02-20 11:37:08 +01:00
cyril lopez
6318c42f4a
Merge pull request #5277 from strapi/features/media-lib-upload-compo-improvements 
Features/media lib upload compo improvements
 2020-02-20 11:10:20 +01:00
soupette
5ff19144b1 Remove useless compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 10:00:49 +01:00
soupette
f0231154f3 improve design upload list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:52:29 +01:00
soupette
8f36a32209 Fix design UploadForm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:09:34 +01:00
soupette
51b7d75cdd Improve Modal components 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:02:51 +01:00
soupette
de10305b32 Created new modal header component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 07:58:59 +01:00
soupette
f128edc73a Add font-sizes and font-weight to the theme 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 07:11:20 +01:00
Jim LAURIE
d3e05d80fc enhancement: update pr temaplate 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-19 22:38:58 +01:00
Jim LAURIE
ff466efb61 docs(guide): add guide for isOwner policy 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-19 17:08:16 +01:00
HichamELBSI
3222a998b9 Fix PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-19 17:07:03 +01:00
HichamELBSI
f5c6ef0a44 Add single type navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-19 17:07:03 +01:00
HichamELBSI
79870fbd15 Fix content manager initializer updates 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-19 17:04:09 +01:00
soupette
bf6a2464ab Add setting link 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 16:52:58 +01:00
soupette
09d1a6af3a Add option to add a link into the global setting section 2020-02-19 16:30:53 +01:00
Alexandre Bodin
032b741751 Merge branch 'develop' into features/single-types 2020-02-19 15:05:22 +01:00
Alexandre Bodin
614d550742 Merge branch 'master' into develop 2020-02-19 15:04:09 +01:00
Alexandre BODIN
014f3df4d3
Merge pull request #5270 from strapi/single-types/uid-cm-actions 
Add UID validation routes for CTM livechecks
 2020-02-19 15:03:43 +01:00
soupette
b2572f9016 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 13:49:05 +01:00
Alexandre Bodin
3cb66f6566 Update snapshots 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 12:16:59 +01:00
soupette
7787beb6fb Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 12:02:19 +01:00
soupette
3234cdc7db Handle errors 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 11:21:25 +01:00
Alexandre Bodin
193bd5af0e Add apiId in content type infos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 11:02:20 +01:00
Alexandre Bodin
db03d9d07d Add UID validation routes for CTM livechecks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 10:54:44 +01:00
soupette
825ffa9f23 Add trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 10:27:43 +01:00
soupette
947000e6c3 remove unneeded compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 10:25:21 +01:00
soupette
0ce07ac4fd Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 10:16:59 +01:00
soupette
9a78352738 Fix upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 10:12:35 +01:00
soupette
f179b9cf5d Add button upload trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 09:27:06 +01:00
soupette
a085c87cc1 Handle upload files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 09:14:11 +01:00
soupette
3cd1ab6a3d Add loading indicator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 08:10:40 +01:00
soupette
a2ee7788b2 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-upload 2020-02-19 05:51:10 +01:00
soupette
56db05845b Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-19 05:50:51 +01:00
cyril lopez
1e630a03ca
Merge pull request #5262 from strapi/fix/#5260 
Fixes WYISIWYG update when used in a dynamic zone
 2020-02-19 05:49:36 +01:00
soupette
8066d11144 Display files to upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 05:48:11 +01:00
Toms Burgmanis
26d6687940
Merge branch 'master' into patch-1 2020-02-19 01:41:06 +02:00