yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-03 20:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 106 Branches 501 Tags
Commit Graph

12264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
53061dad7c
Merge pull request #5242 from 7mioda/strap-plugin-upload-file-size-comparaison-issue#5233 
fix(plugin-upload): size limit comparison issue
 2020-02-26 10:08:16 +01:00
Alexandre BODIN
e06e8ee2fd
Merge branch 'master' into strap-plugin-upload-file-size-comparaison-issue#5233 2020-02-26 09:47:22 +01:00
Alexandre Bodin
3e0fa37669 Update yarn lockfile 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-26 09:46:54 +01:00
Alexandre BODIN
5c3420a0fc
Merge pull request #5308 from strapi/docs/requests 
Added information about body and files to request docs
 2020-02-26 09:42:40 +01:00
soupette
23710b5fc2 Update Buffet.js so we can test the single types feature 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-26 08:05:37 +01:00
Virginie Ky
83fb72736f Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 03:34:04 +01:00
Virginie Ky
53defe021e coma automatically removed in merge 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 22:49:53 +01:00
Virginie Ky
ba23fa4cf8 fix lint 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 22:12:03 +01:00
Virginie Ky
45c8deac4d Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 22:09:01 +01:00
HichamELBSI
e450d3613b Add UID in CTM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-25 21:44:02 +01:00
Virginie Ky
28a91e8a21 Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front-media-lib-search 2020-02-25 21:35:07 +01:00
Virginie Ky
0fc0783770 handleChange as a single function 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 21:34:22 +01:00
virginieky
85cf0468d1
Merge branch 'features/media-lib' into front-media-lib-search 2020-02-25 21:16:52 +01:00
Virginie Ky
9f354b05bb apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 21:15:26 +01:00
Edaly Ahmed
899ecb32a5 Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
removing unecessary cast
 2020-02-25 20:11:53 +01:00
Alexandre Bodin
5c4151c8d8 Add single type endpoint doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-25 18:13:24 +01:00
cyril lopez
5a17ffe17f
Merge pull request #5316 from strapi/features/media-lib-compo-enhancement 
Use theme in backbutton
 2020-02-25 16:39:36 +01:00
soupette
994afe14ed Use theme in backbutton 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 16:00:24 +01:00
cyril lopez
93e72c4d2d
Merge pull request #5307 from strapi/features/media-lib-crop-new-asset 
Media lib edit file
 2020-02-25 15:13:21 +01:00
soupette
e1f47b16e2 Use theme for bkg color 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 15:12:55 +01:00
Virginie Ky
7bc9b987f7 Filter button with translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 14:40:52 +01:00
soupette
795f4758ab Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 14:38:35 +01:00
soupette
94e7a3f5fc Add delete logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 14:35:48 +01:00
soupette
bfe923b1ee Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 13:01:56 +01:00
soupette
1f7f035da4 Add infos size box to cropper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 09:45:42 +01:00
ELABBASSI Hicham
da7ebced8d
Merge pull request #5286 from strapi/single-types/uid 
add Uid attributes in CTB
 2020-02-25 09:05:24 +01:00
Edaly Ahmed
129edd66ee Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
adding getConfig service and casting params before updating database
 2020-02-24 17:51:39 +01:00
soupette
de2946bae3 Rename compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 17:29:15 +01:00
soupette
351d15917e Add file size infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 17:27:34 +01:00
soupette
1a1f10e09b Add tests to reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 16:47:31 +01:00
Derrick Mehaffy
a5a48d8348
Added information about body and files to request docs 
These paths to body and files differ from Koa's typical pathing, adding them to the docs temporarily until the docs are reworked.
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-02-24 08:34:04 -07:00
soupette
9abb0e6d7f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-crop-new-asset 2020-02-24 16:25:29 +01:00
cyril lopez
48589b4b84
Merge pull request #5272 from strapi/features/media-lib-settings 
Media library settings api update
 2020-02-24 16:25:13 +01:00
soupette
64b4e33a4d Add confirmation when closing the modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 16:22:17 +01:00
soupette
28a44da14d Forbid to crop svg files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 16:10:05 +01:00
soupette
78371aa50d Handle crop new file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 15:45:00 +01:00
Virginie Ky
9fd4084cb1 sort button icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-24 15:15:04 +01:00
soupette
97c4e4928b Change component api to make the form component easier 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 15:09:07 +01:00
soupette
1f943c1ad0 Add backbutton to modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 14:08:51 +01:00
Virginie Ky
085816751c return simplify 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-24 11:29:34 +01:00
soupette
6ee156f3cc Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 10:58:46 +01:00
soupette
3b99cfa381 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-crop-new-asset 2020-02-24 10:41:27 +01:00
soupette
2838d145b0 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 2020-02-24 10:40:56 +01:00
soupette
0babd775e3 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-02-24 10:40:12 +01:00
soupette
0ee70bcc35 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-24 10:39:43 +01:00
cyril lopez
0ce196b6a3
Merge pull request #5299 from strapi/single-types/uid-ctb-fixes 
CTB small fixes
 2020-02-24 10:23:48 +01:00
soupette
2f3bbcb2db Fix timestamp dipslay 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 10:05:15 +01:00
soupette
e232287152 fix links to ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 09:42:35 +01:00
soupette
7ab7ebda51 Fix loading state and ctb setup 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 08:53:34 +01:00
soupette
761675253e Fix delete uid field by removing all field attached to it 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 08:38:09 +01:00