yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-16 04:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,523 Commits 117 Branches 489 Tags
Commit Graph

662 Commits

Author SHA1 Message Date
Virginie Ky
24c07727da Replace carret with buffet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 14:39:10 +01:00
Virginie Ky
81cc30680a apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 11:55:51 +01:00
Virginie Ky
87cbcc8f58 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 17:32:07 +01:00
Virginie Ky
efc34d5c20 sort button color as props 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 16:57:34 +01:00
Virginie Ky
2d63d2015a 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-26 16:22:40 +01:00
Virginie Ky
6160e89475 SortButton as Text compo 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 16:19:25 +01:00
Virginie Ky
8da7bd21a0 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-26 15:58:02 +01:00
Virginie Ky
23e4ab38bd PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 15:52:19 +01:00
Virginie Ky
22cd052a90 sortlistitem extract 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 15:50:12 +01:00
Virginie Ky
cfc4473c6e 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-26 11:25:03 +01:00
Virginie Ky
b244d565c5 Apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 11:10:23 +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
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
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
soupette
994afe14ed Use theme in backbutton 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 16:00:24 +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
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
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
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
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
Ky
519eb1a67f Filters list items UI 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-23 22:53:22 +01:00
Ky
d537bedb36 paging and limit 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-23 22:21:23 +01:00
Ky
ca3997ed0d Filters dropdown button 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-22 13:26:45 +01:00
Ky
65c8968b84 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-22 12:01:07 +01:00
Ky
783b3f1a36 theme 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-22 11:46:54 +01:00
soupette
423a21b84d Add crop mode 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-21 08:55:25 +01:00
soupette
73b532a403 Add cropperjs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-21 08:24:23 +01:00
soupette
8ab62bb569 Add crop controls 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-21 08:13:55 +01:00
soupette
11a2b3bbfc Design edit modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-21 07:58:14 +01:00
Ky
ed4417b300 sort by 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-21 00:37:05 +01:00
Ky
f16b9c0ed6 search 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-20 22:49:51 +01:00
soupette
361d21812f Improve header and add nav to edit new 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 16:50:00 +01:00
soupette
f82aaeb6fd Design pencil control 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 16:16:01 +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
a63ae8a6e2 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 11:47:51 +01:00
soupette
f0231154f3 improve design upload list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:52:29 +01:00