yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-30 00:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,756 Commits 138 Branches 515 Tags
Commit Graph

8203 Commits

Author SHA1 Message Date
soupette
23746e8ad7 Handle side effects 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 10:55:24 +01:00
soupette
d9a05672fe Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 10:12:00 +01:00
soupette
6e3ca74aee Created settings page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 09:53:50 +01:00
soupette
2f307a007e Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-02-27 08:28:59 +01:00
soupette
77e0e83b27 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-27 08:28:09 +01:00
soupette
94bab08947 Update buffetjs dep 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-26 18:05:04 +01:00
Virginie Ky
357e197605 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 2020-02-26 17:45:02 +01:00
HichamELBSI
6821fe8d63 Fix PR feedbacks 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-26 17:33:18 +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
87f32f3f71 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 2020-02-26 16:23:29 +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
5dee34b4c4 Filter size UI and default values 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 15:07:47 +01:00
HichamELBSI
e8b9017219 Merge branch 'features/single-types' into single-types/uid-ctm 2020-02-26 14:56:27 +01:00
HichamELBSI
ff870e7aa0 Merge branch 'develop' into features/single-types 2020-02-26 14:54:33 +01:00
HichamELBSI
48f5c5f418 Fix PR feedbacks 2020-02-26 14:53:32 +01:00
virginieky
db69b50662
Merge branch 'develop' into admin/update-buffetjs 2020-02-26 14:31:16 +01:00
Virginie Ky
2dac5e4141 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 11:27:06 +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
301893cb5e remove filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 10:44:27 +01:00
Alexandre Bodin
2a0becb9b0 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-26 10:12:25 +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
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
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
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