yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 117 Branches 489 Tags
Commit Graph

907 Commits

Author SHA1 Message Date
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
virginieky
6186f1287a
Merge branch 'features/media-lib' into front/img-preview 2020-03-02 14:46:54 +01:00
Virginie Ky
ab6daa8cc6 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:37:36 +01:00
Virginie Ky
e804824077 Card with checkbox 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:33:16 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
Virginie Ky
7563078124 controls ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 10:00:51 +01:00
soupette
476d5d10eb Add Settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-02 09:31:05 +01:00
Virginie Ky
cd103ba332 Card component with card img wrapper UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 00:21:43 +01:00
Virginie Ky
98b305c481 url update fix and avoid several identical filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-01 21:28:26 +01:00
soupette
efe0b1a424 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings-view 2020-02-29 07:59:42 +01:00
Alexandre BODIN
6cfcd99d8e
Merge pull request #5334 from strapi/media-lib/settings 
Add new media lib settings. Remove db provider config
 2020-02-28 13:53:36 +01:00
Alexandre Bodin
2382332a4d Update to a more recent CI os version 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-28 12:06:44 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
Virginie Ky
5b4185ec42 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-28 10:16:23 +01:00
Virginie Ky
1f470c0947 Clean filters compos 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 09:34:05 +01:00
Alexandre Bodin
84a9d2902d Only load the right directories 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-28 01:13:33 +01:00
Alexandre Bodin
d7fd4ced2a Move test folder to fix import issue 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-27 22:31:30 +01:00
Virginie Ky
8b4bf7eba0 media lib utils tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 20:35:18 +01:00
Alexandre Bodin
68fbf77b30 Add new media lib settings. Remove db provider config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-27 20:26:05 +01:00
virginieky
39f941fe44
Merge branch 'features/media-lib' into front/media-library-filter 2020-02-27 19:51:20 +01:00
Virginie Ky
2118650d5c page as start param 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 19:41:20 +01:00
virginieky
a60a209234
Merge branch 'features/media-lib' into front/media-lib-filters 2020-02-27 15:08:03 +01:00
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
a6f73e0647 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 11:33:27 +01:00
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
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
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
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +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
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